8000 Merge pull request #945 from tannewt/nrf52832 · sparkfun/circuitpython@f5fab35 · GitHub
[go: up one dir, main page]
Skip to content

Commit f5fab35

Browse files
dhalbertdhalbert
authored
Merge pull request adafruit#945 from tannewt/nrf52832
Switch to Feather52s full name to avoid confusion with the nrf52840 later
2 parents be5eb91 + c90abb1 commit f5fab35

19 files changed

+8
-8
lines changed

‎.travis.yml

Lines changed: 2 additions & 2 deletions
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
@@ -58,7 +58,7 @@ before_script:
5858
# For teensy build
5959
- sudo apt-get install realpath
6060
# For nrf builds
61-
- ([[ $TRAVIS_BOARD != "feather52" && $TRAVIS_BOARD != "pca10056" ]] || sudo ports/nrf/drivers/bluetooth/download_ble_stack.sh)
61+
- ([[ $TRAVIS_BOARD != "feather52832" && $TRAVIS_BOARD != "pca10056" ]] || sudo ports/nrf/drivers/bluetooth/download_ble_stack.sh)
6262
# For huzzah builds
6363
- 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
6464
# For coverage testing (upgrade is used to get latest urllib3 version)

‎ports/nrf/boards/feather52/README.md renamed to ‎ports/nrf/boards/feather52832/README.md

File renamed without changes.

‎ports/nrf/boards/feather52/board.c renamed to ‎ports/nrf/boards/feather52832/board.c

File renamed without changes.

‎ports/nrf/boards/feather52/bootloader/.gitattributes renamed to ‎ports/nrf/boards/feather52832/bootloader/.gitattributes

File renamed without changes.

‎ports/nrf/boards/feather52/bootloader/README.md renamed to ‎ports/nrf/boards/feather52832/bootloader/README.md

File renamed without changes.

‎ports/nrf/boards/feather52/bootloader/feather52_bootloader_2.0.1_s132_single.zip renamed to ‎ports/nrf/boards/feather52832/bootloader/feather52_bootloader_2.0.1_s132_single.zip

File renamed without changes.

‎ports/nrf/boards/feather52/bootloader/feather52_bootloader_5.0.0_s132_single.zip renamed to ‎ports/nrf/boards/feather52832/bootloader/feather52_bootloader_5.0.0_s132_single.zip

File renamed without changes.

‎ports/nrf/boards/feather52/custom_nrf52832_dfu_app_2.0.1.ld renamed to ‎ports/nrf/boards/feather52832/custom_nrf52832_dfu_app_2.0.1.ld

File renamed without changes.

‎ports/nrf/boards/feather52/custom_nrf52832_dfu_app_5.0.0.ld renamed to ‎ports/nrf/boards/feather52832/custom_nrf52832_dfu_app_5.0.0.ld

File renamed without changes.

‎ports/nrf/boards/feather52/examples/ble_scan.py renamed to ‎ports/nrf/boards/feather52832/examples/ble_scan.py

File renamed without changes.

‎ports/nrf/boards/feather52/examples/blinky.py renamed to ‎ports/nrf/boards/feather52832/examples/blinky.py

File renamed without changes.

‎ports/nrf/boards/feather52/examples/i2c_scan.py renamed to ‎ports/nrf/boards/feather52832/examples/i2c_scan.py

File renamed without changes.

‎ports/nrf/boards/feather52/examples/pulseio.py renamed to ‎ports/nrf/boards/feather52832/examples/pulseio.py

File renamed without changes.

‎ports/nrf/boards/feather52/mpconfigboard.h renamed to ‎ports/nrf/boards/feather52832/mpconfigboard.h

File renamed without changes.

‎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

‎ports/nrf/boards/feather52/mpconfigboard_s132.mk renamed to ‎ports/nrf/boards/feather52832/mpconfigboard_s132.mk

File renamed without changes.

‎ports/nrf/boards/feather52/nrf52_hal_conf.h renamed to ‎ports/nrf/boards/feather52832/nrf52_hal_conf.h

File renamed without changes.

‎ports/nrf/boards/feather52/pins.csv renamed to ‎ports/nrf/boards/feather52832/pins.csv

File renamed without changes.

‎tools/build_adafruit_bins.sh

Lines changed: 4 additions & 4 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"
@@ -20,8 +20,8 @@ for board in $boards; do
2020
if [ $board == "feather_huzzah" ]; then
2121
make $PARALLEL -C ports/esp8266 BOARD=feather_huzzah
2222
(( exit_status = exit_status || $? ))
23-
elif [ $board == "feather52" ]; then
24-
make $PARALLEL -C ports/nrf BOARD=feather52
23+
elif [ $board == "feather52832" ]; then
24+
make $PARALLEL -C ports/nrf BOARD=feather52832
2525
(( exit_status = exit_status || $? ))
2626
elif [ $board == "pca10056" ]; then
2727
make $PARALLEL -C ports/nrf BOARD=pca10056 SD=s140
@@ -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