Skip to content

Commit 1c466f4

Browse files
author
Joe Bakalor
authored
Merge pull request #5 from Teknikio/teknikio/bluebird
Teknikio/bluebird
2 parents b484c89 + 3992a87 commit 1c466f4

File tree

4 files changed

+55
-93
lines changed

4 files changed

+55
-93
lines changed

‎.github/workflows/build.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -155,6 +155,7 @@ jobs:
155155
- "stm32f411ve_discovery"
156156
- "stm32f412zg_discovery"
157157
- "stringcar_m0_express"
158+
- "teknikio_bluebird"
158159
- "trellis_m4_express"
159160
- "trinket_m0"
160161
- "trinket_m0_haxpress"

‎ports/nrf/boards/teknikio_bluebird/mpconfigboard.h

Lines changed: 11 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -27,48 +27,22 @@
2727

2828
//https://github.com/Teknikio/TKInventionBuilderFramework
2929

30+
3031
#include "nrfx/hal/nrf_gpio.h"
3132

32-
#define MICROPY_HW_BOARD_NAME "Adafruit Circuit Playground Bluefruit"
33+
#define MICROPY_HW_BOARD_NAME "Teknikio Bluebird"
3334
#define MICROPY_HW_MCU_NAME "nRF52840"
34-
#define MICROPY_PY_SYS_PLATFORM "CircuitPlaygroundBluefruit"
35-
36-
#define FLASH_SIZE (0x100000)
37-
#define FLASH_PAGE_SIZE (4096)
38-
39-
#define MICROPY_HW_LED_STATUS (&pin_P1_14)
40-
41-
// Unusually, board does not have a 32 kHz xtal. Nearly all boards do.
42-
#define BOARD_HAS_32KHZ_XTAL (0)
43-
44-
#if QSPI_FLASH_FILESYSTEM
45-
#define MICROPY_QSPI_DATA0 NRF_GPIO_PIN_MAP(0, 21)
46-
#define MICROPY_QSPI_DATA1 NRF_GPIO_PIN_MAP(0, 23)
47-
#define MICROPY_QSPI_DATA2 NRF_GPIO_PIN_MAP(1, 00)
48-
#define MICROPY_QSPI_DATA3 NRF_GPIO_PIN_MAP(0, 22)
49-
#define MICROPY_QSPI_SCK NRF_GPIO_PIN_MAP(0, 19)
50-
#define MICROPY_QSPI_CS NRF_GPIO_PIN_MAP(0, 15)
51-
#endif
52-
53-
#if SPI_FLASH_FILESYSTEM
54-
#define SPI_FLASH_MOSI_PIN &pin_P0_21
55-
#define SPI_FLASH_MISO_PIN &pin_P0_23
56-
#define SPI_FLASH_SCK_PIN &pin_P0_19
57-
#define SPI_FLASH_CS_PIN &pin_P0_15
58-
#endif
59-
60-
#define CIRCUITPY_AUTORELOAD_DELAY_MS 500
6135

62-
#define CIRCUITPY_INTERNAL_NVM_SIZE (4096)
36+
#define MICROPY_HW_NEOPIXEL (&pin_P0_26)
6337

64-
#define BOARD_FLASH_SIZE (FLASH_SIZE - 0x4000 - CIRCUITPY_INTERNAL_NVM_SIZE)
38+
#define DEFAULT_I2C_BUS_SCL (&pin_P0_27)
39+
#define DEFAULT_I2C_BUS_SDA (&pin_P0_26)
6540

66-
#define DEFAULT_I2C_BUS_SCL (&pin_P0_04)
67-
#define DEFAULT_I2C_BUS_SDA (&pin_P0_05)
41+
#define DEFAULT_SPI_BUS_SCK (&pin_P1_15)
42+
#define DEFAULT_SPI_BUS_MOSI (&pin_P1_13)
43+
#define DEFAULT_SPI_BUS_MISO (&pin_P1_14)
6844

69-
#define DEFAULT_SPI_BUS_SCK (&pin_P0_05)
70-
#define DEFAULT_SPI_BUS_MOSI (&pin_P1_03)
71-
#define DEFAULT_SPI_BUS_MISO (&pin_P0_29)
45+
#define DEFAULT_UART_BUS_RX (&pin_P1_07)
46+
#define DEFAULT_UART_BUS_TX (&pin_P1_08)
7247

