djsundog/circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

esp32: Add MICROPY_HW_ENABLE_UART_REPL and enable on generic S2/S3.

Browse Source 
Some S2/S3 modules don't use the native USB interface but instead have an
external USB-UART.  To make the GENERIC_S3/S3 firmware work on these boards
the UART REPL is enabled in addition to the native USB CDC REPL.

Fixes issues #8418 and #8524.

Signed-off-by: Damien George <damien@micropython.org>
This commit is contained in:
Damien George 2022-04-13 16:00:22 +10:00
parent be25e333df
commit fe9eaf12f3
6 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ports/esp32/boards/GENERIC_S2/mpconfigboard.h
View File

@ -3,3 +3,6 @@
#define MICROPY_PY_BLUETOOTH (0) #define MICROPY_PY_BLUETOOTH (0)
#define MICROPY_HW_ENABLE_SDCARD (0) #define MICROPY_HW_ENABLE_SDCARD (0)
// Enable UART REPL for modules that have an external USB-UART and don't use native USB.
#define MICROPY_HW_ENABLE_UART_REPL (1)

3
ports/esp32/boards/GENERIC_S3/mpconfigboard.h
View File

@ -3,5 +3,8 @@
#define MICROPY_PY_MACHINE_DAC (0) #define MICROPY_PY_MACHINE_DAC (0)
// Enable UART REPL for modules that have an external USB-UART and don't use native USB.
#define MICROPY_HW_ENABLE_UART_REPL (1)
#define MICROPY_HW_I2C0_SCL (9) #define MICROPY_HW_I2C0_SCL (9)
#define MICROPY_HW_I2C0_SDA (8) #define MICROPY_HW_I2C0_SDA (8)

3
ports/esp32/boards/GENERIC_S3_SPIRAM/mpconfigboard.h
View File

@ -4,5 +4,8 @@
#define MICROPY_PY_BLUETOOTH (0) #define MICROPY_PY_BLUETOOTH (0)
#define MICROPY_PY_MACHINE_DAC (0) #define MICROPY_PY_MACHINE_DAC (0)
// Enable UART REPL for modules that have an external USB-UART and don't use native USB.
#define MICROPY_HW_ENABLE_UART_REPL (1)
#define MICROPY_HW_I2C0_SCL (9) #define MICROPY_HW_I2C0_SCL (9)
#define MICROPY_HW_I2C0_SDA (8) #define MICROPY_HW_I2C0_SDA (8)

3
ports/esp32/main.c
View File

@ -92,7 +92,8 @@ void mp_task(void *pvParameter) {
usb_init(); usb_init();
#elif CONFIG_ESP_CONSOLE_USB_SERIAL_JTAG #elif CONFIG_ESP_CONSOLE_USB_SERIAL_JTAG
usb_serial_jtag_init(); usb_serial_jtag_init();
#else #endif
#if MICROPY_HW_ENABLE_UART_REPL
uart_stdout_init(); uart_stdout_init();
#endif #endif
machine_init(); machine_init();

3
ports/esp32/mphalport.c
View File

@ -111,7 +111,8 @@ void mp_hal_stdout_tx_strn(const char *str, size_t len) {
usb_tx_strn(str, len); usb_tx_strn(str, len);
#elif CONFIG_ESP_CONSOLE_USB_SERIAL_JTAG #elif CONFIG_ESP_CONSOLE_USB_SERIAL_JTAG
usb_serial_jtag_tx_strn(str, len); usb_serial_jtag_tx_strn(str, len);
#else #endif
#if MICROPY_HW_ENABLE_UART_REPL
uart_stdout_tx_strn(str, len); uart_stdout_tx_strn(str, len);
#endif #endif
if (release_gil) { if (release_gil) {

5
ports/esp32/uart.h
View File

@ -28,6 +28,11 @@
#ifndef MICROPY_INCLUDED_ESP32_UART_H #ifndef MICROPY_INCLUDED_ESP32_UART_H
#define MICROPY_INCLUDED_ESP32_UART_H #define MICROPY_INCLUDED_ESP32_UART_H
// Whether to enable the REPL on a UART.
#ifndef MICROPY_HW_ENABLE_UART_REPL
#define MICROPY_HW_ENABLE_UART_REPL (!CONFIG_USB_ENABLED && !CONFIG_ESP_CONSOLE_USB_SERIAL_JTAG)
#endif
#ifndef MICROPY_HW_UART_REPL #ifndef MICROPY_HW_UART_REPL
#define MICROPY_HW_UART_REPL (UART_NUM_0) #define MICROPY_HW_UART_REPL (UART_NUM_0)
#endif #endif