Skip to content

Commit ec678a5

Browse files
dhalbertdhalbert
authored
Merge pull request #8494 from tannewt/merge_in_8.2.7
Merge in 8.2.7
2 parents 3abe1fd + c988ff7 commit ec678a5

File tree

38 files changed

+685
-62
lines changed

38 files changed

+685
-62
lines changed

‎ports/atmel-samd/boards/capablerobot_usbhub/mpconfigboard.mk

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,6 @@ QSPI_FLASH_FILESYSTEM = 1
1010
EXTERNAL_FLASH_DEVICES = "GD25Q16C, W25Q16JVxQ"
1111
LONGINT_IMPL = MPZ
1212

13-
# No I2S on SAMD51G
14-
CIRCUITPY_AUDIOBUSIO = 0
15-
1613
CIRCUITPY_FULL_BUILD = 0
1714
CIRCUITPY_AUDIOIO = 0
1815
CIRCUITPY_AUDIOCORE = 0

‎ports/atmel-samd/boards/cp32-m4/mpconfigboard.mk

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,3 @@ CHIP_FAMILY = samd51
99
QSPI_FLASH_FILESYSTEM = 1
1010
EXTERNAL_FLASH_DEVICES = "W25Q128JVxM"
1111
LONGINT_IMPL = MPZ
12-
13-
# No I2S on SAMD51G.
14-
CIRCUITPY_AUDIOBUSIO = 0

‎ports/atmel-samd/boards/itsybitsy_m4_express/mpconfigboard.mk

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@ QSPI_FLASH_FILESYSTEM = 1
1010
EXTERNAL_FLASH_DEVICES = GD25Q16C
1111
LONGINT_IMPL = MPZ
1212

13-
# No I2S on SAMD51G
14-
CIRCUITPY_AUDIOBUSIO = 0
1513
CIRCUITPY_FLOPPYIO = 0
1614
CIRCUITPY_GIFIO = 0
1715

‎ports/atmel-samd/boards/loc_ber_m4_base_board/mpconfigboard.mk

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,6 @@ CIRCUITPY_FULL_BUILD = 0
1111

1212
LONGINT_IMPL = MPZ
1313

14-
# No I2S on SAMD51G
15-
CIRCUITPY_AUDIOBUSIO = 0
16-
1714
CIRCUITPY_BITBANG_APA102 = 1
1815
# Override optimization to keep binary small
1916
OPTIMIZATION_FLAGS = -Os

‎ports/atmel-samd/boards/matrixportal_m4/pins.c

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,41 @@
1+
#include "py/objtuple.h"
12
#include "shared-bindings/board/__init__.h"
23

4+
STATIC const mp_rom_obj_tuple_t matrix_addr_tuple = {
5+
{&mp_type_tuple},
6+
5,
7+
{
8+
MP_ROM_PTR(&pin_PB07),
9+
MP_ROM_PTR(&pin_PB08),
10+
MP_ROM_PTR(&pin_PB09),
11+
MP_ROM_PTR(&pin_PB15),
12+
MP_ROM_PTR(&pin_PB13),
13+
}
14+
};
15+
16+
STATIC const mp_rom_obj_tuple_t matrix_data_tuple = {
17+
{&mp_type_tuple},
18+
6,
19+
{
20+
MP_ROM_PTR(&pin_PB00),
21+
MP_ROM_PTR(&pin_PB01),
22+
MP_ROM_PTR(&pin_PB02),
23+
24+
MP_ROM_PTR(&pin_PB03),
25+
MP_ROM_PTR(&pin_PB04),
26+
MP_ROM_PTR(&pin_PB05),
27+
}
28+
};
29+
30+
STATIC const mp_rom_map_elem_t matrix_common_table[] = {
31+
{ MP_OBJ_NEW_QSTR(MP_QSTR_rgb_pins), MP_ROM_PTR(&matrix_data_tuple) },
32+
{ MP_OBJ_NEW_QSTR(MP_QSTR_clock_pin), MP_ROM_PTR(&pin_PB06) },
33+
{ MP_OBJ_NEW_QSTR(MP_QSTR_latch_pin), MP_ROM_PTR(&pin_PB14) },
34+
{ MP_OBJ_NEW_QSTR(MP_QSTR_output_enable_pin), MP_ROM_PTR(&pin_PB12) },
35+
};
36+
MP_DEFINE_CONST_DICT(matrix_common_dict, matrix_common_table);
37+
38+
339
STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
440
CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS
541

