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

Fixes #940
This commit is contained in:
Scott Shawcroft 2018-06-18 10:51:04 -07:00
parent be5eb91df8
commit 05547b72ac
19 changed files with 5 additions and 5 deletions

View File

@ -22,7 +22,7 @@ env:
- TRAVIS_BOARD=pirkey_m0 - TRAVIS_BOARD=pirkey_m0
- TRAVIS_BOARD=trinket_m0 - TRAVIS_BOARD=trinket_m0
- TRAVIS_BOARD=gemma_m0 - TRAVIS_BOARD=gemma_m0
- TRAVIS_BOARD=feather52 - TRAVIS_BOARD=feather52832
- TRAVIS_BOARD=pca10056 - TRAVIS_BOARD=pca10056
- TRAVIS_TEST=qemu - TRAVIS_TEST=qemu
- TRAVIS_TEST=unix - TRAVIS_TEST=unix

View File

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

View File

@ -2,7 +2,7 @@ rm -rf ports/atmel-samd/build*
rm -rf ports/esp8266/build* rm -rf ports/esp8266/build*
rm -rf ports/nrf/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" ROSIE_SETUPS="rosie-ci"
PARALLEL="-j 5" PARALLEL="-j 5"
@ -53,7 +53,7 @@ for board in $boards; do
cp ports/esp8266/build/firmware-combined.bin bin/$board/adafruit-circuitpython-$board-$version.bin cp ports/esp8266/build/firmware-combined.bin bin/$board/adafruit-circuitpython-$board-$version.bin
(( exit_status = exit_status || $? )) (( exit_status = exit_status || $? ))
extension=bin 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 cp ports/nrf/build-$board-s132/firmware.bin bin/$board/adafruit-circuitpython-$board-$version.bin
(( exit_status = exit_status || $? )) (( exit_status = exit_status || $? ))
extension=bin extension=bin