Skip to content

Commit 5ab16b7

Browse files
microdev1microdev1
authored
Merge pull request #5905 from prplz/esp32s3-devkits-uart
Fix esp32s3 devkitc uart naming and add board.UART
2 parents eeeef38 + 4d78e34 commit 5ab16b7

File tree

6 files changed

+33
-15
lines changed

6 files changed

+33
-15
lines changed

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

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,13 @@
2929
#define MICROPY_HW_BOARD_NAME "ESP32-S3-DevKitC-1-N8"
3030
#define MICROPY_HW_MCU_NAME "ESP32S3"
3131

32-
#define MICROPY_HW_NEOPIXEL (&pin_GPIO48)
32+
#define MICROPY_HW_NEOPIXEL (&pin_GPIO48)
3333

34-
#define CIRCUITPY_BOOT_BUTTON (&pin_GPIO0)
34+
#define CIRCUITPY_BOOT_BUTTON (&pin_GPIO0)
35+
36+
#define DEFAULT_UART_BUS_RX (&pin_GPIO44)
37+
#define DEFAULT_UART_BUS_TX (&pin_GPIO43)
3538

3639
#define BOARD_USER_SAFE_MODE_ACTION translate("pressing boot button at start up.\n")
3740

38-
#define AUTORESET_DELAY_MS 500
41+
#define AUTORESET_DELAY_MS 500

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

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,13 +33,16 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
3333
{ MP_ROM_QSTR(MP_QSTR_IO41), MP_ROM_PTR(&pin_GPIO41) },
3434
{ MP_ROM_QSTR(MP_QSTR_IO42), MP_ROM_PTR(&pin_GPIO42) },
3535
{ MP_ROM_QSTR(MP_QSTR_IO43), MP_ROM_PTR(&pin_GPIO43) },
36-
{ MP_ROM_QSTR(MP_QSTR_TXD0), MP_ROM_PTR(&pin_GPIO43) },
3736
{ MP_ROM_QSTR(MP_QSTR_IO44), MP_ROM_PTR(&pin_GPIO44) },
38-
{ MP_ROM_QSTR(MP_QSTR_TXD1), MP_ROM_PTR(&pin_GPIO44) },
3937
{ MP_ROM_QSTR(MP_QSTR_IO45), MP_ROM_PTR(&pin_GPIO45) },
4038
{ MP_ROM_QSTR(MP_QSTR_IO46), MP_ROM_PTR(&pin_GPIO46) },
4139
{ MP_ROM_QSTR(MP_QSTR_IO47), MP_ROM_PTR(&pin_GPIO47) },
4240
{ MP_ROM_QSTR(MP_QSTR_IO48), MP_ROM_PTR(&pin_GPIO48) },
4341
{ MP_ROM_QSTR(MP_QSTR_NEOPIXEL), MP_ROM_PTR(&pin_GPIO48) },
42+
43+
{ MP_ROM_QSTR(MP_QSTR_TX), MP_ROM_PTR(&pin_GPIO43) },
44+
{ MP_ROM_QSTR(MP_QSTR_RX), MP_ROM_PTR(&pin_GPIO44) },
45+
46+
{ MP_ROM_QSTR(MP_QSTR_UART), MP_ROM_PTR(&board_uart_obj) },
4447
};
4548
MP_DEFINE_CONST_DICT(board_module_globals, board_module_globals_table);

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

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,13 @@
2929
#define MICROPY_HW_BOARD_NAME "ESP32-S3-DevKitC-1-N8R2"
3030
#define MICROPY_HW_MCU_NAME "ESP32S3"
3131

32-
#define MICROPY_HW_NEOPIXEL (&pin_GPIO48)
32+
#define MICROPY_HW_NEOPIXEL (&pin_GPIO48)
3333

34-
#define CIRCUITPY_BOOT_BUTTON (&pin_GPIO0)
34+
#define CIRCUITPY_BOOT_BUTTON (&pin_GPIO0)
35+
36+
#define DEFAULT_UART_BUS_RX (&pin_GPIO44)
37+
#define DEFAULT_UART_BUS_TX (&pin_GPIO43)
3538

3639
#define BOARD_USER_SAFE_MODE_ACTION translate("pressing boot button at start up.\n")
3740

