Skip to content

Commit 3ca74d8

Browse files
ladyadaladyada
authored
Merge pull request #1349 from dhalbert/feather52840-pins
Latest Feather nRF52840 pin revisions
2 parents f0d02fc + 5fe746f commit 3ca74d8

File tree

3 files changed

+47
-39
lines changed

3 files changed

+47
-39
lines changed

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

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -33,14 +33,14 @@
3333
#define MICROPY_HW_MCU_NAME "nRF52840"
3434
#define MICROPY_PY_SYS_PLATFORM "Feather52840Express"
3535

36-
#define MICROPY_HW_NEOPIXEL (&pin_P0_13)
36+
#define MICROPY_HW_NEOPIXEL (&pin_P0_16)
3737

38-
#define MICROPY_QSPI_DATA0 NRF_GPIO_PIN_MAP(1, 9)
39-
#define MICROPY_QSPI_DATA1 NRF_GPIO_PIN_MAP(0, 11)
40-
#define MICROPY_QSPI_DATA2 NRF_GPIO_PIN_MAP(0, 12)
41-
#define MICROPY_QSPI_DATA3 NRF_GPIO_PIN_MAP(0, 14)
42-
#define MICROPY_QSPI_SCK NRF_GPIO_PIN_MAP(0, 8)
43-
#define MICROPY_QSPI_CS NRF_GPIO_PIN_MAP(1, 8)
38+
#define MICROPY_QSPI_DATA0 NRF_GPIO_PIN_MAP(0, 17)
39+
#define MICROPY_QSPI_DATA1 NRF_GPIO_PIN_MAP(0, 22)
40+
#define MICROPY_QSPI_DATA2 NRF_GPIO_PIN_MAP(0, 23)
41+
#define MICROPY_QSPI_DATA3 NRF_GPIO_PIN_MAP(0, 21)
42+
#define MICROPY_QSPI_SCK NRF_GPIO_PIN_MAP(0, 19)
43+
#define MICROPY_QSPI_CS NRF_GPIO_PIN_MAP(0, 20)
4444

4545
#define CIRCUITPY_AUTORELOAD_DELAY_MS 500
4646

@@ -55,12 +55,12 @@
5555

5656
#define BOARD_HAS_CRYSTAL 1
5757

58-
#define DEFAULT_I2C_BUS_SCL (&pin_P1_11)
59-
#define DEFAULT_I2C_BUS_SDA (&pin_P1_12)
58+
#define DEFAULT_I2C_BUS_SCL (&pin_P0_11)
59+
#define DEFAULT_I2C_BUS_SDA (&pin_P0_12)
6060

61-
#define DEFAULT_SPI_BUS_SCK (&pin_P0_20)
62-
#define DEFAULT_SPI_BUS_MOSI (&pin_P0_23)
63-
#define DEFAULT_SPI_BUS_MISO (&pin_P0_22)
61+
#define DEFAULT_SPI_BUS_SCK (&pin_P0_14)
62+
#define DEFAULT_SPI_BUS_MOSI (&pin_P0_13)
63+
#define DEFAULT_SPI_BUS_MISO (&pin_P0_15)
6464

65-
#define DEFAULT_UART_BUS_RX (&pin_P1_00)
66-
#define DEFAULT_UART_BUS_TX (&pin_P0_24)
65+
#define DEFAULT_UART_BUS_RX (&pin_P0_24)
66+
#define DEFAULT_UART_BUS_TX (&pin_P0_25)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,4 @@ NRF_DEFINES += -DNRF52840_XXAA -DNRF52840
2222

2323
QSPI_FLASH_FILESYSTEM = 1
2424
EXTERNAL_FLASH_DEVICE_COUNT = 1
25-
EXTERNAL_FLASH_DEVICES = "GD25Q64C"
25+
EXTERNAL_FLASH_DEVICES = "GD25Q16C"

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

Lines changed: 32 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -3,39 +3,47 @@
33
#include "board_busses.h"
44

55
STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
6-
{ MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_P0_30) },
7-
{ MP_ROM_QSTR(MP_QSTR_A1), MP_ROM_PTR(&pin_P0_28) },
8-
{ MP_ROM_QSTR(MP_QSTR_A2), MP_ROM_PTR(&pin_P0_31) },
9-
{ MP_ROM_QSTR(MP_QSTR_A3), MP_ROM_PTR(&pin_P0_02) },
10-
{ MP_ROM_QSTR(MP_QSTR_A4), MP_ROM_PTR(&pin_P0_29) },
6+
{ MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_P0_04) },
7+
{ MP_ROM_QSTR(MP_QSTR_A1), MP_ROM_PTR(&pin_P0_05) },
8+
{ MP_ROM_QSTR(MP_QSTR_A2), MP_ROM_PTR(&pin_P0_30) },
9+
{ MP_ROM_QSTR(MP_QSTR_A3), MP_ROM_PTR(&pin_P0_28) },
10+
{ MP_ROM_QSTR(MP_QSTR_A4), MP_ROM_PTR(&pin_P0_02) },
1111
{ MP_ROM_QSTR(MP_QSTR_A5), MP_ROM_PTR(&pin_P0_03) },
1212

13-
{ MP_ROM_QSTR(MP_QSTR_AREF), MP_ROM_PTR(&pin_P0_04) },
14-
{ MP_ROM_QSTR(MP_QSTR_VDIV), MP_ROM_PTR(&pin_P0_05) },
13+
{ MP_ROM_QSTR(MP_QSTR_AREF), MP_ROM_PTR(&pin_P0_31) },
1514

