Merge pull request #358 from adafruit/develop

clean up

Author: hathach

boards.txt

@@ -40,7 +40,7 @@ feather52832.build.f_cpu=64000000
 feather52832.build.board=NRF52832_FEATHER
 feather52832.build.core=nRF5
 feather52832.build.variant=feather_nrf52832
-feather52832.build.extra_flags=-DNRF52832_XXAA -DNRF52 -DARDUINO_NRF52_FEATHER
+feather52832.build.extra_flags=-DNRF52832_XXAA -DNRF52
 feather52832.build.ldscript=nrf52832_s132_v6.ld
 
 # SofDevice Menu
@@ -91,7 +91,7 @@ feather52840.build.core=nRF5
 feather52840.build.variant=feather_nrf52840_express
 feather52840.build.usb_manufacturer="Adafruit LLC"
 feather52840.build.usb_product="Feather nRF52840 Express"
-feather52840.build.extra_flags=-DNRF52840_XXAA -DARDUINO_NRF52_FEATHER {build.flags.usb}
+feather52840.build.extra_flags=-DNRF52840_XXAA {build.flags.usb}
 feather52840.build.ldscript=nrf52840_s140_v6.ld
 feather52840.build.vid=0x239A
 feather52840.build.pid=0x8029
@@ -140,12 +140,12 @@ cplaynrf52840.upload.maximum_data_size=248832
 # Build
 cplaynrf52840.build.mcu=cortex-m4
 cplaynrf52840.build.f_cpu=64000000
-cplaynrf52840.build.board=CIRCUITPLAY_NRF52840
+cplaynrf52840.build.board=NRF52840_CIRCUITPLAY
 cplaynrf52840.build.core=nRF5
 cplaynrf52840.build.variant=circuitplayground_nrf52840
 cplaynrf52840.build.usb_manufacturer="Adafruit LLC"
 cplaynrf52840.build.usb_product="Adafruit Circuit Playground Bluefruit"
-cplaynrf52840.build.extra_flags=-DNRF52840_XXAA -DARDUINO_NRF52840_CIRCUITPLAY {build.flags.usb}
+cplaynrf52840.build.extra_flags=-DNRF52840_XXAA {build.flags.usb}
 cplaynrf52840.build.ldscript=nrf52840_s140_v6.ld
 cplaynrf52840.build.vid=0x239A
 cplaynrf52840.build.pid=0x8045
@@ -199,7 +199,7 @@ metro52840.build.core=nRF5
 metro52840.build.variant=metro_nrf52840_express
 metro52840.build.usb_manufacturer="Adafruit LLC"
 metro52840.build.usb_product="Metro nRF52840 Express"
-metro52840.build.extra_flags=-DNRF52840_XXAA -DARDUINO_NRF52_FEATHER {build.flags.usb}
+metro52840.build.extra_flags=-DNRF52840_XXAA {build.flags.usb}
 metro52840.build.ldscript=nrf52840_s140_v6.ld
 metro52840.build.vid=0x239A
 metro52840.build.pid=0x803F

libraries/Bluefruit52Lib/examples/Peripheral/ancs_oled/ancs_oled.ino

@@ -27,7 +27,7 @@
 #include <bluefruit.h>
 
 /*------------- OLED and Buttons -------------*/
-#if defined ARDUINO_NRF52_FEATHER
+#if defined ARDUINO_NRF52832_FEATHER
 // Feather nRF52832
 #define BUTTON_A    31
 #define BUTTON_B    30
@@ -456,4 +456,5 @@ uint32_t readPressedButtons(void)
   lastDebounced = debounced;
 
   return result;
-}
+}
+

libraries/Bluefruit52Lib/examples/Projects/rssi_proximity/rssi_proximity_central/rssi_proximity_central.ino

@@ -95,7 +95,7 @@ BLEUuid uuid = BLEUuid(CUSTOM_UUID);
   #include <Adafruit_ILI9341.h>
 
    /* Pin setup for the TFT display over SPI */
-  #ifdef ARDUINO_NRF52_FEATHER
+  #ifdef ARDUINO_NRF52832_FEATHER
      #define TFT_DC   11
      #define TFT_CS   31
      #define STMPE_CS 30
