Skip to content

Commit 06f7192

Browse files
committed
Rev 3 board changes; lots of flash so turn on most features
1 parent 03da934 commit 06f7192

File tree

3 files changed

+10
-29
lines changed

3 files changed

+10
-29
lines changed

ports/atmel-samd/boards/microchip_curiosity_circuitpython_nano/mpconfigboard.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
#define MICROPY_HW_MCU_NAME "same51j20"
66
#define CIRCUITPY_MCU_FAMILY samd51
77

8-
#define MICROPY_HW_LED_STATUS (&pin_PB23)
9-
#define MICROPY_HW_NEOPIXEL (&pin_PB22)
8+
#define MICROPY_HW_LED_STATUS (&pin_PB23)
9+
#define MICROPY_HW_NEOPIXEL (&pin_PB22)
1010

1111
#define BOARD_HAS_CRYSTAL 1
1212

ports/atmel-samd/boards/microchip_curiosity_circuitpython_nano/mpconfigboard.mk

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -9,24 +9,5 @@ CHIP_FAMILY = same51
99
QSPI_FLASH_FILESYSTEM = 1
1010
EXTERNAL_FLASH_DEVICES = "SST26VF016B,SST26VF032B,SST26VF064B"
1111
LONGINT_IMPL = MPZ
12-
CIRCUITPY_ULAB = 0
1312

1413
CIRCUITPY__EVE = 1
15-
CIRCUITPY_BITMAPFILTER = 0
16-
CIRCUITPY_CANIO = 1
17-
CIRCUITPY_FLOPPYIO = 0
18-
CIRCUITPY_SYNTHIO = 0
19-
CIRCUITPY_GIFIO = 0
20-
CIRCUITPY_JPEGIO = 0
21-
22-
CIRCUITPY_LTO_PARTITION = one
23-
24-
# We don't have room for the fonts for terminalio for certain languages,
25-
# so turn off terminalio, and if it's off and displayio is on,
26-
# force a clean build.
27-
# Note that we cannot test $(CIRCUITPY_DISPLAYIO) directly with an
28-
# ifeq, because it's not set yet.
29-
ifneq (,$(filter $(TRANSLATION),ja ko ru))
30-
CIRCUITPY_TERMINALIO = 0
31-
RELEASE_NEEDS_CLEAN_BUILD = $(CIRCUITPY_DISPLAYIO)
32-
endif

ports/atmel-samd/boards/microchip_curiosity_circuitpython_nano/pins.c

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,11 @@ static const mp_rom_map_elem_t board_module_globals_table[] = {
2222
{ MP_ROM_QSTR(MP_QSTR_D4), MP_ROM_PTR(&pin_PB14) },
2323
{ MP_ROM_QSTR(MP_QSTR_D5), MP_ROM_PTR(&pin_PB15) },
2424
{ MP_ROM_QSTR(MP_QSTR_D6), MP_ROM_PTR(&pin_PB16) },
25-
{ MP_ROM_QSTR(MP_QSTR_D7), MP_ROM_PTR(&pin_PB17) },
26-
{ MP_ROM_QSTR(MP_QSTR_D8), MP_ROM_PTR(&pin_PB22) },
27-
{ MP_ROM_QSTR(MP_QSTR_D13), MP_ROM_PTR(&pin_PB23) },
2825

2926
{ MP_ROM_QSTR(MP_QSTR_LED), MP_ROM_PTR(&pin_PB23) },
27+
{ MP_ROM_QSTR(MP_QSTR_D13), MP_ROM_PTR(&pin_PB23) },
3028

31-
{ MP_ROM_QSTR(MP_QSTR_NEOPIX), MP_ROM_PTR(&pin_PB22) },
29+
{ MP_ROM_QSTR(MP_QSTR_NEOPIXEL), MP_ROM_PTR(&pin_PB22) },
3230

3331
{ MP_ROM_QSTR(MP_QSTR_VREF), MP_ROM_PTR(&pin_PA03) },
3432

@@ -60,23 +58,25 @@ static const mp_rom_map_elem_t board_module_globals_table[] = {
6058
{ MP_ROM_QSTR(MP_QSTR_SD_CS), MP_ROM_PTR(&pin_PA19) },
6159

6260
{ MP_ROM_QSTR(MP_QSTR_MISO), MP_ROM_PTR(&pin_PB00) },
63-
{ MP_ROM_QSTR(MP_QSTR_SPARE_0), MP_ROM_PTR(&pin_PB00) },
61+
{ MP_ROM_QSTR(MP_QSTR_D8), MP_ROM_PTR(&pin_PB00) },
6462

6563
{ MP_ROM_QSTR(MP_QSTR_CS), MP_ROM_PTR(&pin_PB01) },
66-
{ MP_ROM_QSTR(MP_QSTR_SPARE_1), MP_ROM_PTR(&pin_PB01) },
64+
{ MP_ROM_QSTR(MP_QSTR_D9), MP_ROM_PTR(&pin_PB01) },
6765

6866
{ MP_ROM_QSTR(MP_QSTR_MOSI), MP_ROM_PTR(&pin_PB02) },
69-
{ MP_ROM_QSTR(MP_QSTR_SPARE_2), MP_ROM_PTR(&pin_PB02) },
67+
{ MP_ROM_QSTR(MP_QSTR_D10), MP_ROM_PTR(&pin_PB02) },
7068

7169
{ MP_ROM_QSTR(MP_QSTR_SCK), MP_ROM_PTR(&pin_PB03) },
72-
{ MP_ROM_QSTR(MP_QSTR_SPARE_3), MP_ROM_PTR(&pin_PB03) },
70+
{ MP_ROM_QSTR(MP_QSTR_D11), MP_ROM_PTR(&pin_PB03) },
7371

7472
{ MP_ROM_QSTR(MP_QSTR_DEBUG_TX), MP_ROM_PTR(&pin_PA22) },
7573
{ MP_ROM_QSTR(MP_QSTR_DEBUG_RX), MP_ROM_PTR(&pin_PA23) },
7674

7775
{ MP_OBJ_NEW_QSTR(MP_QSTR_CAN_RX), MP_ROM_PTR(&pin_PB13) },
7876
{ MP_OBJ_NEW_QSTR(MP_QSTR_CAN_TX), MP_ROM_PTR(&pin_PB12) },
77+
7978
{ MP_OBJ_NEW_QSTR(MP_QSTR_CAN_STANDBY), MP_ROM_PTR(&pin_PB17) },
79+
{ MP_ROM_QSTR(MP_QSTR_D7), MP_ROM_PTR(&pin_PB17) },
8080

8181
{ MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&board_i2c_obj) },
8282
{ MP_ROM_QSTR(MP_QSTR_UART), MP_ROM_PTR(&board_uart_obj) },

0 commit comments

Comments
 (0)