Merge pull request #2246 from dhalbert/nano-33-ble

Arduino Nano 33 BLE board definition
2019-10-26 18:29:53 -04:00 · 2019-10-26 18:29:53 -04:00 · 2b02750f11
parent 3683ee3ffa 7dadf9b748
commit 2b02750f11
20 changed files with 198 additions and 13 deletions
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@ -75,6 +75,7 @@ jobs:
        board:
        - "arduino_mkr1300"
        - "arduino_mkrzero"
+        - "arduino_nano_33_ble"
        - "arduino_zero"
        - "bast_pro_mini_m0"
        - "capablerobot_usbhub"
--- a/ports/nrf/boards/arduino_nano_33_ble/README.md
+++ b/ports/nrf/boards/arduino_nano_33_ble/README.md
@ -0,0 +1,27 @@
+# Arduino Nano 33 BLE and Nano 33 BLE Sense
+
+The [Arduino Nano 33 BLE](https://store.arduino.cc/usa/nano-33-ble-with-headers) and
+[Arduino Nano 33 BLE Sense](https://store.arduino.cc/usa/nano-33-ble-sense) and
+are built around the NINA B306 module, based on Nordic nRF 52840 and containing
+a powerful Cortex M4F. Both include an onboard 9 axis Inertial Measurement Unit (IMU), the LSM9DS1.
+The Nano 33 BLE Sense adds an LPS22HB barometric pressure and temperature sensor,
+an ADPS-9960 digital proximity, ambient light, RGB, and gensture sensor,
+and an MP34DT05 digital microphone.
+
+Note: the Arduino Nano 33 BLE and BLE Sense do not include a QSPI external
+flash. Any Python code will need to be stored on the internal flash
+filesystem.
+
+I2C pins `board.SCL1` and `board.SDA1` are not exposed and are used for onboard peripherals.
+Pin `board.R_PULLUP` must be set to high to enable the `SCL1` and `SDA1` pullups for proper operation.
+
+Pin `board.VDD_ENV` applies power to the LSM9DS1, and must be high for it to be operational.
+
+Pins `board.MIC_PWR`, `board.PDMDIN`, and `board.PDMCLK` are for the Nano 33 BLE Sense onboard microphone.
+
+Pin `board.INT_ADPS` is the interrupt pin from the ADPS-9960.
+
+Pins `board.RGB_LED_R`, `board.RGB_LED_G`, and `board.RGB_LED_B`
+are the red, green and blue LEDS in the onboard RGB LED.
+
+Pins `board.LED_G` and `board.LED_Y` are onboard green and red LEDs. `board.LED_Y` is also `board.SCK`.
--- a/ports/nrf/boards/arduino_nano_33_ble/board.c
+++ b/ports/nrf/boards/arduino_nano_33_ble/board.c
@ -0,0 +1,63 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2017 Scott Shawcroft for Adafruit Industries
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "boards/board.h"
+#include "nrf.h"
+#include "nrf_rtc.h"
+
+void board_init(void) {
+    // Initializations below from Arduino variant.cpp.
+
+    // // turn power LED on
+    // pinMode(LED_PWR, OUTPUT);
+    // digitalWrite(LED_PWR, HIGH);
+
+    // Errata Nano33BLE - I2C pullup is on SWO line, need to disable TRACE
+    // was being enabled by nrfx_clock_anomaly_132
+    CoreDebug->DEMCR = 0;
+    NRF_CLOCK->TRACECONFIG = 0;
+
+    // FIXME: bootloader enables interrupt on COMPARE[0], which we don't handle
+    // Disable it here to avoid getting stuck when OVERFLOW irq is triggered
+    nrf_rtc_event_disable(NRF_RTC1, NRF_RTC_INT_COMPARE0_MASK);
+    nrf_rtc_int_disable(NRF_RTC1, NRF_RTC_INT_COMPARE0_MASK);
+
+    // // FIXME: always enable I2C pullup and power @startup
+    // // Change for maximum powersave
+    // pinMode(PIN_ENABLE_SENSORS_3V3, OUTPUT);
+    // pinMode(PIN_ENABLE_I2C_PULLUP, OUTPUT);
+
+    // digitalWrite(PIN_ENABLE_SENSORS_3V3, HIGH);
+    // digitalWrite(PIN_ENABLE_I2C_PULLUP, HIGH);
+}
+
+bool board_requests_safe_mode(void) {
+  return false;
+}
+
+void reset_board(void) {
+
+}
--- a/ports/nrf/boards/arduino_nano_33_ble/mpconfigboard.h
+++ b/ports/nrf/boards/arduino_nano_33_ble/mpconfigboard.h
@ -0,0 +1,16 @@
+#include "nrfx/hal/nrf_gpio.h"
+
+#define MICROPY_HW_BOARD_NAME       "Arduino Nano 33 BLE"
+#define MICROPY_HW_MCU_NAME         "nRF52840"
+
+#define CIRCUITPY_AUTORELOAD_DELAY_MS 500
+
+#define DEFAULT_I2C_BUS_SCL         (&pin_P0_02)
+#define DEFAULT_I2C_BUS_SDA         (&pin_P0_31)
+
+#define DEFAULT_SPI_BUS_SCK         (&pin_P0_13)
+#define DEFAULT_SPI_BUS_MOSI        (&pin_P0_01)
+#define DEFAULT_SPI_BUS_MISO        (&pin_P1_08)
+
+#define DEFAULT_UART_BUS_RX         (&pin_P1_10)
+#define DEFAULT_UART_BUS_TX         (&pin_P1_03)
--- a/ports/nrf/boards/arduino_nano_33_ble/mpconfigboard.mk
+++ b/ports/nrf/boards/arduino_nano_33_ble/mpconfigboard.mk
@ -0,0 +1,24 @@
+USB_VID = 0x2341
+USB_PID = 0x805A
+USB_PRODUCT = "Arduino_Nano_33_BLE"
+USB_MANUFACTURER = "Arduino"
+
+MCU_SERIES = m4
+MCU_VARIANT = nrf52
+MCU_SUB_VARIANT = nrf52840
+MCU_CHIP = nrf52840
+SD ?= s140
+SOFTDEV_VERSION ?= 6.1.0
+
+BOOT_SETTING_ADDR = 0xFF000
+
+ifeq ($(SD),)
+	LD_FILE = boards/nrf52840_1M_256k.ld
+else
+	LD_FILE = boards/adafruit_$(MCU_SUB_VARIANT)_$(SD_LOWER)_v$(firstword $(subst ., ,$(SOFTDEV_VERSION))).ld
+	CIRCUITPY_BLEIO = 1
+endif
+
+NRF_DEFINES += -DNRF52840_XXAA -DNRF52840
+
+INTERNAL_FLASH_FILESYSTEM = 1
--- a/ports/nrf/boards/arduino_nano_33_ble/pins.c
+++ b/ports/nrf/boards/arduino_nano_33_ble/pins.c
@ -0,0 +1,63 @@
+#include "shared-bindings/board/__init__.h"
+
+STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
+    { MP_ROM_QSTR(MP_QSTR_D2), MP_ROM_PTR(&pin_P1_11) },
+    { MP_ROM_QSTR(MP_QSTR_D3), MP_ROM_PTR(&pin_P1_12) },
+    { MP_ROM_QSTR(MP_QSTR_D4), MP_ROM_PTR(&pin_P1_15) },
+    { MP_ROM_QSTR(MP_QSTR_D5), MP_ROM_PTR(&pin_P1_13) },
+    { MP_ROM_QSTR(MP_QSTR_D6), MP_ROM_PTR(&pin_P1_14) },
+    { MP_ROM_QSTR(MP_QSTR_D7), MP_ROM_PTR(&pin_P0_23) },
+    { MP_ROM_QSTR(MP_QSTR_D8), MP_ROM_PTR(&pin_P0_21) },
+    { MP_ROM_QSTR(MP_QSTR_D9), MP_ROM_PTR(&pin_P0_27) },
+    { MP_ROM_QSTR(MP_QSTR_D10), MP_ROM_PTR(&pin_P1_02) },
+
+    { MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_P0_04) },
+    { MP_ROM_QSTR(MP_QSTR_A1), MP_ROM_PTR(&pin_P0_05) },
+    { MP_ROM_QSTR(MP_QSTR_A2), MP_ROM_PTR(&pin_P0_30) },
+    { MP_ROM_QSTR(MP_QSTR_A3), MP_ROM_PTR(&pin_P0_29) },
+
+    { MP_ROM_QSTR(MP_QSTR_A4), MP_ROM_PTR(&pin_P0_31) },
+    { MP_ROM_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_P0_31) },
+
+    { MP_ROM_QSTR(MP_QSTR_A5), MP_ROM_PTR(&pin_P0_02) },
+    { MP_ROM_QSTR(MP_QSTR_SCL), MP_ROM_PTR(&pin_P0_02) },
+
+    { MP_ROM_QSTR(MP_QSTR_A6), MP_ROM_PTR(&pin_P0_28) },
+    { MP_ROM_QSTR(MP_QSTR_A7), MP_ROM_PTR(&pin_P0_03) },
+
+    { MP_ROM_QSTR(MP_QSTR_SDA1), MP_ROM_PTR(&pin_P0_14) },
+    { MP_ROM_QSTR(MP_QSTR_SCL1), MP_ROM_PTR(&pin_P0_15) },
+
+    { MP_ROM_QSTR(MP_QSTR_MOSI), MP_ROM_PTR(&pin_P1_01) },
+    { MP_ROM_QSTR(MP_QSTR_MISO), MP_ROM_PTR(&pin_P1_08) },
+
+    { MP_ROM_QSTR(MP_QSTR_SCK), MP_ROM_PTR(&pin_P0_13) },
+    { MP_ROM_QSTR(MP_QSTR_LED_Y), MP_ROM_PTR(&pin_P0_13)  },
+
+    { MP_ROM_QSTR(MP_QSTR_LED_G), MP_ROM_PTR(&pin_P1_09)  },
+
+    { MP_ROM_QSTR(MP_QSTR_RGB_LED_R), MP_ROM_PTR(&pin_P0_24)  },
+    { MP_ROM_QSTR(MP_QSTR_RGB_LED_G), MP_ROM_PTR(&pin_P0_16)  },
+    { MP_ROM_QSTR(MP_QSTR_RGB_LED_B), MP_ROM_PTR(&pin_P0_06)  },
+
+    // Power line to LSM9DS1.
+    { MP_ROM_QSTR(MP_QSTR_VDD_ENV), MP_ROM_PTR(&pin_P0_22)  },
+
+    // Pullup voltage for SDA1 and SCL1
+    { MP_ROM_QSTR(MP_QSTR_R_PULLUP), MP_ROM_PTR(&pin_P1_00)  },
+
+    { MP_ROM_QSTR(MP_QSTR_MIC_PWR), MP_ROM_PTR(&pin_P0_17)  },
+    { MP_ROM_QSTR(MP_QSTR_PDMCLK), MP_ROM_PTR(&pin_P0_26)  },
+    { MP_ROM_QSTR(MP_QSTR_PDMDIN), MP_ROM_PTR(&pin_P0_25)  },
+
+    { MP_ROM_QSTR(MP_QSTR_INT_APDS), MP_ROM_PTR(&pin_P0_19)  },
+
+    { MP_ROM_QSTR(MP_QSTR_TX), MP_ROM_PTR(&pin_P1_03) },
+    { MP_ROM_QSTR(MP_QSTR_RX), MP_ROM_PTR(&pin_P1_10) },
+
+    { MP_ROM_QSTR(MP_QSTR_UART), MP_ROM_PTR(&board_uart_obj) },
+    { MP_ROM_QSTR(MP_QSTR_SPI), MP_ROM_PTR(&board_spi_obj) },
+    { MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&board_i2c_obj) },
+};
+
+MP_DEFINE_CONST_DICT(board_module_globals, board_module_globals_table);
--- a/ports/nrf/boards/circuitplayground_bluefruit/mpconfigboard.h
+++ b/ports/nrf/boards/circuitplayground_bluefruit/mpconfigboard.h
@ -29,7 +29,6 @@

 #define MICROPY_HW_BOARD_NAME       "Adafruit Circuit Playground Bluefruit"
 #define MICROPY_HW_MCU_NAME         "nRF52840"
