Skip to content

Commit 97aa8bf

Browse files
weblateweblate
committed
Merge remote-tracking branch 'origin/main'
2 parents 7324635 + 1430cc6 commit 97aa8bf

File tree

3 files changed

+37
-28
lines changed

3 files changed

+37
-28
lines changed

‎ports/espressif/boards/espressif_esp32s3_devkitc_1_n8r8_hacktablet/mpconfigboard.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,9 @@
3131

3232
#define MICROPY_HW_NEOPIXEL (&pin_GPIO48)
3333

34+
#define DEFAULT_I2C_BUS_SCL (&pin_GPIO41)
35+
#define DEFAULT_I2C_BUS_SDA (&pin_GPIO42)
36+
3437
#define DEFAULT_UART_BUS_RX (&pin_GPIO44)
3538
#define DEFAULT_UART_BUS_TX (&pin_GPIO43)
3639

‎ports/espressif/boards/espressif_esp32s3_devkitc_1_n8r8_hacktablet/pins.c

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -71,9 +71,9 @@ MP_DEFINE_CONST_DICT(timings800_dict, timings800_table);
7171
STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
7272
CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS
7373

74-
{ MP_ROM_QSTR(MP_QSTR_TFT), MP_ROM_PTR(&tft_dict) },
75-
{ MP_ROM_QSTR(MP_QSTR_TIMINGS800), MP_ROM_PTR(&timings800_dict) },
76-
{ MP_ROM_QSTR(MP_QSTR_BACKLIGHT), MP_ROM_PTR(&pin_GPIO39) },
74+
{ MP_ROM_QSTR(MP_QSTR_TFT_PINS), MP_ROM_PTR(&tft_dict) },
75+
{ MP_ROM_QSTR(MP_QSTR_TFT_TIMINGS), MP_ROM_PTR(&timings800_dict) },
76+
{ MP_ROM_QSTR(MP_QSTR_TFT_BACKLIGHT), MP_ROM_PTR(&pin_GPIO39) },
7777

7878
{ MP_ROM_QSTR(MP_QSTR_IO0), MP_ROM_PTR(&pin_GPIO0) },
7979
{ MP_ROM_QSTR(MP_QSTR_IO1), MP_ROM_PTR(&pin_GPIO1) },
@@ -103,9 +103,9 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
103103
{ MP_ROM_QSTR(MP_QSTR_IO37), MP_ROM_PTR(&pin_GPIO37) },
104104
{ MP_ROM_QSTR(MP_QSTR_IO38), MP_ROM_PTR(&pin_GPIO38) },
105105
{ MP_ROM_QSTR(MP_QSTR_IO39), MP_ROM_PTR(&pin_GPIO39) },
106-
{ MP_ROM_QSTR(MP_QSTR_IO40), MP_ROM_PTR(&pin_GPIO40) },
107-
{ MP_ROM_QSTR(MP_QSTR_IO41), MP_ROM_PTR(&pin_GPIO41) },
108-
{ MP_ROM_QSTR(MP_QSTR_IO42), MP_ROM_PTR(&pin_GPIO42) },
106+
{ MP_ROM_QSTR(MP_QSTR_TOUCH_INT), MP_ROM_PTR(&pin_GPIO40) },
107+
{ MP_ROM_QSTR(MP_QSTR_SCL), MP_ROM_PTR(&pin_GPIO41) },
108+
{ MP_ROM_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_GPIO42) },
109109
{ MP_ROM_QSTR(MP_QSTR_IO43), MP_ROM_PTR(&pin_GPIO43) },
110110
{ MP_ROM_QSTR(MP_QSTR_IO44), MP_ROM_PTR(&pin_GPIO44) },
111111
{ MP_ROM_QSTR(MP_QSTR_de), MP_ROM_PTR(&pin_GPIO45) },
@@ -117,6 +117,8 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
117117
{ MP_ROM_QSTR(MP_QSTR_TX), MP_ROM_PTR(&pin_GPIO43) },
118118
{ MP_ROM_QSTR(MP_QSTR_RX), MP_ROM_PTR(&pin_GPIO44) },
119119

120+
{ MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&board_i2c_obj) },
121+
{ MP_ROM_QSTR(MP_QSTR_STEMMA_I2C), MP_ROM_PTR(&board_i2c_obj) },
120122
{ MP_ROM_QSTR(MP_QSTR_UART), MP_ROM_PTR(&board_uart_obj) },
121123
};
122124
MP_DEFINE_CONST_DICT(board_module_globals, board_module_globals_table);

‎ports/espressif/boards/makerfabs_tft7/pins.c

Lines changed: 26 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -5,36 +5,36 @@ STATIC const mp_rom_obj_tuple_t tft_r_pins = {
55
{&mp_type_tuple},
66
5,
77
{
8-
MP_ROM_PTR(&pin_GPIO14),
9-
MP_ROM_PTR(&pin_GPIO21),
10-
MP_ROM_PTR(&pin_GPIO47),
11-
MP_ROM_PTR(&pin_GPIO48),
128
MP_ROM_PTR(&pin_GPIO45),
9+
MP_ROM_PTR(&pin_GPIO48),
10+
MP_ROM_PTR(&pin_GPIO47),
11+
MP_ROM_PTR(&pin_GPIO21),
12+
MP_ROM_PTR(&pin_GPIO14),
1313
}
1414
};
1515