73-
#define DEFAULT_UART_BUS_RX (&pin_P0_30)
74-
#define DEFAULT_UART_BUS_TX (&pin_P0_14)
48+
#define BOARD_HAS_CRYSTAL 1 // according to the schematic we do

‎ports/nrf/boards/teknikio_bluebird/mpconfigboard.mk

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
USB_VID = 0x239A
2-
USB_PID = 0x8046
3-
USB_PRODUCT = "Circuit Playground Bluefruit"
4-
USB_MANUFACTURER = "Adafruit Industries LLC"
2+
USB_PID = 0x802A
3+
USB_PRODUCT = "Bluebird"
4+
USB_MANUFACTURER = "Teknikio"
55

66
MCU_SERIES = m4
77
MCU_VARIANT = nrf52
@@ -20,7 +20,3 @@ else
2020
endif
2121

2222
NRF_DEFINES += -DNRF52840_XXAA -DNRF52840
23-
24-
QSPI_FLASH_FILESYSTEM = 1
25-
EXTERNAL_FLASH_DEVICE_COUNT = 1
26-
EXTERNAL_FLASH_DEVICES = "GD25Q16C"

‎ports/nrf/boards/teknikio_bluebird/pins.c

Lines changed: 40 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -1,71 +1,62 @@
11
#include "shared-bindings/board/__init__.h"
22

33
STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
4-
{ MP_ROM_QSTR(MP_QSTR_AUDIO), MP_ROM_PTR(&pin_P0_26) },
5-
{ MP_ROM_QSTR(MP_QSTR_D12), MP_ROM_PTR(&pin_P0_26) },
6-
{ MP_ROM_QSTR(MP_QSTR_SPEAKER), MP_ROM_PTR(&pin_P0_26) },
74

8-
{ MP_ROM_QSTR(MP_QSTR_A1), MP_ROM_PTR(&pin_P0_02) },
9-
{ MP_ROM_QSTR(MP_QSTR_D6), MP_ROM_PTR(&pin_P0_02) },
10-
{ MP_ROM_QSTR(MP_QSTR_SCK), MP_ROM_PTR(&pin_P0_02) },
5+
{ MP_ROM_QSTR(MP_QSTR_P0_12), MP_ROM_PTR(&pin_P0_12) },
6+
{ MP_ROM_QSTR(MP_QSTR_D9), MP_ROM_PTR(&pin_P0_12) },
117

12-
{ MP_ROM_QSTR(MP_QSTR_A2), MP_ROM_PTR(&pin_P0_29) },
13-
{ MP_ROM_QSTR(MP_QSTR_D9), MP_ROM_PTR(&pin_P0_29) },
14-
{ MP_ROM_QSTR(MP_QSTR_MISO), MP_ROM_PTR(&pin_P0_29) },
8+
{ MP_ROM_QSTR(MP_QSTR_P0_11), MP_ROM_PTR(&pin_P0_11) },
9+
{ MP_ROM_QSTR(MP_QSTR_D14), MP_ROM_PTR(&pin_P0_11) },
1510

16-
{ MP_ROM_QSTR(MP_QSTR_A3), MP_ROM_PTR(&pin_P0_03) },
17-
{ MP_ROM_QSTR(MP_QSTR_D10), MP_ROM_PTR(&pin_P0_03) },
18-
{ MP_ROM_QSTR(MP_QSTR_MOSI), MP_ROM_PTR(&pin_P0_03) },
11+
{ MP_ROM_QSTR(MP_QSTR_P1_09), MP_ROM_PTR(&pin_P1_09) },
12+
{ MP_ROM_QSTR(MP_QSTR_D8), MP_ROM_PTR(&pin_P1_09) },
1913

20-
{ MP_ROM_QSTR(MP_QSTR_A4), MP_ROM_PTR(&pin_P0_04) },
21-
{ MP_ROM_QSTR(MP_QSTR_D3), MP_ROM_PTR(&pin_P0_04) },
22-
{ MP_ROM_QSTR(MP_QSTR_SCL), MP_ROM_PTR(&pin_P0_04) },
14+
{ MP_ROM_QSTR(MP_QSTR_P1_08), MP_ROM_PTR(&pin_P1_08) },
15+
{ MP_ROM_QSTR(MP_QSTR_D13), MP_ROM_PTR(&pin_P1_08) },
2316

