diff options
| -rwxr-xr-x | .travis.yml | 5 | ||||
| -rw-r--r-- | ports/nrf/boards/feather_nrf52832/mpconfigboard.mk | 4 | ||||
| -rw-r--r-- | ports/nrf/boards/feather_nrf52840_express/mpconfigboard.h | 24 |
3 files changed, 17 insertions, 16 deletions
diff --git a/.travis.yml b/.travis.yml index 93d981518..ecc94ba64 100755 --- a/.travis.yml +++ b/.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) diff --git a/ports/nrf/boards/feather_nrf52832/mpconfigboard.mk b/ports/nrf/boards/feather_nrf52832/mpconfigboard.mk index 41f01bb04..c370b724e 100644 --- a/ports/nrf/boards/feather_nrf52832/mpconfigboard.mk +++ b/ports/nrf/boards/feather_nrf52832/mpconfigboard.mk @@ -4,8 +4,8 @@ MCU_SUB_VARIANT = nrf52 SD ?= s132 SOFTDEV_VERSION ?= 2.0.1 -LD_FILE = boards/feather_nrf_52832/custom_nrf52832_dfu_app_$(SOFTDEV_VERSION).ld -BOOT_FILE = boards/feather_nrf_52832/bootloader/feather52_bootloader_$(SOFTDEV_VERSION)_s132_single +LD_FILE = boards/feather_nrf52832/custom_nrf52832_dfu_app_$(SOFTDEV_VERSION).ld +BOOT_FILE = boards/feather_nrf52832/bootloader/feather52_bootloader_$(SOFTDEV_VERSION)_s132_single BOOT_SETTING_ADDR = 0x7F000 NRF_DEFINES += -DNRF52832_XXAA diff --git a/ports/nrf/boards/feather_nrf52840_express/mpconfigboard.h b/ports/nrf/boards/feather_nrf52840_express/mpconfigboard.h index 4c0d77b24..ce21e7386 100644 --- a/ports/nrf/boards/feather_nrf52840_express/mpconfigboard.h +++ b/ports/nrf/boards/feather_nrf52840_express/mpconfigboard.h @@ -31,18 +31,18 @@ #define MICROPY_HW_MCU_NAME "nRF52840" #define MICROPY_PY_SYS_PLATFORM "Feather52840" -#define MICROPY_HW_NEOPIXEL NRF_GPIO_PIN_MAP(0, 13) - -#define MICROPY_QSPI_DATA0 NRF_GPIO_PIN_MAP(1, 9) -#define MICROPY_QSPI_DATA1 NRF_GPIO_PIN_MAP(0, 11) -#define MICROPY_QSPI_DATA2 NRF_GPIO_PIN_MAP(0, 12) -#define MICROPY_QSPI_DATA3 NRF_GPIO_PIN_MAP(0, 14) -#define MICROPY_QSPI_SCK NRF_GPIO_PIN_MAP(0, 8) -#define MICROPY_QSPI_CS NRF_GPIO_PIN_MAP(1, 8) - -#define MICROPY_HW_UART_RX NRF_GPIO_PIN_MAP(0, 8) -#define MICROPY_HW_UART_TX NRF_GPIO_PIN_MAP(0, 6) -#define MICROPY_HW_UART_HWFC (0) +// #define MICROPY_HW_NEOPIXEL NRF_GPIO_PIN_MAP(0, 13) + +// #define MICROPY_QSPI_DATA0 NRF_GPIO_PIN_MAP(1, 9) +// #define MICROPY_QSPI_DATA1 NRF_GPIO_PIN_MAP(0, 11) +// #define MICROPY_QSPI_DATA2 NRF_GPIO_PIN_MAP(0, 12) +// #define MICROPY_QSPI_DATA3 NRF_GPIO_PIN_MAP(0, 14) +// #define MICROPY_QSPI_SCK NRF_GPIO_PIN_MAP(0, 8) +// #define MICROPY_QSPI_CS NRF_GPIO_PIN_MAP(1, 8) + +// #define MICROPY_HW_UART_RX NRF_GPIO_PIN_MAP(0, 8) +// #define MICROPY_HW_UART_TX NRF_GPIO_PIN_MAP(0, 6) +// #define MICROPY_HW_UART_HWFC (0) #define CIRCUITPY_AUTORELOAD_DELAY_MS 500 |