Add nRF52833 support + generic variant

.travis.yml

@@ -41,3 +41,4 @@ script:
   - buildExampleSketch sandeepmistry:nRF5:Sinobit 01.Basics BareMinimum
   - buildExampleSketch sandeepmistry:nRF5:DWM1001-DEV 01.Basics Blink
   - buildExampleSketch sandeepmistry:nRF5:SeeedArchLink 01.Basics Blink
+  - buildExampleSketch sandeepmistry:nRF5:Generic_nRF52833 01.Basics Blink

boards.txt

@@ -21,6 +21,39 @@ menu.version=Version
 menu.lfclk=Low Frequency Clock
 menu.board_variant=Board Variant
 
+# nRF52833 variants
+###################
+
+Generic_nRF52833.name=Generic nRF52833
+
+Generic_nRF52833.upload.tool=sandeepmistry:openocd
+Generic_nRF52833.upload.target=nrf52
+Generic_nRF52833.upload.maximum_size=524288
+
+Generic_nRF52833.bootloader.tool=sandeepmistry:openocd
+
+Generic_nRF52833.build.mcu=cortex-m4
+Generic_nRF52833.build.f_cpu=64000000
+Generic_nRF52833.build.board=GENERIC
+Generic_nRF52833.build.core=nRF5
+Generic_nRF52833.build.variant=Generic
+Generic_nRF52833.build.variant_system_lib=
+Generic_nRF52833.build.extra_flags=-DNRF52833_XXAA
+Generic_nRF52833.build.float_flags=-mfloat-abi=hard -mfpu=fpv4-sp-d16
+Generic_nRF52833.build.ldscript=nrf52833_xxaa.ld
+
+Generic_nRF52833.menu.softdevice.none=None
+Generic_nRF52833.menu.softdevice.none.softdevice=none
+Generic_nRF52833.menu.softdevice.none.softdeviceversion=
+
+Generic_nRF52833.menu.lfclk.lfxo=Crystal Oscillator
+Generic_nRF52833.menu.lfclk.lfxo.build.lfclk_flags=-DUSE_LFXO
+Generic_nRF52833.menu.lfclk.lfrc=RC Oscillator
+Generic_nRF52833.menu.lfclk.lfrc.build.lfclk_flags=-DUSE_LFRC
+Generic_nRF52833.menu.lfclk.lfsynt=Synthesized
+Generic_nRF52833.menu.lfclk.lfsynt.build.lfclk_flags=-DUSE_LFSYNT
+
+
 # nRF52832 variants
 ###################
 

cores/nRF5/Arduino.h

@@ -95,10 +95,19 @@ void loop( void ) ;
 
 #define bit(b) (1UL << (b))
 
+#if (GPIO_COUNT == 1)
 #define gpioBaseForPin(P)          ( NRF_GPIO )
 #define digitalPinToPort(P)        ( (NRF_GPIO_Type *) gpioBaseForPin(P) )
 #define digitalPinToPin(P)         ( g_ADigitalPinMap[P] )
 #define digitalPinToBitMask(P)     ( 1 << digitalPinToPin(P) )
+#elif (GPIO_COUNT == 2)
+#define gpioBaseForPin(P)          ( (g_ADigitalPinMap[P] & 0x20) ? NRF_P1 : NRF_P0 )
+#define digitalPinToPort(P)        ( (NRF_GPIO_Type *) gpioBaseForPin(P) )
+#define digitalPinToPin(P)         ( g_ADigitalPinMap[P] & 0x1f )
+#define digitalPinToBitMask(P)     ( 1 << digitalPinToPin(P) )
+#else
+#error "Unsupported GPIO_COUNT"
+#endif
 
 #define portOutputRegister(port)   ( &(port->OUTSET) )
 #define portInputRegister(port)    ( &(port->IN) )

cores/nRF5/wiring_analog_nRF52.c

@@ -29,18 +29,22 @@ extern "C" {
 static uint32_t saadcReference = SAADC_CH_CONFIG_REFSEL_Internal;
 static uint32_t saadcGain      = SAADC_CH_CONFIG_GAIN_Gain1_5;
 
-#define PWM_COUNT 3
-
 static NRF_PWM_Type* pwms[PWM_COUNT] = {
   NRF_PWM0,
   NRF_PWM1,
-  NRF_PWM2
+  NRF_PWM2,
+#if PWM_COUNT > 3
+  NRF_PWM3
+#endif
 };
 
 static uint32_t pwmChannelPins[PWM_COUNT] = {
   0xFFFFFFFF,
   0xFFFFFFFF,
-  0xFFFFFFFF
+  0xFFFFFFFF,
+#if PWM_COUNT > 3
+  0xFFFFFFFF,
+#endif
 };
 static uint16_t pwmChannelSequence[PWM_COUNT];
 

variants/Generic/variant.cpp

@@ -51,5 +51,39 @@ const uint32_t g_ADigitalPinMap[] = {
   28,
   29,
   30,
-  31
+  31,
+#if GPIO_COUNT > 1
+  32,
+  33,
+  34,
+  35,
+  36,
+  37,
+  38,
+  39,
+  40,
+  41,
+  42,
+  43,
+  44,
+  45,
+  46,
+  47,
+  48,
+  49,
+  50,
+  51,
+  52,
+  53,
+  54,
+  55,
+  56,
+  57,
+  58,
+  59,
+  60,
+  61,
+  62,
+  63,
+#endif
 };

variants/Generic/variant.h

@@ -18,6 +18,7 @@
 #define _VARIANT_GENERIC_
 
 #include "nrf.h"
+#include "nrf_peripherals.h"
 
 /** Master clock frequency */
 #if defined(NRF52_SERIES)
@@ -38,8 +39,15 @@ extern "C"
 #endif // __cplusplus
 
 // Number of pins defined in PinDescription array
+#if GPIO_COUNT == 1
 #define PINS_COUNT           (32u)
 #define NUM_DIGITAL_PINS     (32u)
+#elif GPIO_COUNT == 2
+#define PINS_COUNT           (64u)
+#define NUM_DIGITAL_PINS     (64u)
+#else
+#error "Unsupported GPIO_COUNT"
+#endif
 #define NUM_ANALOG_INPUTS    (6u)
 #define NUM_ANALOG_OUTPUTS   (0u)