16-
{ MP_ROM_QSTR(MP_QSTR_D5), MP_ROM_PTR(&pin_P1_13) },
17-
{ MP_ROM_QSTR(MP_QSTR_D6), MP_ROM_PTR(&pin_P1_14) },
18-
{ MP_ROM_QSTR(MP_QSTR_D9), MP_ROM_PTR(&pin_P1_15) },
15+
{ MP_ROM_QSTR(MP_QSTR_VOLTAGE_MONITOR), MP_ROM_PTR(&pin_P0_29) },
16+
{ MP_ROM_QSTR(MP_QSTR_BATTERY), MP_ROM_PTR(&pin_P0_29) },
17+
18+
{ MP_ROM_QSTR(MP_QSTR_SWITCH), MP_ROM_PTR(&pin_P1_02) },
19+
20+
{ MP_ROM_QSTR(MP_QSTR_NFC1), MP_ROM_PTR(&pin_P0_09) },
21+
{ MP_ROM_QSTR(MP_QSTR_NFC2), MP_ROM_PTR(&pin_P0_10) },
22+
23+
{ MP_ROM_QSTR(MP_QSTR_D2), MP_ROM_PTR(&pin_P0_10) },
24+
{ MP_ROM_QSTR(MP_QSTR_D5), MP_ROM_PTR(&pin_P1_08) },
25+
{ MP_ROM_QSTR(MP_QSTR_D6), MP_ROM_PTR(&pin_P0_07) },
26+
{ MP_ROM_QSTR(MP_QSTR_D9), MP_ROM_PTR(&pin_P0_26) },
1927
{ MP_ROM_QSTR(MP_QSTR_D10), MP_ROM_PTR(&pin_P0_27) },
20-
{ MP_ROM_QSTR(MP_QSTR_D11), MP_ROM_PTR(&pin_P0_26) },
21-
{ MP_ROM_QSTR(MP_QSTR_D12), MP_ROM_PTR(&pin_P0_06) },
22-
{ MP_ROM_QSTR(MP_QSTR_D13), MP_ROM_PTR(&pin_P0_07) },
23-
{ MP_ROM_QSTR(MP_QSTR_L), MP_ROM_PTR(&pin_P0_07) },
28+
{ MP_ROM_QSTR(MP_QSTR_D11), MP_ROM_PTR(&pin_P0_06) },
29+
{ MP_ROM_QSTR(MP_QSTR_D12), MP_ROM_PTR(&pin_P0_08) },
30+
{ MP_ROM_QSTR(MP_QSTR_D13), MP_ROM_PTR(&pin_P1_09) },
2431

25-
{ MP_ROM_QSTR(MP_QSTR_NEOPIXEL), MP_ROM_PTR(&pin_P0_13) },
32+
{ MP_ROM_QSTR(MP_QSTR_NEOPIXEL), MP_ROM_PTR(&pin_P0_16) },
2633

27-
{ MP_ROM_QSTR(MP_QSTR_SCK), MP_ROM_PTR(&pin_P0_20) },
28-
{ MP_ROM_QSTR(MP_QSTR_MOSI), MP_ROM_PTR(&pin_P0_23) },
29-
{ MP_ROM_QSTR(MP_QSTR_MISO), MP_ROM_PTR(&pin_P0_22) },
34+
{ MP_ROM_QSTR(MP_QSTR_SCK), MP_ROM_PTR(&pin_P0_14) },
35+
{ MP_ROM_QSTR(MP_QSTR_MOSI), MP_ROM_PTR(&pin_P0_13) },
36+
{ MP_ROM_QSTR(MP_QSTR_MISO), MP_ROM_PTR(&pin_P0_15) },
3037

31-
{ MP_ROM_QSTR(MP_QSTR_TXD), MP_ROM_PTR(&pin_P0_24) },
32-
{ MP_ROM_QSTR(MP_QSTR_RXD), MP_ROM_PTR(&pin_P1_00) },
38+
{ MP_ROM_QSTR(MP_QSTR_TXD), MP_ROM_PTR(&pin_P0_25) },
39+
{ MP_ROM_QSTR(MP_QSTR_RXD), MP_ROM_PTR(&pin_P0_24) },
3340

34-
{ MP_ROM_QSTR(MP_QSTR_SCL), MP_ROM_PTR(&pin_P1_11) },
35-
{ MP_ROM_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_P1_12) },
41+
{ MP_ROM_QSTR(MP_QSTR_SCL), MP_ROM_PTR(&pin_P0_11) },
42+
{ MP_ROM_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_P0_12) },
3643

37-
{ MP_ROM_QSTR(MP_QSTR_LED_RED), MP_ROM_PTR(&pin_P1_02) },
38-
{ MP_ROM_QSTR(MP_QSTR_LED_BLUE), MP_ROM_PTR(&pin_P1_10) },
44+
{ MP_ROM_QSTR(MP_QSTR_L), MP_ROM_PTR(&pin_P1_15) },
45+
{ MP_ROM_QSTR(MP_QSTR_RED_LED), MP_ROM_PTR(&pin_P1_15) },
46+
{ MP_ROM_QSTR(MP_QSTR_BLUE_LED), MP_ROM_PTR(&pin_P1_10) },
3947
};
4048

4149
MP_DEFINE_CONST_DICT(board_module_globals, board_module_globals_table);

0 commit comments

Comments
 (0)