diff options
| author | Dan Halbert <halbert@halwitz.org> | 2018-06-18 18:11:06 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-18 18:11:06 -0400 |
| commit | f5fab358aab883ef21b30fce10ac0b34dc2f6210 (patch) | |
| tree | f8965e21d08ca3e32f9251c3ffdf2252638b1fd2 /ports/nrf | |
| parent | be5eb91df8d84de77bce976c7c1fc49686a9f7f0 (diff) | |
| parent | c90abb1370b5b845ac09ba9e55aa7ba4f00c4ede (diff) | |
Merge pull request #945 from tannewt/nrf528323.0.0-rc.0
Switch to Feather52s full name to avoid confusion with the nrf52840 later
Diffstat (limited to 'ports/nrf')
| -rw-r--r-- | ports/nrf/boards/feather52832/README.md (renamed from ports/nrf/boards/feather52/README.md) | 0 | ||||
| -rw-r--r-- | ports/nrf/boards/feather52832/board.c (renamed from ports/nrf/boards/feather52/board.c) | 0 | ||||
| -rw-r--r-- | ports/nrf/boards/feather52832/bootloader/.gitattributes (renamed from ports/nrf/boards/feather52/bootloader/.gitattributes) | 0 | ||||
| -rw-r--r-- | ports/nrf/boards/feather52832/bootloader/README.md (renamed from ports/nrf/boards/feather52/bootloader/README.md) | 0 | ||||
| -rw-r--r-- | ports/nrf/boards/feather52832/bootloader/feather52_bootloader_2.0.1_s132_single.zip (renamed from ports/nrf/boards/feather52/bootloader/feather52_bootloader_2.0.1_s132_single.zip) | bin | 131786 -> 131786 bytes | |||
| -rw-r--r-- | ports/nrf/boards/feather52832/bootloader/feather52_bootloader_5.0.0_s132_single.zip (renamed from ports/nrf/boards/feather52/bootloader/feather52_bootloader_5.0.0_s132_single.zip) | bin | 159962 -> 159962 bytes | |||
| -rw-r--r-- | ports/nrf/boards/feather52832/custom_nrf52832_dfu_app_2.0.1.ld (renamed from ports/nrf/boards/feather52/custom_nrf52832_dfu_app_2.0.1.ld) | 0 | ||||
| -rw-r--r-- | ports/nrf/boards/feather52832/custom_nrf52832_dfu_app_5.0.0.ld (renamed from ports/nrf/boards/feather52/custom_nrf52832_dfu_app_5.0.0.ld) | 0 | ||||
| -rw-r--r-- | ports/nrf/boards/feather52832/examples/ble_scan.py (renamed from ports/nrf/boards/feather52/examples/ble_scan.py) | 0 | ||||
| -rw-r--r-- | ports/nrf/boards/feather52832/examples/blinky.py (renamed from ports/nrf/boards/feather52/examples/blinky.py) | 0 | ||||
| -rw-r--r-- | ports/nrf/boards/feather52832/examples/i2c_scan.py (renamed from ports/nrf/boards/feather52/examples/i2c_scan.py) | 0 | ||||
| -rw-r--r-- | ports/nrf/boards/feather52832/examples/pulseio.py (renamed from ports/nrf/boards/feather52/examples/pulseio.py) | 0 | ||||
| -rw-r--r-- | ports/nrf/boards/feather52832/mpconfigboard.h (renamed from ports/nrf/boards/feather52/mpconfigboard.h) | 0 | ||||
| -rw-r--r-- | ports/nrf/boards/feather52832/mpconfigboard.mk (renamed from ports/nrf/boards/feather52/mpconfigboard.mk) | 4 | ||||
| -rw-r--r-- | ports/nrf/boards/feather52832/mpconfigboard_s132.mk (renamed from ports/nrf/boards/feather52/mpconfigboard_s132.mk) | 0 | ||||
| -rw-r--r-- | ports/nrf/boards/feather52832/nrf52_hal_conf.h (renamed from ports/nrf/boards/feather52/nrf52_hal_conf.h) | 0 | ||||
| -rw-r--r-- | ports/nrf/boards/feather52832/pins.csv (renamed from ports/nrf/boards/feather52/pins.csv) | 0 |
17 files changed, 2 insertions, 2 deletions
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 Binary files differindex 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 Binary files differindex 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 |