24-
{ MP_ROM_QSTR(MP_QSTR_A5), MP_ROM_PTR(&pin_P0_05) },
25-
{ MP_ROM_QSTR(MP_QSTR_D2), MP_ROM_PTR(&pin_P0_05) },
26-
{ MP_ROM_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_P0_05) },
17+
{ MP_ROM_QSTR(MP_QSTR_P0_08), MP_ROM_PTR(&pin_P0_08) },
18+
{ MP_ROM_QSTR(MP_QSTR_D12), MP_ROM_PTR(&pin_P0_08) },
2719

28-
{ MP_ROM_QSTR(MP_QSTR_A6), MP_ROM_PTR(&pin_P0_30) },
29-
{ MP_ROM_QSTR(MP_QSTR_D0), MP_ROM_PTR(&pin_P0_30) },
30-
{ MP_ROM_QSTR(MP_QSTR_RX), MP_ROM_PTR(&pin_P0_30) },
20+
{ MP_ROM_QSTR(MP_QSTR_P0_07), MP_ROM_PTR(&pin_P0_07) },
21+
{ MP_ROM_QSTR(MP_QSTR_D11), MP_ROM_PTR(&pin_P0_07) },
3122

32-
// This cannot be A7, as it is on CPX. We don't have enough analog inputs.
33-
{ MP_ROM_QSTR(MP_QSTR_D1), MP_ROM_PTR(&pin_P0_14) },
34-
{ MP_ROM_QSTR(MP_QSTR_TX), MP_ROM_PTR(&pin_P0_14) },
23+
{ MP_ROM_QSTR(MP_QSTR_P0_06), MP_ROM_PTR(&pin_P0_06) },
24+
{ MP_ROM_QSTR(MP_QSTR_D7), MP_ROM_PTR(&pin_P0_06) },
3525

36-
{ MP_ROM_QSTR(MP_QSTR_LIGHT), MP_ROM_PTR(&pin_P0_28) },
37-
{ MP_ROM_QSTR(MP_QSTR_A8), MP_ROM_PTR(&pin_P0_28) },
26+
{ MP_ROM_QSTR(MP_QSTR_P0_05), MP_ROM_PTR(&pin_P0_05) },
27+
{ MP_ROM_QSTR(MP_QSTR_D5), MP_ROM_PTR(&pin_P0_05) },
28+
{ MP_ROM_QSTR(MP_QSTR_A5), MP_ROM_PTR(&pin_P0_05) },
3829

39-
{ MP_ROM_QSTR(MP_QSTR_TEMPERATURE), MP_ROM_PTR(&pin_P0_31) },
40-
{ MP_ROM_QSTR(MP_QSTR_A9), MP_ROM_PTR(&pin_P0_31) },
30+
{ MP_ROM_QSTR(MP_QSTR_P0_04), MP_ROM_PTR(&pin_P0_04) },
31+
{ MP_ROM_QSTR(MP_QSTR_D6), MP_ROM_PTR(&pin_P0_04) },
32+
{ MP_ROM_QSTR(MP_QSTR_A6), MP_ROM_PTR(&pin_P0_04) },
4133

42-
{ MP_ROM_QSTR(MP_QSTR_BUTTON_A), MP_ROM_PTR(&pin_P1_02) },
43-
{ MP_ROM_QSTR(MP_QSTR_D4), MP_ROM_PTR(&pin_P1_02) },
34+
{ MP_ROM_QSTR(MP_QSTR_P0_29), MP_ROM_PTR(&pin_P0_29) },
35+
{ MP_ROM_QSTR(MP_QSTR_A1), MP_ROM_PTR(&pin_P0_29) },
36+
{ MP_ROM_QSTR(MP_QSTR_D1), MP_ROM_PTR(&pin_P0_29) },
4437

45-
{ MP_ROM_QSTR(MP_QSTR_BUTTON_B), MP_ROM_PTR(&pin_P1_15) },
46-
{ MP_ROM_QSTR(MP_QSTR_D5), MP_ROM_PTR(&pin_P1_15) },
38+
{ MP_ROM_QSTR(MP_QSTR_P0_31), MP_ROM_PTR(&pin_P0_31) },
39+
{ MP_ROM_QSTR(MP_QSTR_A2), MP_ROM_PTR(&pin_P0_31) },
40+
{ MP_ROM_QSTR(MP_QSTR_D2), MP_ROM_PTR(&pin_P0_31) },
4741