-#define MICROPY_PY_SYS_PLATFORM     "CircuitPlaygroundBluefruit"

 #define FLASH_SIZE                  (0x100000)
 #define FLASH_PAGE_SIZE             (4096)
--- a/ports/nrf/boards/electronut_labs_blip/mpconfigboard.h
+++ b/ports/nrf/boards/electronut_labs_blip/mpconfigboard.h
@ -32,7 +32,6 @@

 #define MICROPY_HW_BOARD_NAME       "Electronut Labs Blip"
 #define MICROPY_HW_MCU_NAME         "nRF52840"
-#define MICROPY_PY_SYS_PLATFORM     "ElectronutLabsPapyr"

 #define CIRCUITPY_AUTORELOAD_DELAY_MS 500

--- a/ports/nrf/boards/electronut_labs_papyr/mpconfigboard.h
+++ b/ports/nrf/boards/electronut_labs_papyr/mpconfigboard.h
@ -31,7 +31,6 @@

 #define MICROPY_HW_BOARD_NAME       "Electronut Labs Papyr"
 #define MICROPY_HW_MCU_NAME         "nRF52840"
-#define MICROPY_PY_SYS_PLATFORM     "ElectronutLabsPapyr"

 #define CIRCUITPY_AUTORELOAD_DELAY_MS 500