38-
#define AUTORESET_DELAY_MS 500
41+
#define AUTORESET_DELAY_MS 500

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

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,13 +33,16 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
3333
{ MP_ROM_QSTR(MP_QSTR_IO41), MP_ROM_PTR(&pin_GPIO41) },
3434
{ MP_ROM_QSTR(MP_QSTR_IO42), MP_ROM_PTR(&pin_GPIO42) },
3535
{ MP_ROM_QSTR(MP_QSTR_IO43), MP_ROM_PTR(&pin_GPIO43) },
36-
{ MP_ROM_QSTR(MP_QSTR_TXD0), MP_ROM_PTR(&pin_GPIO43) },
3736
{ MP_ROM_QSTR(MP_QSTR_IO44), MP_ROM_PTR(&pin_GPIO44) },
38-
{ MP_ROM_QSTR(MP_QSTR_TXD1), MP_ROM_PTR(&pin_GPIO44) },
3937
{ MP_ROM_QSTR(MP_QSTR_IO45), MP_ROM_PTR(&pin_GPIO45) },
4038
{ MP_ROM_QSTR(MP_QSTR_IO46), MP_ROM_PTR(&pin_GPIO46) },
4139
{ MP_ROM_QSTR(MP_QSTR_IO47), MP_ROM_PTR(&pin_GPIO47) },
4240
{ MP_ROM_QSTR(MP_QSTR_IO48), MP_ROM_PTR(&pin_GPIO48) },
4341
{ MP_ROM_QSTR(MP_QSTR_NEOPIXEL), MP_ROM_PTR(&pin_GPIO48) },
42+
43+
{ MP_ROM_QSTR(MP_QSTR_TX), MP_ROM_PTR(&pin_GPIO43) },
44+
{ MP_ROM_QSTR(MP_QSTR_RX), MP_ROM_PTR(&pin_GPIO44) },
45+
46+
{ MP_ROM_QSTR(MP_QSTR_UART), MP_ROM_PTR(&board_uart_obj) },
4447
};
4548
MP_DEFINE_CONST_DICT(board_module_globals, board_module_globals_table);

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

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,13 @@
2929
#define MICROPY_HW_BOARD_NAME "ESP32-S3-DevKitC-1-N8R8"
3030
#define MICROPY_HW_MCU_NAME "ESP32S3"
3131

32-
#define MICROPY_HW_NEOPIXEL (&pin_GPIO48)
32+
#define MICROPY_HW_NEOPIXEL (&pin_GPIO48)
3333

34-
#define CIRCUITPY_BOOT_BUTTON (&pin_GPIO0)
34+
#define CIRCUITPY_BOOT_BUTTON (&pin_GPIO0)
35+
36+
#define DEFAULT_UART_BUS_RX (&pin_GPIO44)
37+
#define DEFAULT_UART_BUS_TX (&pin_GPIO43)
3538

3639
#define BOARD_USER_SAFE_MODE_ACTION translate("pressing boot button at start up.\n")
3740

38-
#define AUTORESET_DELAY_MS 500
41+
#define AUTORESET_DELAY_MS 500

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

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,13 +33,16 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
3333
{ MP_ROM_QSTR(MP_QSTR_IO41), MP_ROM_PTR(&pin_GPIO41) },
3434
{ MP_ROM_QSTR(MP_QSTR_IO42), MP_ROM_PTR(&pin_GPIO42) },
3535
{ MP_ROM_QSTR(MP_QSTR_IO43), MP_ROM_PTR(&pin_GPIO43) },
36-
{ MP_ROM_QSTR(MP_QSTR_TXD0), MP_ROM_PTR(&pin_GPIO43) },
3736
{ MP_ROM_QSTR(MP_QSTR_IO44), MP_ROM_PTR(&pin_GPIO44) },
38-
{ MP_ROM_QSTR(MP_QSTR_TXD1), MP_ROM_PTR(&pin_GPIO44) },
3937
{ MP_ROM_QSTR(MP_QSTR_IO45), MP_ROM_PTR(&pin_GPIO45) },
4038
{ MP_ROM_QSTR(MP_QSTR_IO46), MP_ROM_PTR(&pin_GPIO46) },
4139
{ MP_ROM_QSTR(MP_QSTR_IO47), MP_ROM_PTR(&pin_GPIO47) },
4240
{ MP_ROM_QSTR(MP_QSTR_IO48), MP_ROM_PTR(&pin_GPIO48) },
4341
{ MP_ROM_QSTR(MP_QSTR_NEOPIXEL), MP_ROM_PTR(&pin_GPIO48) },
42+
43+
{ MP_ROM_QSTR(MP_QSTR_TX), MP_ROM_PTR(&pin_GPIO43) },
44+
{ MP_ROM_QSTR(MP_QSTR_RX), MP_ROM_PTR(&pin_GPIO44) },
45+
46+
{ MP_ROM_QSTR(MP_QSTR_UART), MP_ROM_PTR(&board_uart_obj) },
4447
};
4548
MP_DEFINE_CONST_DICT(board_module_globals, board_module_globals_table);

0 commit comments

Comments
 (0)