8000 Switch to Feather52s full name to avoid confusion with the nrf52840 l… · adafruit/circuitpython@05547b7 · GitHub
[go: up one dir, main page]

Skip to content

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit 05547b7

Browse files
committed
Switch to Feather52s full name to avoid confusion with the nrf52840 later.
Fixes #940
1 parent be5eb91 commit 05547b7

19 files changed

+5
-5
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ env:
2222
- TRAVIS_BOARD=pirkey_m0
2323
- TRAVIS_BOARD=trinket_m0
2424
- TRAVIS_BOARD=gemma_m0
25-
- TRAVIS_BOARD=feather52
25+
- TRAVIS_BOARD=feather52832
2626
- TRAVIS_BOARD=pca10056
2727
- TRAVIS_TEST=qemu
2828
- TRAVIS_TEST=unix

ports/nrf/boards/feather52/mpconfigboard.mk renamed to ports/nrf/boards/feather52832/mpconfigboard.mk

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ MCU_VARIANT = nrf52
33
MCU_SUB_VARIANT = nrf52832
44
SOFTDEV_VERSION ?= 2.0.1
55

6-
LD_FILE = boards/feather52/custom_nrf52832_dfu_app_$(SOFTDEV_VERSION).ld
7-
BOOTLOADER_PKG = boards/feather52/bootloader/feather52_bootloader_$(SOFTDEV_VERSION)_s132_single.zip
6+
LD_FILE = boards/feather52832/custom_nrf52832_dfu_app_$(SOFTDEV_VERSION).ld
7+
BOOTLOADER_PKG = boards/feather52832/bootloader/feather52_bootloader_$(SOFTDEV_VERSION)_s132_single.zip
88

99
NRF_DEFINES += -DNRF52832_XXAA
1010

tools/build_adafruit_bins.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ rm -rf ports/atmel-samd/build*
22
rm -rf ports/esp8266/build*
33
rm -rf ports/nrf/build*
44

5-
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"
5+
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"
66
ROSIE_SETUPS="rosie-ci"
77

88
PARALLEL="-j 5"
@@ -53,7 +53,7 @@ for board in $boards; do
5353
cp ports/esp8266/build/firmware-combined.bin bin/$board/adafruit-circuitpython-$board-$version.bin
5454
(( exit_status = exit_status || $? ))
5555
extension=bin
56-
elif [ $board == "feather52" ]; then
56+
elif [ $board == "feather52832" ]; then
5757
cp ports/nrf/build-$board-s132/firmware.bin bin/$board/adafruit-circuitpython-$board-$version.bin
5858
(( exit_status = exit_status || $? ))
5959
extension=bin

0 commit comments

Comments
 (0)
0