Fix UART references for 52805

Author: nikolac

.travis.yml

@@ -43,3 +43,4 @@ script:
   - buildExampleSketch sandeepmistry:nRF5:SeeedArchLink 01.Basics Blink
   - buildExampleSketch sandeepmistry:nRF5:Generic_nRF52833 01.Basics Blink
   - buildExampleSketch sandeepmistry:nRF5:BBCmicrobitV2 01.Basics Blink
+  - buildExampleSketch sandeepmistry:nRF5:Generic_nRF52805 01.Basics Blink

boards.txt

@@ -21,6 +21,38 @@ menu.version=Version
 menu.lfclk=Low Frequency Clock
 menu.board_variant=Board Variant
 
+# nRF52805 variants
+###################
+
+Generic_nRF52805.name=Generic nRF52805
+
+Generic_nRF52805.upload.tool=sandeepmistry:openocd
+Generic_nRF52805.upload.target=nrf52
+Generic_nRF52805.upload.maximum_size=192000
+
+Generic_nRF52805.bootloader.tool=sandeepmistry:openocd
+
+Generic_nRF52805.build.mcu=cortex-m4
+Generic_nRF52805.build.f_cpu=64000000
+Generic_nRF52805.build.board=GENERIC
+Generic_nRF52805.build.core=nRF5
+Generic_nRF52805.build.variant=Generic
+Generic_nRF52805.build.variant_system_lib=
+Generic_nRF52805.build.extra_flags=-DNRF52805_XXAA
+Generic_nRF52805.build.float_flags=
+Generic_nRF52805.build.ldscript=nrf52805_xxaa.ld
+
+Generic_nRF52805.menu.softdevice.none=None
+Generic_nRF52805.menu.softdevice.none.softdevice=none
+Generic_nRF52805.menu.softdevice.none.softdeviceversion=
+
+Generic_nRF52805.menu.lfclk.lfxo=Crystal Oscillator
+Generic_nRF52805.menu.lfclk.lfxo.build.lfclk_flags=-DUSE_LFXO
+Generic_nRF52805.menu.lfclk.lfrc=RC Oscillator
+Generic_nRF52805.menu.lfclk.lfrc.build.lfclk_flags=-DUSE_LFRC
+Generic_nRF52805.menu.lfclk.lfsynt=Synthesized
+Generic_nRF52805.menu.lfclk.lfsynt.build.lfclk_flags=-DUSE_LFSYNT
+
 # nRF52833 variants
 ###################
 

cores/nRF5/Uart.cpp

@@ -64,12 +64,22 @@ void Uart::begin(unsigned long baudrate)
 
 void Uart::begin(unsigned long baudrate, uint16_t /*config*/)
 {
+#ifdef NRF52805_XXAA
+  nrfUart->PSEL.TXD = uc_pinTX;
+  nrfUart->PSEL.RXD = uc_pinRX;
+#else
   nrfUart->PSELTXD = uc_pinTX;
   nrfUart->PSELRXD = uc_pinRX;
+#endif
 
   if (uc_hwFlow == 1) {
+#ifdef NRF52805_XXAA
+    nrfUart->PSEL.CTS = uc_pinCTS;
+    nrfUart->PSEL.RTS = uc_pinRTS;
+#else
     nrfUart->PSELCTS = uc_pinCTS;
     nrfUart->PSELRTS = uc_pinRTS;
+#endif
     nrfUart->CONFIG = (UART_CONFIG_PARITY_Excluded << UART_CONFIG_PARITY_Pos) | UART_CONFIG_HWFC_Enabled;
   } else {
     nrfUart->CONFIG = (UART_CONFIG_PARITY_Excluded << UART_CONFIG_PARITY_Pos) | UART_CONFIG_HWFC_Disabled;
@@ -175,12 +185,20 @@ void Uart::end()
   nrfUart->TASKS_STOPTX = 0x1UL;
 
   nrfUart->ENABLE = UART_ENABLE_ENABLE_Disabled;
+ 
+#ifdef NRF52805_XXAA
+  nrfUart->PSEL.TXD = 0xFFFFFFFF;
+  nrfUart->PSEL.RXD = 0xFFFFFFFF;
 
+  nrfUart->PSEL.RTS = 0xFFFFFFFF;
+  nrfUart->PSEL.CTS = 0xFFFFFFFF;
+#else
   nrfUart->PSELTXD = 0xFFFFFFFF;
   nrfUart->PSELRXD = 0xFFFFFFFF;
 
   nrfUart->PSELRTS = 0xFFFFFFFF;
   nrfUart->PSELCTS = 0xFFFFFFFF;
+#endif
 
   rxBuffer.clear();
 }

cores/nRF5/wiring_analog_nRF52.c

@@ -29,6 +29,7 @@ extern "C" {
 static uint32_t saadcReference = SAADC_CH_CONFIG_REFSEL_Internal;
 static uint32_t saadcGain      = SAADC_CH_CONFIG_GAIN_Gain1_5;
 
+#ifdef PWM_PRESENT
 static NRF_PWM_Type* pwms[PWM_COUNT] = {
   NRF_PWM0,
   NRF_PWM1,
@@ -47,6 +48,7 @@ static uint32_t pwmChannelPins[PWM_COUNT] = {
 #endif
 };
 static uint16_t pwmChannelSequence[PWM_COUNT];
+#endif
 
 static int readResolution = 10;
 static int writeResolution = 8;
@@ -215,6 +217,7 @@ uint32_t analogRead( uint32_t ulPin )
 // to digital output.
 void analogWrite( uint32_t ulPin, uint32_t ulValue )
 {
+#ifdef PWM_PRESENT
   if (ulPin >= PINS_COUNT) {
     return;
   }
@@ -247,6 +250,7 @@ void analogWrite( uint32_t ulPin, uint32_t ulValue )
       break;
     }
   }
+#endif
 }
 
 #ifdef __cplusplus