@@ -30,6 +66,9 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
3066
{ MP_OBJ_NEW_QSTR(MP_QSTR_MOSI), MP_ROM_PTR(&pin_PA19) },
3167
{ MP_OBJ_NEW_QSTR(MP_QSTR_MISO), MP_ROM_PTR(&pin_PA17) },
3268

69+
{ MP_OBJ_NEW_QSTR(MP_QSTR_MTX_ADDRESS), MP_ROM_PTR(&matrix_addr_tuple) },
70+
{ MP_OBJ_NEW_QSTR(MP_QSTR_MTX_COMMON), MP_ROM_PTR(&matrix_common_dict) },
71+
3372
{ MP_OBJ_NEW_QSTR(MP_QSTR_MTX_R1), MP_ROM_PTR(&pin_PB00) },
3473
{ MP_OBJ_NEW_QSTR(MP_QSTR_MTX_G1), MP_ROM_PTR(&pin_PB01) },
3574
{ MP_OBJ_NEW_QSTR(MP_QSTR_MTX_B1), MP_ROM_PTR(&pin_PB02) },

‎ports/atmel-samd/boards/mini_sam_m4/mpconfigboard.mk

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@ QSPI_FLASH_FILESYSTEM = 1
1010
EXTERNAL_FLASH_DEVICES = "W25Q16JVxM, W25Q16JVxQ"
1111
LONGINT_IMPL = MPZ
1212

13-
# No I2S on SAMD51G
14-
CIRCUITPY_AUDIOBUSIO = 0
1513
CIRCUITPY_SYNTHIO = 0
1614

1715
CIRCUITPY_BITBANG_APA102 = 1

‎ports/atmel-samd/boards/monster_m4sk/mpconfigboard.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
#define MICROPY_HW_BOARD_NAME "Adafruit Monster M4SK"
2-
#define MICROPY_HW_MCU_NAME "samd51j19"
2+
// Board is mislabeled as SAMD51J19.
3+
#define MICROPY_HW_MCU_NAME "samd51g19"
34

45
#define CIRCUITPY_MCU_FAMILY samd51
56

‎ports/atmel-samd/boards/monster_m4sk/mpconfigboard.mk

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@ USB_PID = 0x8048
33
USB_PRODUCT = "Monster M4SK"
44
USB_MANUFACTURER = "Adafruit Industries LLC"
55

6-
CHIP_VARIANT = SAMD51J19A
6+
# Board is mislabeled as SAMD51J19.
7+
CHIP_VARIANT = SAMD51G19A
78
CHIP_FAMILY = samd51
89

910
QSPI_FLASH_FILESYSTEM = 1

‎ports/atmel-samd/boards/robohatmm1_m4/mpconfigboard.mk

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@ SPI_FLASH_FILESYSTEM = 1
1212
EXTERNAL_FLASH_DEVICES = "W25Q64JVxQ"
1313
LONGINT_IMPL = MPZ
1414

15-
# No I2S on SAMD51G
16-
CIRCUITPY_AUDIOBUSIO = 0
1715
# Make room for more stuff
1816
CIRCUITPY_BITMAPTOOLS = 0
1917
CIRCUITPY_DISPLAYIO = 0

‎ports/atmel-samd/boards/trellis_m4_express/mpconfigboard.mk

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@ QSPI_FLASH_FILESYSTEM = 1
1010
EXTERNAL_FLASH_DEVICES = "W25Q64JVxQ, GD25Q64C"
1111
LONGINT_IMPL = MPZ
1212

13-
# No I2S on SAMD51G
14-
CIRCUITPY_AUDIOBUSIO = 0
1513
CIRCUITPY_FLOPPYIO = 0
1614
CIRCUITPY_FRAMEBUFFERIO = 0
1715

0 commit comments

Comments
 (0)