Merge pull request #1135 from dhalbert/nrf_board_rename

rename nRF boards to feather_nrf52832 and feather_nrf52840_express

Author: tannewt

.travis.yml

@@ -30,7 +30,8 @@ env:
   - TRAVIS_BOARD=pirkey_m0
   - TRAVIS_BOARD=gemma_m0
   - TRAVIS_BOARD=hallowing_m0_express
-  - TRAVIS_BOARD=feather52832
+  - TRAVIS_BOARD=feather_nrf52832
+  - TRAVIS_BOARD=feather_nrf52840_express
 
 addons:
   artifacts:
@@ -54,7 +55,7 @@ before_script:
   - ([[ -z "$TRAVIS_BOARD" || $TRAVIS_BOARD = "feather_huzzah" ]] || (wget https://s3.amazonaws.com/adafruit-circuit-python/gcc-arm-embedded_7-2018q2-1~trusty1_amd64.deb && sudo dpkg -i gcc-arm-embedded*_amd64.deb))
 
   # For nrf builds
-  - ([[ $TRAVIS_BOARD != "feather52832" && $TRAVIS_BOARD != "pca10056" ]] || sudo ports/nrf/drivers/bluetooth/download_ble_stack.sh)
+  - ([[ $TRAVIS_BOARD != "feather_nrf52832" && $TRAVIS_BOARD != "feather_nrf52840_express" && $TRAVIS_BOARD != "pca10056" ]] || sudo ports/nrf/drivers/bluetooth/download_ble_stack.sh)
   # For huzzah builds
   - 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
   # For coverage testing (upgrade is used to get latest urllib3 version)

ports/nrf/README.md

@@ -36,9 +36,9 @@ the following links:
 > **NOTE**: These board specific readmes may be more up to date than the
   generic board-neutral documentation further down.
 
-* Adafruit [Feather nRF52](boards/feather52/README.md): 512KB Flash, 64KB SRAM
-* Adafruit [Feather nRF52840](boards/feather52840/README.md): 1MB Flash, 256KB SRAM
-* Nordic PCA10056 see [Feather nRF52840](boards/feather52840/README.md)
+* Adafruit [Feather nRF52](boards/feather_nrf52832/README.md): 512KB Flash, 64KB SRAM
+* Adafruit [Feather nRF52840](boards/feather_nrf52840_express/README.md): 1MB Flash, 256KB SRAM
+* Nordic PCA10056 see [Feather nRF52840](boards/pca10056/README.md)
 
 For all other board targets, see the generic notes below.
 
@@ -74,12 +74,12 @@ Note: further tuning of features to include in bluetooth or even setting up the
 
 ## Target Boards and Make Flags
 
-Target Board (BOARD) | Bluetooth Stack (SD)    | Bluetooth Support      | Flash Util
----------------------|-------------------------|------------------------|-------------------------------
-pca10040             | s132                    | Peripheral and Scanner | [Segger](#segger-targets)
-feather52832         | s132                    | Peripheral and Scanner | [UART DFU](#dfu-targets)
-pca10056             | s140                    | Peripheral and Scanner | [Segger](#segger-targets)
-feather52840         | s140                    | Peripheral and Scanner | [UART DFU](#dfu-targets)
+Target Board (BOARD)     | Bluetooth Stack (SD)    | Bluetooth Support      | Flash Util
+-------------------------|-------------------------|------------------------|-------------------------------
+pca10040                 | s132                    | Peripheral and Scanner | [Segger](#segger-targets)
+pca10056                 | s140                    | Peripheral and Scanner | [Segger](#segger-targets)
+feather_nrf52832         | s132                    | Peripheral and Scanner | [UART DFU](#dfu-targets)
+feather_nrf52840_express | s140                    | Peripheral and Scanner | UF2 bootloader
 
 ## Segger Targets
 
@@ -107,9 +107,9 @@ run follow command to install [adafruit-nrfutil](https://github.com/adafruit/Ada
 * dfu-gen: Generates a Firmware zip to be used by the DFU flash application.
 * dfu-flash: Triggers the DFU flash application to upload the firmware from the generated Firmware zip file.
 
-Example on how to generate and flash feather52832 target:
+Example on how to generate and flash feather_nrf52832 target:
 
-    make BOARD=feather52832 SD=s132
+    make BOARD=feather_nrf52832 SD=s132
     make BOARD=feather52832 SD=s132 dfu-gen dfu-flash
 
 ## Bluetooth LE REPL

ports/nrf/boards/feather52832/mpconfigboard.mk

@@ -38,12 +38,12 @@ run following command to install [adafruit-nrfutil](https://github.com/adafruit/
 #### REPL over UART (default settings)
 
 To build a CircuitPython binary with default settings for the
-`feather52832` target enter:
+`feather_nrf52832` target enter:
 
-> **NOTE:** `BOARD=feather52832` is the default option and isn't stricly required.
+> **NOTE:** `BOARD=feather_nrf52832` is the default option and isn't stricly required.
 
 ```
-$ make BOARD=feather52832 V=1
+$ make BOARD=feather_nrf52832 V=1
 ```
 
 #### REPL over BLE UART (AKA 'NUS')
@@ -113,15 +113,15 @@ image, as described earlier in this readme.
 > The name of the serial port target will vary, depending on your OS.
 
 ```
-$ make BOARD=feather52832 SERIAL=/dev/tty.SLAB_USBtoUART dfu-gen dfu-flash
+$ make BOARD=feather_nrf52832 SERIAL=/dev/tty.SLAB_USBtoUART dfu-gen dfu-flash
 ```
 
 By default, CircuitPython will build with **BLE** support enabled using
 `SD=s132` and the `SOFTDEV_VERSION=2.0.1`. If you wish to specify a different
 SD family or version you can enter the optional fields as shown below:
 
 ```
-$ make BOARD=feather52832 SERIAL=/dev/tty.SLAB_USBtoUART SD=s132 SOFTDEV_VERSION=5.0.0 dfu-gen dfu-flash
+$ make BOARD=feather_nrf52832 SERIAL=/dev/tty.SLAB_USBtoUART SD=s132 SOFTDEV_VERSION=5.0.0 dfu-gen dfu-flash
 ```
 
 ## Working with CircuitPython