--- a/ports/nrf/boards/feather_nrf52840_express/mpconfigboard.h
+++ b/ports/nrf/boards/feather_nrf52840_express/mpconfigboard.h
@ -29,7 +29,6 @@

 #define MICROPY_HW_BOARD_NAME       "Adafruit Feather nRF52840 Express"
 #define MICROPY_HW_MCU_NAME         "nRF52840"
-#define MICROPY_PY_SYS_PLATFORM     "Feather52840Express"

 #define FLASH_SIZE                  (0x100000)
 #define FLASH_PAGE_SIZE             (4096)
--- a/ports/nrf/boards/makerdiary_nrf52840_mdk/mpconfigboard.h
+++ b/ports/nrf/boards/makerdiary_nrf52840_mdk/mpconfigboard.h
@ -31,7 +31,6 @@

 #define MICROPY_HW_BOARD_NAME       "MakerDiary nRF52840 MDK"
 #define MICROPY_HW_MCU_NAME         "nRF52840"
-#define MICROPY_PY_SYS_PLATFORM     "MakerDiary52840MDK"

 #define MICROPY_QSPI_DATA0                NRF_GPIO_PIN_MAP(1, 5)
 #define MICROPY_QSPI_DATA1                NRF_GPIO_PIN_MAP(1, 4)
