8000 Switch to Feather52s full name to avoid confusion with the nrf52840 later by tannewt · Pull Request #945 · adafruit/circuitpython · GitHub
[go: up one dir, main page]
Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jun 18, 2018
Merged

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

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
05547b7
Switch to Feather52s full name to avoid confusion with the nrf52840 l…
tannewt Jun 18, 2018
724bd7c
Correct the tool build
tannewt Jun 18, 2018
c90abb1
Fix BLE file download for travis.
tannewt Jun 18, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Switch to Feather52s full name to avoid confusion with the nrf52840 l… 
…ater.

Fixes #940
  • Loading branch information
@tannewt
tannewt committed Jun 18, 2018
commit 05547b72ac088764d0d96d3e7121069474f4ff8c
2 changes: 1 addition & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
0 ports/nrf/boards/feather52/README.md → ports/nrf/boards/feather52832/README.md
View file
Open in desktop
File renamed without changes.
0 ports/nrf/boards/feather52/board.c → ports/nrf/boards/feather52832/board.c
View file
Open in desktop
File renamed without changes.
0 ...oards/feather52/bootloader/.gitattributes → ...ds/feather52832/bootloader/.gitattributes
View file
Open in desktop
File renamed without changes.
0 ...nrf/boards/feather52/bootloader/README.md → .../boards/feather52832/bootloader/README.md
View file
Open in desktop
File renamed without changes.
0 ...eather52_bootloader_2.0.1_s132_single.zip → ...eather52_bootloader_2.0.1_s132_single.zip
View file
Open in desktop
File renamed without changes.
0 ...eather52_bootloader_5.0.0_s132_single.zip → ...eather52_bootloader_5.0.0_s132_single.zip
View file
Open in desktop
File renamed without changes.
0 ...eather52/custom_nrf52832_dfu_app_2.0.1.ld → ...her52832/custom_nrf52832_dfu_app_2.0.1.ld
View file
Open in desktop
File renamed without changes.
0 ...eather52/custom_nrf52832_dfu_app_5.0.0.ld → ...her52832/custom_nrf52832_dfu_app_5.0.0.ld
View file
Open in desktop
File renamed without changes.
0 ...nrf/boards/feather52/examples/ble_scan.py → .../boards/feather52832/examples/ble_scan.py
View file
Open in desktop
File renamed without changes.
0 ...s/nrf/boards/feather52/examples/blinky.py → ...rf/boards/feather52832/examples/blinky.py
View file
Open in desktop
File renamed without changes.
0 ...nrf/boards/feather52/examples/i2c_scan.py → .../boards/feather52832/examples/i2c_scan.py
View file
Open in desktop
File renamed without changes.
0 .../nrf/boards/feather52/examples/pulseio.py → ...f/boards/feather52832/examples/pulseio.py
View file
Open in desktop
File renamed without changes.
0 ports/nrf/boards/feather52/mpconfigboard.h → ...s/nrf/boards/feather52832/mpconfigboard.h
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions ports/nrf/boards/feather52/mpconfigboard.mk → .../nrf/boards/feather52832/mpconfigboard.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
0 ...rf/boards/feather52/mpconfigboard_s132.mk → ...boards/feather52832/mpconfigboard_s132.mk
View file
Open in desktop
File renamed without changes.
0 ports/nrf/boards/feather52/nrf52_hal_conf.h → .../nrf/boards/feather52832/nrf52_hal_conf.h
View file
Open in desktop
File renamed without changes.
0 ports/nrf/boards/feather52/pins.csv → ports/nrf/boards/feather52832/pins.csv
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions tools/build_adafruit_bins.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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
Expand Down
0