8000 esp32: Fix ESP32-C3 USB serial/jtag peripheral pre-IDF 5.1. · micropython/micropython@f0d89cc · GitHub
[go: up one dir, main page]
Skip to content

Commit f0d89cc

Browse files
projectgusprojectgus
committed
esp32: Fix ESP32-C3 USB serial/jtag peripheral pre-IDF 5.1.
Regression in 0a11832 in IDF 5.0.x where macro CONFIG_ESP_CONSOLE_USB_SERIAL_JTAG_ENABLED is not defined. With this patch, ESP32-S3 still USB Serial/JTAG incorrectly (now on all ESP-IDF versions). Closes #15701 This work was funded through GitHub Sponsors. Signed-off-by: Angus Gratton <angus@redyak.com.au>
1 parent 35b6a66 commit f0d89cc

File tree

8 files changed

+16
-11
lines changed

8 files changed

+16
-11
lines changed

‎ports/esp32/machine_pin.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ static mp_obj_t machine_pin_obj_init_helper(const machine_pin_obj_t *self, size_
159159
}
160160
}
161161

162-
#if CONFIG_IDF_TARGET_ESP32C3 && CONFIG_ESP_CONSOLE_USB_SERIAL_JTAG_ENABLED
162+
#if CONFIG_IDF_TARGET_ESP32C3 && MICROPY_HW_ESP_USB_SERIAL_JTAG
163163
if (index == 18 || index == 19) {
164164
CLEAR_PERI_REG_MASK(USB_SERIAL_JTAG_CONF0_REG, USB_SERIAL_JTAG_USB_PAD_ENABLE);
165165
}

‎ports/esp32/machine_pin.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@
8787
#define MICROPY_HW_ENABLE_GPIO11 (1)
8888
#define MICROPY_HW_ENABLE_GPIO12 (1)
8989
#define MICROPY_HW_ENABLE_GPIO13 (1)
90-
#if !CONFIG_ESP_CONSOLE_USB_SERIAL_JTAG_ENABLED
90+
#if !MICROPY_HW_ESP_USB_SERIAL_JTAG
9191
#define MICROPY_HW_ENABLE_GPIO18 (1)
9292
#define MICROPY_HW_ENABLE_GPIO19 (1)
9393
#endif