--- a/ports/nrf/boards/makerdiary_nrf52840_mdk_usb_dongle/mpconfigboard.h
+++ b/ports/nrf/boards/makerdiary_nrf52840_mdk_usb_dongle/mpconfigboard.h
@ -31,7 +31,6 @@

 #define MICROPY_HW_BOARD_NAME       "MakerDiary nRF52840 MDK USB Dongle"
 #define MICROPY_HW_MCU_NAME         "nRF52840"
-#define MICROPY_PY_SYS_PLATFORM     "MakerDiary52840MDKDongle"

 #define CIRCUITPY_AUTORELOAD_DELAY_MS 500

--- a/ports/nrf/boards/metro_nrf52840_express/mpconfigboard.h
+++ b/ports/nrf/boards/metro_nrf52840_express/mpconfigboard.h
@ -29,7 +29,6 @@

 #define MICROPY_HW_BOARD_NAME       "Adafruit Metro nRF52840 Express"
 #define MICROPY_HW_MCU_NAME         "nRF52840"
-#define MICROPY_PY_SYS_PLATFORM     "Metro52840Express"

 #define FLASH_SIZE                  (0x100000)
 #define FLASH_PAGE_SIZE             (4096)
--- a/ports/nrf/boards/particle_argon/mpconfigboard.h
+++ b/ports/nrf/boards/particle_argon/mpconfigboard.h
@ -29,7 +29,6 @@

 #define MICROPY_HW_BOARD_NAME       "Particle Argon"
 #define MICROPY_HW_MCU_NAME         "nRF52840"