48-
{ MP_ROM_QSTR(MP_QSTR_SLIDE_SWITCH), MP_ROM_PTR(&pin_P1_06) },
49-
{ MP_ROM_QSTR(MP_QSTR_D7), MP_ROM_PTR(&pin_P1_06) },
42+
{ MP_ROM_QSTR(MP_QSTR_P0_02), MP_ROM_PTR(&pin_P0_02) },
43+
{ MP_ROM_QSTR(MP_QSTR_A3), MP_ROM_PTR(&pin_P0_02) },
44+
{ MP_ROM_QSTR(MP_QSTR_D3), MP_ROM_PTR(&pin_P0_02) },
5045

51-
{ MP_ROM_QSTR(MP_QSTR_D13), MP_ROM_PTR(&pin_P1_14) },
52-
{ MP_ROM_QSTR(MP_QSTR_L), MP_ROM_PTR(&pin_P1_14) },
46+
{ MP_ROM_QSTR(MP_QSTR_P0_03), MP_ROM_PTR(&pin_P0_03) },
47+
{ MP_ROM_QSTR(MP_QSTR_A4), MP_ROM_PTR(&pin_P0_03) },
48+
{ MP_ROM_QSTR(MP_QSTR_D4), MP_ROM_PTR(&pin_P0_03) },
5349

54-
{ MP_ROM_QSTR(MP_QSTR_NEOPIXEL), MP_ROM_PTR(&pin_P0_13) },
55-
{ MP_ROM_QSTR(MP_QSTR_D8), MP_ROM_PTR(&pin_P0_13) },
50+
{ MP_ROM_QSTR(MP_QSTR_NEOPIXEL), MP_ROM_PTR(&pin_P0_26) },
5651

57-
{ MP_ROM_QSTR(MP_QSTR_MICROPHONE_CLOCK), MP_ROM_PTR(&pin_P0_17) },
58-
{ MP_ROM_QSTR(MP_QSTR_MICROPHONE_DATA), MP_ROM_PTR(&pin_P0_16) },
52+
{ MP_ROM_QSTR(MP_QSTR_LIGHT), MP_ROM_PTR(&pin_P0_28) },
53+
{ MP_ROM_QSTR(MP_QSTR_LIGHT_ENABLE), MP_ROM_PTR(&pin_P0_30) },
5954

60-
{ MP_ROM_QSTR(MP_QSTR_ACCELEROMETER_INTERRUPT), MP_ROM_PTR(&pin_P1_13) },
61-
{ MP_ROM_QSTR(MP_QSTR_ACCELEROMETER_SDA), MP_ROM_PTR(&pin_P1_10) },
62-
{ MP_ROM_QSTR(MP_QSTR_ACCELEROMETER_SCL), MP_ROM_PTR(&pin_P1_12) },
55+
{ MP_ROM_QSTR(MP_QSTR_SPEAKER), MP_ROM_PTR(&pin_P1_15) },
6356

64-
{ MP_ROM_QSTR(MP_QSTR_SPEAKER_ENABLE), MP_ROM_PTR(&pin_P1_04) },
65-
66-
{ MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&board_i2c_obj) },
67-
{ MP_ROM_QSTR(MP_QSTR_SPI), MP_ROM_PTR(&board_spi_obj) },
68-
{ MP_ROM_QSTR(MP_QSTR_UART), MP_ROM_PTR(&board_uart_obj) },
57+
{ MP_ROM_QSTR(MP_QSTR_ACCELEROMETER_INTERRUPT), MP_ROM_PTR(&pin_P1_10) },
58+
{ MP_ROM_QSTR(MP_QSTR_ACCELEROMETER_SDA), MP_ROM_PTR(&pin_P1_12) },
59+
{ MP_ROM_QSTR(MP_QSTR_ACCELEROMETER_SCL), MP_ROM_PTR(&pin_P1_11) },
6960
};
7061

71-
MP_DEFINE_CONST_DICT(board_module_globals, board_module_globals_table);
62+
MP_DEFINE_CONST_DICT(board_module_globals, board_module_globals_table);

0 commit comments

Comments
 (0)