1616
STATIC const mp_rom_obj_tuple_t tft_g_pins = {
1717
{&mp_type_tuple},
1818
6,
1919
{
20-
MP_ROM_PTR(&pin_GPIO4),
21-
MP_ROM_PTR(&pin_GPIO16),
22-
MP_ROM_PTR(&pin_GPIO15),
23-
MP_ROM_PTR(&pin_GPIO7),
24-
MP_ROM_PTR(&pin_GPIO6),
2520
MP_ROM_PTR(&pin_GPIO5),
21+
MP_ROM_PTR(&pin_GPIO6),
22+
MP_ROM_PTR(&pin_GPIO7),
23+
MP_ROM_PTR(&pin_GPIO15),
24+
MP_ROM_PTR(&pin_GPIO16),
25+
MP_ROM_PTR(&pin_GPIO4),
2626
}
2727
};
2828

2929
STATIC const mp_rom_obj_tuple_t tft_b_pins = {
3030
{&mp_type_tuple},
3131
5,
3232
{
33-
MP_ROM_PTR(&pin_GPIO1),
34-
MP_ROM_PTR(&pin_GPIO9),
35-
MP_ROM_PTR(&pin_GPIO46),
36-
MP_ROM_PTR(&pin_GPIO3),
3733
MP_ROM_PTR(&pin_GPIO8),
34+
MP_ROM_PTR(&pin_GPIO3),
35+
MP_ROM_PTR(&pin_GPIO46),
36+
MP_ROM_PTR(&pin_GPIO9),
37+
MP_ROM_PTR(&pin_GPIO1),
3838
}
3939
};
4040

@@ -71,22 +71,27 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
7171
CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS
7272

7373
{ MP_ROM_QSTR(MP_QSTR_TFT_PINS), MP_ROM_PTR(&tft_pins_dict) },
74-
{ MP_ROM_QSTR(MP_QSTR_TFT_TIMINGS_800x480), MP_ROM_PTR(&timings800_dict) },
75-
{ MP_ROM_QSTR(MP_QSTR_BACKLIGHT), MP_ROM_PTR(&pin_GPIO10) },
74+
{ MP_ROM_QSTR(MP_QSTR_TFT_TIMINGS), MP_ROM_PTR(&timings800_dict) },
75+
{ MP_ROM_QSTR(MP_QSTR_TFT_BACKLIGHT), MP_ROM_PTR(&pin_GPIO10) },
76+
77+
// GPIO pins available on Mabee connector port (also shared with I2S & USB D+/D-)
78+
{ MP_ROM_QSTR(MP_QSTR_GPIO20), MP_ROM_PTR(&pin_GPIO20) },
79+
{ MP_ROM_QSTR(MP_QSTR_GPIO19), MP_ROM_PTR(&pin_GPIO19) },
7680

77-
{ MP_ROM_QSTR(MP_QSTR_I2S_SCK), MP_ROM_PTR(&pin_GPIO20) },
78-
{ MP_ROM_QSTR(MP_QSTR_I2S_WS), MP_ROM_PTR(&pin_GPIO2) },
79-
{ MP_ROM_QSTR(MP_QSTR_I2S_SDO), MP_ROM_PTR(&pin_GPIO19) },
81+
{ MP_ROM_QSTR(MP_QSTR_I2S_BIT_CLOCK), MP_ROM_PTR(&pin_GPIO20) },
82+
{ MP_ROM_QSTR(MP_QSTR_I2S_WORD_SELECT), MP_ROM_PTR(&pin_GPIO2) },
83+
{ MP_ROM_QSTR(MP_QSTR_I2S_DATA), MP_ROM_PTR(&pin_GPIO19) },
8084

8185
{ MP_ROM_QSTR(MP_QSTR_TX), MP_ROM_PTR(&pin_GPIO43) },
8286
{ MP_ROM_QSTR(MP_QSTR_RX), MP_ROM_PTR(&pin_GPIO44) },
8387

8488
{ MP_ROM_QSTR(MP_QSTR_SCL), MP_ROM_PTR(&pin_GPIO18) },
8589
{ MP_ROM_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_GPIO17) },
90+
{ MP_ROM_QSTR(MP_QSTR_TOUCH_RESET), MP_ROM_PTR(&pin_GPIO38) },
8691

87-
{ MP_ROM_QSTR(MP_QSTR_MOSI), MP_ROM_PTR(&pin_GPIO11) },
88-
{ MP_ROM_QSTR(MP_QSTR_MISO), MP_ROM_PTR(&pin_GPIO13) },
89-
{ MP_ROM_QSTR(MP_QSTR_SCK), MP_ROM_PTR(&pin_GPIO12) },
92+
{ MP_ROM_QSTR(MP_QSTR_SDIO_CMD), MP_ROM_PTR(&pin_GPIO11) },
93+
{ MP_ROM_QSTR(MP_QSTR_SDIO_D0), MP_ROM_PTR(&pin_GPIO13) },
94+
{ MP_ROM_QSTR(MP_QSTR_SDIO_CLK), MP_ROM_PTR(&pin_GPIO12) },
9095

9196
// boot mode button can be used in SW as well
9297
{ MP_ROM_QSTR(MP_QSTR_BUTTON), MP_ROM_PTR(&pin_GPIO1) },
@@ -95,6 +100,5 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
95100
// Permanent SDIO 1-bit mode?
96101

97102
{ MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&board_i2c_obj) },
98-
{ MP_ROM_QSTR(MP_QSTR_SPI), MP_ROM_PTR(&board_spi_obj) },
99103
};
100104
MP_DEFINE_CONST_DICT(board_module_globals, board_module_globals_table);

0 commit comments

Comments
 (0)