‎ports/esp32/main.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ void mp_task(void *pvParameter) {
9999
#if MICROPY_PY_THREAD
100100
mp_thread_init(pxTaskGetStackStart(NULL), MICROPY_TASK_STACK_SIZE / sizeof(uintptr_t));
101101
#endif
102-
8000 #if CONFIG_ESP_CONSOLE_USB_SERIAL_JTAG_ENABLED
102+
#if MICROPY_HW_ESP_USB_SERIAL_JTAG
103103
usb_serial_jtag_init();
104104
#elif CONFIG_USB_OTG_SUPPORTED
105105
usb_init();

‎ports/esp32/mpconfigport.h

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -260,6 +260,11 @@ typedef long mp_off_t;
260260
// board specifics
261261
#define MICROPY_PY_SYS_PLATFORM "esp32"
262262

263+
// Enable stdio over USB Serial/JTAG peripheral
264+
#ifndef MICROPY_HW_ESP_USB_SERIAL_JTAG
265+
#define MICROPY_HW_ESP_USB_SERIAL_JTAG (SOC_USB_SERIAL_JTAG_SUPPORTED)
266+
#endif // MICROPY_HW_ESP_USB_SERIAL_JTAG
267+
263268
// ESP32-S3 extended IO for 47 & 48
264269
#ifndef MICROPY_HW_ESP32S3_EXTENDED_IO
265270
#define MICROPY_HW_ESP32S3_EXTENDED_IO (1)

‎ports/esp32/mphalport.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ void check_esp_err_(esp_err_t code, const char *func, const int line, const char
104104

105105
uintptr_t mp_hal_stdio_poll(uintptr_t poll_flags) {
106106
uintptr_t ret = 0;
107-
#if CONFIG_ESP_CONSOLE_USB_SERIAL_JTAG_ENABLED
107+
#if MICROPY_HW_ESP_USB_SERIAL_JTAG
108108
usb_serial_jtag_poll_rx();
109109
#endif
110110
if ((poll_flags & MP_STREAM_POLL_RD) && stdin_ringbuf.iget != stdin_ringbuf.iput) {
@@ -118,7 +118,7 @@ uintptr_t mp_hal_stdio_poll(uintptr_t poll_flags) {
118118

119119
int mp_hal_stdin_rx_chr(void) {
120120
for (;;) {
121-
#if CONFIG_ESP_CONSOLE_USB_SERIAL_JTAG_ENABLED
121+
#if MICROPY_HW_ESP_USB_SERIAL_JTAG
122122
usb_serial_jtag_poll_rx();
123123
#endif
124124
int c = ringbuf_get(&stdin_ringbuf);
@@ -143,7 +143,7 @@ mp_uint_t mp_hal_stdout_tx_strn(const char *str, size_t len) {
143143
if (release_gil) {
144144
MP_THREAD_GIL_EXIT();
145145
}
146-
#if CONFIG_ESP_CONSOLE_USB_SERIAL_JTAG_ENABLED
146+
#if MICROPY_HW_ESP_USB_SERIAL_JTAG
147147
usb_serial_jtag_tx_strn(str, len);
148148
did_write = true;
149149
#elif CONFIG_USB_OTG_SUPPORTED

‎ports/esp32/uart.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030

3131
// Whether to enable the REPL on a UART.
3232
#ifndef MICROPY_HW_ENABLE_UART_REPL
33-
#define MICROPY_HW_ENABLE_UART_REPL (!CONFIG_USB_OTG_SUPPORTED && !CONFIG_ESP_CONSOLE_USB_CDC && !CONFIG_ESP_CONSOLE_USB_SERIAL_JTAG_ENABLED)
33+
#define MICROPY_HW_ENABLE_UART_REPL (!CONFIG_USB_OTG_SUPPORTED && !CONFIG_ESP_CONSOLE_USB_CDC && !MICROPY_HW_ESP_USB_SERIAL_JTAG)
3434
#endif
3535

3636
#if MICROPY_HW_ENABLE_UART_REPL

‎ports/esp32/usb.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
#include "py/mphal.h"
2929
#include "usb.h"
3030

31-
#if CONFIG_USB_OTG_SUPPORTED && !CONFIG_ESP_CONSOLE_USB_CDC && !CONFIG_ESP_CONSOLE_USB_SERIAL_JTAG_ENABLED
31+
#if CONFIG_USB_OTG_SUPPORTED && !CONFIG_ESP_CONSOLE_USB_CDC && !MICROPY_HW_ESP_USB_SERIAL_JTAG
3232

3333
#include "esp_timer.h"
3434
#ifndef NO_QSTR
@@ -100,4 +100,4 @@ void usb_tx_strn(const char *str, size_t len) {
100100
}
101101
}
102102

103-
#endif // CONFIG_USB_OTG_SUPPORTED && !CONFIG_ESP_CONSOLE_USB_CDC && !CONFIG_ESP_CONSOLE_USB_SERIAL_JTAG_ENABLED
103+
#endif // CONFIG_USB_OTG_SUPPORTED && !CONFIG_ESP_CONSOLE_USB_CDC && !MICROPY_HW_ESP_USB_SERIAL_JTAG

‎ports/esp32/usb_serial_jtag.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
#include "py/mphal.h"
2929
#include "usb_serial_jtag.h"
3030

31-
#if CONFIG_ESP_CONSOLE_USB_SERIAL_JTAG_ENABLED
31+
#if MICROPY_HW_ESP_USB_SERIAL_JTAG
3232

3333
#include "hal/usb_serial_jtag_ll.h"
3434
#include "esp_intr_alloc.h"
@@ -117,4 +117,4 @@ void usb_serial_jtag_tx_strn(const char *str, size_t len) {
117117
}
118118
}
119119

120-
#endif // CONFIG_ESP_CONSOLE_USB_SERIAL_JTAG_ENABLED
120+
#endif // MICROPY_HW_ESP_USB_SERIAL_JTAG

0 commit comments

Comments
 (0)
0