-#define MICROPY_PY_SYS_PLATFORM     "Particle Argon"

 #define MICROPY_HW_LED_STATUS          (&pin_P1_12)

--- a/ports/nrf/boards/particle_boron/mpconfigboard.h
+++ b/ports/nrf/boards/particle_boron/mpconfigboard.h
@ -29,7 +29,6 @@

 #define MICROPY_HW_BOARD_NAME       "Particle Boron"
 #define MICROPY_HW_MCU_NAME         "nRF52840"
-#define MICROPY_PY_SYS_PLATFORM     "Particle Boron"

 #define MICROPY_HW_LED_STATUS          (&pin_P1_12)

--- a/ports/nrf/boards/particle_xenon/mpconfigboard.h
+++ b/ports/nrf/boards/particle_xenon/mpconfigboard.h
@ -29,7 +29,6 @@

 #define MICROPY_HW_BOARD_NAME       "Particle Xenon"
 #define MICROPY_HW_MCU_NAME         "nRF52840"
-#define MICROPY_PY_SYS_PLATFORM     "Particle Xenon"

 #define MICROPY_HW_LED_STATUS          (&pin_P1_12)

--- a/ports/nrf/boards/pca10056/mpconfigboard.h
+++ b/ports/nrf/boards/pca10056/mpconfigboard.h
@ -28,7 +28,6 @@

 #define MICROPY_HW_BOARD_NAME       "PCA10056 nRF52840-DK"
 #define MICROPY_HW_MCU_NAME         "nRF52840"
-#define MICROPY_PY_SYS_PLATFORM     "nRF52840-DK"

 #define CIRCUITPY_AUTORELOAD_DELAY_MS 500

--- a/ports/nrf/boards/pca10059/mpconfigboard.h
+++ b/ports/nrf/boards/pca10059/mpconfigboard.h
@ -26,7 +26,6 @@

 #define MICROPY_HW_BOARD_NAME       "PCA10059 nRF52840 Dongle"
 #define MICROPY_HW_MCU_NAME         "nRF52840"
-#define MICROPY_PY_SYS_PLATFORM     "nRF52840-DK"

 #define MICROPY_HW_LED_STATUS          (&pin_P0_06)

--- a/ports/nrf/boards/sparkfun_nrf52840_mini/mpconfigboard.h
+++ b/ports/nrf/boards/sparkfun_nrf52840_mini/mpconfigboard.h
@ -28,7 +28,6 @@

 #define MICROPY_HW_BOARD_NAME       "SparkFun Pro nRF52840 Mini"
 #define MICROPY_HW_MCU_NAME         "nRF52840"
-#define MICROPY_PY_SYS_PLATFORM     "SFE_NRF52840_Mini"

 #define CIRCUITPY_AUTORELOAD_DELAY_MS 500

--- a/ports/nrf/mpconfigport.h
+++ b/ports/nrf/mpconfigport.h
@ -30,6 +30,10 @@

 #include "ble_drv.h"

+#ifdef NRF52840
+#define MICROPY_PY_SYS_PLATFORM "nRF52840"
+#endif
+
 #define MICROPY_PY_COLLECTIONS_ORDEREDDICT       (1)
 #define MICROPY_PY_FUNCTION_ATTRS                (1)
 #define MICROPY_PY_IO                            (1)