Merge pull request #945 from tannewt/nrf52832

Switch to Feather52s full name to avoid confusion with the nrf52840 later

.travis.yml

@@ -22,7 +22,7 @@ env:
   - TRAVIS_BOARD=pirkey_m0
   - TRAVIS_BOARD=trinket_m0
   - TRAVIS_BOARD=gemma_m0
-  - TRAVIS_BOARD=feather52
+  - TRAVIS_BOARD=feather52832
   - TRAVIS_BOARD=pca10056
   - TRAVIS_TEST=qemu
   - TRAVIS_TEST=unix
@@ -58,7 +58,7 @@ before_script:
   # For teensy build
   - sudo apt-get install realpath
   # For nrf builds
-  - ([[ $TRAVIS_BOARD != "feather52" && $TRAVIS_BOARD != "pca10056" ]] || sudo ports/nrf/drivers/bluetooth/download_ble_stack.sh)
+  - ([[ $TRAVIS_BOARD != "feather52832" && $TRAVIS_BOARD != "pca10056" ]] || sudo ports/nrf/drivers/bluetooth/download_ble_stack.sh)
   # For huzzah builds
   - if [[ $TRAVIS_BOARD = "feather_huzzah" ]]; then wget https://github.com/jepler/esp-open-sdk/releases/download/2018-06-10/xtensa-lx106-elf-standalone.tar.gz && tar xavf xtensa-lx106-elf-standalone.tar.gz; PATH=$(readlink -f xtensa-lx106-elf/bin):$PATH; fi
   # For coverage testing (upgrade is used to get latest urllib3 version)

ports/nrf/boards/feather52/mpconfigboard.mk → ports/nrf/boards/feather52832/mpconfigboard.mk

@@ -3,8 +3,8 @@ MCU_VARIANT = nrf52
 MCU_SUB_VARIANT = nrf52832
 SOFTDEV_VERSION ?= 2.0.1
 
-LD_FILE = boards/feather52/custom_nrf52832_dfu_app_$(SOFTDEV_VERSION).ld
-BOOTLOADER_PKG = boards/feather52/bootloader/feather52_bootloader_$(SOFTDEV_VERSION)_s132_single.zip
+LD_FILE = boards/feather52832/custom_nrf52832_dfu_app_$(SOFTDEV_VERSION).ld
+BOOTLOADER_PKG = boards/feather52832/bootloader/feather52_bootloader_$(SOFTDEV_VERSION)_s132_single.zip
 
 NRF_DEFINES += -DNRF52832_XXAA
 

tools/build_adafruit_bins.sh

@@ -2,7 +2,7 @@ rm -rf ports/atmel-samd/build*
 rm -rf ports/esp8266/build*
 rm -rf ports/nrf/build*
 
-ATMEL_BOARDS="arduino_zero circuitplayground_express circuitplayground_express_crickit feather_m0_basic feather_m0_adalogger itsybitsy_m0_express itsybitsy_m4_express feather_m0_rfm69 feather_m0_rfm9x feather_m0_express feather_m0_express_crickit feather_m4_express metro_m0_express metro_m4_express pirkey_m0 trinket_m0 gemma_m0 feather52 feather_huzzah pca10056"
+ATMEL_BOARDS="arduino_zero circuitplayground_express circuitplayground_express_crickit feather_m0_basic feather_m0_adalogger itsybitsy_m0_express itsybitsy_m4_express feather_m0_rfm69 feather_m0_rfm9x feather_m0_express feather_m0_express_crickit feather_m4_express metro_m0_express metro_m4_express pirkey_m0 trinket_m0 gemma_m0 feather52832 feather_huzzah pca10056"
 ROSIE_SETUPS="rosie-ci"
 
 PARALLEL="-j 5"
@@ -20,8 +20,8 @@ for board in $boards; do
     if [ $board == "feather_huzzah" ]; then
         make $PARALLEL -C ports/esp8266 BOARD=feather_huzzah
         (( exit_status = exit_status || $? ))
-    elif [ $board == "feather52" ]; then
-        make $PARALLEL -C ports/nrf BOARD=feather52
+    elif [ $board == "feather52832" ]; then
+        make $PARALLEL -C ports/nrf BOARD=feather52832
         (( exit_status = exit_status || $? ))
     elif [ $board == "pca10056" ]; then
         make $PARALLEL -C ports/nrf BOARD=pca10056 SD=s140
@@ -53,7 +53,7 @@ for board in $boards; do
         cp ports/esp8266/build/firmware-combined.bin bin/$board/adafruit-circuitpython-$board-$version.bin
         (( exit_status = exit_status || $? ))
         extension=bin
-    elif [ $board == "feather52" ]; then
+    elif [ $board == "feather52832" ]; then
         cp ports/nrf/build-$board-s132/firmware.bin bin/$board/adafruit-circuitpython-$board-$version.bin
         (( exit_status = exit_status || $? ))
         extension=bin