summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorScott Shawcroft <scott@adafruit.com>2020-04-30 11:50:02 -0700
committerGitHub <noreply@github.com>2020-04-30 11:50:02 -0700
commit74a2d0944a9b3e5aff51cfb6cd7e8e1a2fde4426 (patch)
treec785c0959a0745d232c19b539b9c1b5db646163c
parentf44e1d6a8dad0e7dff0d067b3cc7e825a0f2bacb (diff)
parent36a71560c2fc7b2c79b0848c72dc9bf61e7f9ee1 (diff)
Merge pull request #2834 from Teknikio/fix/bluebird_pinout
Update teknikio bluebird pin assignments
-rw-r--r--ports/nrf/boards/teknikio_bluebird/mpconfigboard.h2
-rw-r--r--ports/nrf/boards/teknikio_bluebird/mpconfigboard.mk6
-rw-r--r--ports/nrf/boards/teknikio_bluebird/pins.c6
3 files changed, 10 insertions, 4 deletions
diff --git a/ports/nrf/boards/teknikio_bluebird/mpconfigboard.h b/ports/nrf/boards/teknikio_bluebird/mpconfigboard.h
index 76e772ca9..c130cd8c0 100644
--- a/ports/nrf/boards/teknikio_bluebird/mpconfigboard.h
+++ b/ports/nrf/boards/teknikio_bluebird/mpconfigboard.h
@@ -33,7 +33,7 @@
#define MICROPY_HW_BOARD_NAME "Teknikio Bluebird"
#define MICROPY_HW_MCU_NAME "nRF52840"
-#define MICROPY_HW_NEOPIXEL (&pin_P0_26)
+#define MICROPY_HW_NEOPIXEL (&pin_P1_15)
#define DEFAULT_I2C_BUS_SCL (&pin_P0_27)
#define DEFAULT_I2C_BUS_SDA (&pin_P0_26)
diff --git a/ports/nrf/boards/teknikio_bluebird/mpconfigboard.mk b/ports/nrf/boards/teknikio_bluebird/mpconfigboard.mk
index e178a8205..2339a950f 100644
--- a/ports/nrf/boards/teknikio_bluebird/mpconfigboard.mk
+++ b/ports/nrf/boards/teknikio_bluebird/mpconfigboard.mk
@@ -6,3 +6,9 @@ USB_MANUFACTURER = "Teknikio"
MCU_CHIP = nrf52840
INTERNAL_FLASH_FILESYSTEM = 1
+CIRCUITPY_ANALOGIO = 1
+CIRCUITPY_AUDIOCORE = 1
+CIRCUITPY_AUDIOPWMIO = 1
+CIRCUITPY_DIGITALIO = 1
+CIRCUITPY_NEOPIXEL_WRITE = 1
+CIRCUITPY_TIME = 1
diff --git a/ports/nrf/boards/teknikio_bluebird/pins.c b/ports/nrf/boards/teknikio_bluebird/pins.c
index a90dc7daa..1ff1198a1 100644
--- a/ports/nrf/boards/teknikio_bluebird/pins.c
+++ b/ports/nrf/boards/teknikio_bluebird/pins.c
@@ -47,16 +47,16 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
{ MP_ROM_QSTR(MP_QSTR_A4), MP_ROM_PTR(&pin_P0_03) },
{ MP_ROM_QSTR(MP_QSTR_D4), MP_ROM_PTR(&pin_P0_03) },
- { MP_ROM_QSTR(MP_QSTR_NEOPIXEL), MP_ROM_PTR(&pin_P0_26) },
+ { MP_ROM_QSTR(MP_QSTR_NEOPIXEL), MP_ROM_PTR(&pin_P1_15) },
{ MP_ROM_QSTR(MP_QSTR_LIGHT), MP_ROM_PTR(&pin_P0_28) },
{ MP_ROM_QSTR(MP_QSTR_LIGHT_ENABLE), MP_ROM_PTR(&pin_P0_30) },
- { MP_ROM_QSTR(MP_QSTR_SPEAKER), MP_ROM_PTR(&pin_P1_15) },
+ { MP_ROM_QSTR(MP_QSTR_SPEAKER), MP_ROM_PTR(&pin_P1_14) },
{ MP_ROM_QSTR(MP_QSTR_ACCELEROMETER_INTERRUPT), MP_ROM_PTR(&pin_P1_10) },
{ MP_ROM_QSTR(MP_QSTR_ACCELEROMETER_SDA), MP_ROM_PTR(&pin_P1_12) },
{ MP_ROM_QSTR(MP_QSTR_ACCELEROMETER_SCL), MP_ROM_PTR(&pin_P1_11) },
};
-MP_DEFINE_CONST_DICT(board_module_globals, board_module_globals_table); \ No newline at end of file
+MP_DEFINE_CONST_DICT(board_module_globals, board_module_globals_table);