Merge pull request #945 from tannewt/nrf528323.0.0-rc.0

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

19 files changed, 8 insertions, 8 deletions

diff --git a/.travis.yml b/.travis.yml
index 71ed26ff6..a5829896f 100644
--- a/.travis.yml
+++ b/.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)
diff --git a/ports/nrf/boards/feather52/README.md b/ports/nrf/boards/feather52832/README.md
index c98f54614..c98f54614 100644
--- a/ports/nrf/boards/feather52/README.md
+++ b/ports/nrf/boards/feather52832/README.md
diff --git a/ports/nrf/boards/feather52/board.c b/ports/nrf/boards/feather52832/board.c
index e0b77437b..e0b77437b 100644
--- a/ports/nrf/boards/feather52/board.c
+++ b/ports/nrf/boards/feather52832/board.c
diff --git a/ports/nrf/boards/feather52/bootloader/.gitattributes b/ports/nrf/boards/feather52832/bootloader/.gitattributes
index 608f8c345..608f8c345 100644
--- a/ports/nrf/boards/feather52/bootloader/.gitattributes
+++ b/ports/nrf/boards/feather52832/bootloader/.gitattributes
diff --git a/ports/nrf/boards/feather52/bootloader/README.md b/ports/nrf/boards/feather52832/bootloader/README.md
index 434859085..434859085 100644
--- a/ports/nrf/boards/feather52/bootloader/README.md
+++ b/ports/nrf/boards/feather52832/bootloader/README.md
diff --git a/ports/nrf/boards/feather52/bootloader/feather52_bootloader_2.0.1_s132_single.zip b/ports/nrf/boards/feather52832/bootloader/feather52_bootloader_2.0.1_s132_single.zip
index 42a83bb90..42a83bb90 100644
--- a/ports/nrf/boards/feather52/bootloader/feather52_bootloader_2.0.1_s132_single.zip
+++ b/ports/nrf/boards/feather52832/bootloader/feather52_bootloader_2.0.1_s132_single.zip
diff --git a/ports/nrf/boards/feather52/bootloader/feather52_bootloader_5.0.0_s132_single.zip b/ports/nrf/boards/feather52832/bootloader/feather52_bootloader_5.0.0_s132_single.zip
index 2f30a9fd4..2f30a9fd4 100644
--- a/ports/nrf/boards/feather52/bootloader/feather52_bootloader_5.0.0_s132_single.zip
+++ b/ports/nrf/boards/feather52832/bootloader/feather52_bootloader_5.0.0_s132_single.zip
diff --git a/ports/nrf/boards/feather52/custom_nrf52832_dfu_app_2.0.1.ld b/ports/nrf/boards/feather52832/custom_nrf52832_dfu_app_2.0.1.ld
index a1c128e37..a1c128e37 100644
--- a/ports/nrf/boards/feather52/custom_nrf52832_dfu_app_2.0.1.ld
+++ b/ports/nrf/boards/feather52832/custom_nrf52832_dfu_app_2.0.1.ld
diff --git a/ports/nrf/boards/feather52/custom_nrf52832_dfu_app_5.0.0.ld b/ports/nrf/boards/feather52832/custom_nrf52832_dfu_app_5.0.0.ld
index f9209bf3d..f9209bf3d 100644
--- a/ports/nrf/boards/feather52/custom_nrf52832_dfu_app_5.0.0.ld
+++ b/ports/nrf/boards/feather52832/custom_nrf52832_dfu_app_5.0.0.ld
diff --git a/ports/nrf/boards/feather52/examples/ble_scan.py b/ports/nrf/boards/feather52832/examples/ble_scan.py
index 9cacbe6f4..9cacbe6f4 100644
--- a/ports/nrf/boards/feather52/examples/ble_scan.py
+++ b/ports/nrf/boards/feather52832/examples/ble_scan.py
diff --git a/ports/nrf/boards/feather52/examples/blinky.py b/ports/nrf/boards/feather52832/examples/blinky.py
index 29cca26d0..29cca26d0 100644
--- a/ports/nrf/boards/feather52/examples/blinky.py
+++ b/ports/nrf/boards/feather52832/examples/blinky.py
diff --git a/ports/nrf/boards/feather52/examples/i2c_scan.py b/ports/nrf/boards/feather52832/examples/i2c_scan.py
index 8e3ef557d..8e3ef557d 100644
--- a/ports/nrf/boards/feather52/examples/i2c_scan.py
+++ b/ports/nrf/boards/feather52832/examples/i2c_scan.py
diff --git a/ports/nrf/boards/feather52/examples/pulseio.py b/ports/nrf/boards/feather52832/examples/pulseio.py
index cdbe16add..cdbe16add 100644
--- a/ports/nrf/boards/feather52/examples/pulseio.py
+++ b/ports/nrf/boards/feather52832/examples/pulseio.py
diff --git a/ports/nrf/boards/feather52/mpconfigboard.h b/ports/nrf/boards/feather52832/mpconfigboard.h
index 176e61499..176e61499 100644
--- a/ports/nrf/boards/feather52/mpconfigboard.h
+++ b/ports/nrf/boards/feather52832/mpconfigboard.h
diff --git a/ports/nrf/boards/feather52/mpconfigboard.mk b/ports/nrf/boards/feather52832/mpconfigboard.mk
index 1e3aa5a24..2a1c081fb 100644
--- a/ports/nrf/boards/feather52/mpconfigboard.mk
+++ b/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
 
diff --git a/ports/nrf/boards/feather52/mpconfigboard_s132.mk b/ports/nrf/boards/feather52832/mpconfigboard_s132.mk
index 315758de3..315758de3 100644
--- a/ports/nrf/boards/feather52/mpconfigboard_s132.mk
+++ b/ports/nrf/boards/feather52832/mpconfigboard_s132.mk
diff --git a/ports/nrf/boards/feather52/nrf52_hal_conf.h b/ports/nrf/boards/feather52832/nrf52_hal_conf.h
index fd6073a18..fd6073a18 100644
--- a/ports/nrf/boards/feather52/nrf52_hal_conf.h
+++ b/ports/nrf/boards/feather52832/nrf52_hal_conf.h
diff --git a/ports/nrf/boards/feather52/pins.csv b/ports/nrf/boards/feather52832/pins.csv
index 3ffab88d4..3ffab88d4 100644
--- a/ports/nrf/boards/feather52/pins.csv
+++ b/ports/nrf/boards/feather52832/pins.csv
diff --git a/tools/build_adafruit_bins.sh b/tools/build_adafruit_bins.sh
index 1b25c1e2f..4111a7b1b 100755
--- a/tools/build_adafruit_bins.sh
+++ b/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