@@ -114,7 +114,7 @@ BLEUuid uuid = BLEUuid(CUSTOM_UUID);
   #include <Adafruit_SSD1306.h>
 
   /* Pin setup for the OLED display */
-  #ifdef ARDUINO_NRF52_FEATHER
+  #ifdef ARDUINO_NRF52832_FEATHER
     #define BUTTON_A 31
     #define BUTTON_B 30
     #define BUTTON_C 27

libraries/Servo/src/Servo.h

@@ -67,7 +67,7 @@
 #include "samd/ServoTimers.h"
 #elif defined(ARDUINO_ARCH_STM32F4)
 #include "stm32f4/ServoTimers.h"
-#elif defined(ARDUINO_ARCH_NRF52)
+#elif defined(ARDUINO_ARCH_NRF52) || defined(ARDUINO_NRF52_ADAFRUIT)
 #include "nrf52/ServoTimers.h"
 #else
 #error "This library only supports boards with an AVR, SAM, SAMD, NRF52 or STM32F4 processor."

libraries/Servo/src/nrf52/Servo.cpp

@@ -16,7 +16,7 @@
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 */
 
-#if defined(ARDUINO_ARCH_NRF52)
+#if defined(ARDUINO_ARCH_NRF52) || defined(ARDUINO_NRF52_ADAFRUIT)
 
 #include <Arduino.h>
 #include <Servo.h>

platform.txt

@@ -56,10 +56,8 @@ build.debug_flags=-DCFG_DEBUG=0
 rtos.path={build.core.path}/freertos
 nordic.path={build.core.path}/nordic
 
-# ARDUINO_FEATHER52 is defined for backward compatiable with other lib only
-# should be replaced by ARDUINO_NRF52_ADAFRUIT in the future
 
-build.flags.nrf= -DSOFTDEVICE_PRESENT -DARDUINO_FEATHER52 -DARDUINO_NRF52_ADAFRUIT -DNRF52_SERIES -DLFS_NAME_MAX=64 -Ofast {build.debug_flags} "-I{build.core.path}/cmsis/include" "-I{nordic.path}" "-I{nordic.path}/nrfx" "-I{nordic.path}/nrfx/hal" "-I{nordic.path}/nrfx/mdk" "-I{nordic.path}/nrfx/soc" "-I{nordic.path}/nrfx/drivers/include" "-I{nordic.path}/nrfx/drivers/src" "-I{nordic.path}/softdevice/{build.sd_name}_nrf52_{build.sd_version}_API/include" "-I{rtos.path}/Source/include" "-I{rtos.path}/config" "-I{rtos.path}/portable/GCC/nrf52" "-I{rtos.path}/portable/CMSIS/nrf52" "-I{build.core.path}/sysview/SEGGER" "-I{build.core.path}/sysview/Config" "-I{build.core.path}/Adafruit_TinyUSB_Core" "-I{build.core.path}/Adafruit_TinyUSB_Core/tinyusb/src"
+build.flags.nrf= -DSOFTDEVICE_PRESENT -DARDUINO_NRF52_ADAFRUIT -DNRF52_SERIES -DLFS_NAME_MAX=64 -Ofast {build.debug_flags} "-I{build.core.path}/cmsis/include" "-I{nordic.path}" "-I{nordic.path}/nrfx" "-I{nordic.path}/nrfx/hal" "-I{nordic.path}/nrfx/mdk" "-I{nordic.path}/nrfx/soc" "-I{nordic.path}/nrfx/drivers/include" "-I{nordic.path}/nrfx/drivers/src" "-I{nordic.path}/softdevice/{build.sd_name}_nrf52_{build.sd_version}_API/include" "-I{rtos.path}/Source/include" "-I{rtos.path}/config" "-I{rtos.path}/portable/GCC/nrf52" "-I{rtos.path}/portable/CMSIS/nrf52" "-I{build.core.path}/sysview/SEGGER" "-I{build.core.path}/sysview/Config" "-I{build.core.path}/Adafruit_TinyUSB_Core" "-I{build.core.path}/Adafruit_TinyUSB_Core/tinyusb/src"
 
 # usb flags
 build.flags.usb= -DUSBCON -DUSE_TINYUSB -DUSB_VID={build.vid} -DUSB_PID={build.pid} '-DUSB_MANUFACTURER={build.usb_manufacturer}' '-DUSB_PRODUCT={build.usb_product}'