diff options
| -rw-r--r-- | ports/esp32/boards/ESP32_GENERIC_C3/sdkconfig.c3usb | 2 | ||||
| -rw-r--r-- | ports/esp32/boards/LOLIN_C3_MINI/sdkconfig.board | 2 | ||||
| -rw-r--r-- | ports/esp32/machine_pin.c | 2 | ||||
| -rw-r--r-- | ports/esp32/machine_pin.h | 2 | ||||
| -rw-r--r-- | ports/esp32/main.c | 2 | ||||
| -rw-r--r-- | ports/esp32/mphalport.c | 6 | ||||
| -rw-r--r-- | ports/esp32/uart.h | 2 | ||||
| -rw-r--r-- | ports/esp32/usb.c | 4 | ||||
| -rw-r--r-- | ports/esp32/usb_serial_jtag.c | 4 |
9 files changed, 11 insertions, 15 deletions
diff --git a/ports/esp32/boards/ESP32_GENERIC_C3/sdkconfig.c3usb b/ports/esp32/boards/ESP32_GENERIC_C3/sdkconfig.c3usb index d9e7c7f61..9e75d07de 100644 --- a/ports/esp32/boards/ESP32_GENERIC_C3/sdkconfig.c3usb +++ b/ports/esp32/boards/ESP32_GENERIC_C3/sdkconfig.c3usb @@ -3,5 +3,3 @@ CONFIG_ESP32C3_BROWNOUT_DET=y CONFIG_ESP32C3_BROWNOUT_DET_LVL_SEL_7= CONFIG_ESP32C3_BROWNOUT_DET_LVL_SEL_4=y CONFIG_ESP32C3_BROWNOUT_DET_LVL=4 -CONFIG_ESP_CONSOLE_UART_DEFAULT= -CONFIG_ESP_CONSOLE_USB_SERIAL_JTAG=y diff --git a/ports/esp32/boards/LOLIN_C3_MINI/sdkconfig.board b/ports/esp32/boards/LOLIN_C3_MINI/sdkconfig.board index d9e7c7f61..9e75d07de 100644 --- a/ports/esp32/boards/LOLIN_C3_MINI/sdkconfig.board +++ b/ports/esp32/boards/LOLIN_C3_MINI/sdkconfig.board @@ -3,5 +3,3 @@ CONFIG_ESP32C3_BROWNOUT_DET=y CONFIG_ESP32C3_BROWNOUT_DET_LVL_SEL_7= CONFIG_ESP32C3_BROWNOUT_DET_LVL_SEL_4=y CONFIG_ESP32C3_BROWNOUT_DET_LVL=4 -CONFIG_ESP_CONSOLE_UART_DEFAULT= -CONFIG_ESP_CONSOLE_USB_SERIAL_JTAG=y diff --git a/ports/esp32/machine_pin.c b/ports/esp32/machine_pin.c index 1e7b86bae..17c01fc7b 100644 --- a/ports/esp32/machine_pin.c +++ b/ports/esp32/machine_pin.c @@ -159,7 +159,7 @@ static mp_obj_t machine_pin_obj_init_helper(const machine_pin_obj_t *self, size_ } } - #if CONFIG_IDF_TARGET_ESP32C3 + #if CONFIG_IDF_TARGET_ESP32C3 && CONFIG_ESP_CONSOLE_USB_SERIAL_JTAG_ENABLED if (index == 18 || index == 19) { CLEAR_PERI_REG_MASK(USB_SERIAL_JTAG_CONF0_REG, USB_SERIAL_JTAG_USB_PAD_ENABLE); } diff --git a/ports/esp32/machine_pin.h b/ports/esp32/machine_pin.h index 53f9c6bda..b46998725 100644 --- a/ports/esp32/machine_pin.h +++ b/ports/esp32/machine_pin.h @@ -87,7 +87,7 @@ #define MICROPY_HW_ENABLE_GPIO11 (1) #define MICROPY_HW_ENABLE_GPIO12 (1) #define MICROPY_HW_ENABLE_GPIO13 (1) -#if !CONFIG_ESP_CONSOLE_USB_SERIAL_JTAG +#if !CONFIG_ESP_CONSOLE_USB_SERIAL_JTAG_ENABLED #define MICROPY_HW_ENABLE_GPIO18 (1) #define MICROPY_HW_ENABLE_GPIO19 (1) #endif diff --git a/ports/esp32/main.c b/ports/esp32/main.c index ea641e668..330ba64b4 100644 --- a/ports/esp32/main.c +++ b/ports/esp32/main.c @@ -99,7 +99,7 @@ void mp_task(void *pvParameter) { #if MICROPY_PY_THREAD mp_thread_init(pxTaskGetStackStart(NULL), MICROPY_TASK_STACK_SIZE / sizeof(uintptr_t)); #endif - #if CONFIG_ESP_CONSOLE_USB_SERIAL_JTAG + #if CONFIG_ESP_CONSOLE_USB_SERIAL_JTAG_ENABLED usb_serial_jtag_init(); #elif CONFIG_USB_OTG_SUPPORTED usb_init(); diff --git a/ports/esp32/mphalport.c b/ports/esp32/mphalport.c index fd1cbcdb9..df966b3a2 100644 --- a/ports/esp32/mphalport.c +++ b/ports/esp32/mphalport.c @@ -100,7 +100,7 @@ void check_esp_err_(esp_err_t code, const char *func, const int line, const char uintptr_t mp_hal_stdio_poll(uintptr_t poll_flags) { uintptr_t ret = 0; - #if CONFIG_ESP_CONSOLE_USB_SERIAL_JTAG + #if CONFIG_ESP_CONSOLE_USB_SERIAL_JTAG_ENABLED usb_serial_jtag_poll_rx(); #endif if ((poll_flags & MP_STREAM_POLL_RD) && stdin_ringbuf.iget != stdin_ringbuf.iput) { @@ -114,7 +114,7 @@ uintptr_t mp_hal_stdio_poll(uintptr_t poll_flags) { int mp_hal_stdin_rx_chr(void) { for (;;) { - #if CONFIG_ESP_CONSOLE_USB_SERIAL_JTAG + #if CONFIG_ESP_CONSOLE_USB_SERIAL_JTAG_ENABLED usb_serial_jtag_poll_rx(); #endif int c = ringbuf_get(&stdin_ringbuf); @@ -133,7 +133,7 @@ mp_uint_t mp_hal_stdout_tx_strn(const char *str, size_t len) { if (release_gil) { MP_THREAD_GIL_EXIT(); } - #if CONFIG_ESP_CONSOLE_USB_SERIAL_JTAG + #if CONFIG_ESP_CONSOLE_USB_SERIAL_JTAG_ENABLED usb_serial_jtag_tx_strn(str, len); did_write = true; #elif CONFIG_USB_OTG_SUPPORTED diff --git a/ports/esp32/uart.h b/ports/esp32/uart.h index 3d88eed82..13c5e8830 100644 --- a/ports/esp32/uart.h +++ b/ports/esp32/uart.h @@ -30,7 +30,7 @@ // Whether to enable the REPL on a UART. #ifndef MICROPY_HW_ENABLE_UART_REPL -#define MICROPY_HW_ENABLE_UART_REPL (!CONFIG_USB_OTG_SUPPORTED && !CONFIG_ESP_CONSOLE_USB_CDC && !CONFIG_ESP_CONSOLE_USB_SERIAL_JTAG) +#define MICROPY_HW_ENABLE_UART_REPL (!CONFIG_USB_OTG_SUPPORTED && !CONFIG_ESP_CONSOLE_USB_CDC && !CONFIG_ESP_CONSOLE_USB_SERIAL_JTAG_ENABLED) #endif #if MICROPY_HW_ENABLE_UART_REPL diff --git a/ports/esp32/usb.c b/ports/esp32/usb.c index 2a3a2595d..5a0e6b8a9 100644 --- a/ports/esp32/usb.c +++ b/ports/esp32/usb.c @@ -28,7 +28,7 @@ #include "py/mphal.h" #include "usb.h" -#if CONFIG_USB_OTG_SUPPORTED && !CONFIG_ESP_CONSOLE_USB_CDC && !CONFIG_ESP_CONSOLE_USB_SERIAL_JTAG +#if CONFIG_USB_OTG_SUPPORTED && !CONFIG_ESP_CONSOLE_USB_CDC && !CONFIG_ESP_CONSOLE_USB_SERIAL_JTAG_ENABLED #include "esp_timer.h" #ifndef NO_QSTR @@ -100,4 +100,4 @@ void usb_tx_strn(const char *str, size_t len) { } } -#endif // CONFIG_USB_OTG_SUPPORTED && !CONFIG_ESP_CONSOLE_USB_CDC && !CONFIG_ESP_CONSOLE_USB_SERIAL_JTAG +#endif // CONFIG_USB_OTG_SUPPORTED && !CONFIG_ESP_CONSOLE_USB_CDC && !CONFIG_ESP_CONSOLE_USB_SERIAL_JTAG_ENABLED diff --git a/ports/esp32/usb_serial_jtag.c b/ports/esp32/usb_serial_jtag.c index f4b4b7cb9..f1148ab19 100644 --- a/ports/esp32/usb_serial_jtag.c +++ b/ports/esp32/usb_serial_jtag.c @@ -28,7 +28,7 @@ #include "py/mphal.h" #include "usb_serial_jtag.h" -#if CONFIG_ESP_CONSOLE_USB_SERIAL_JTAG +#if CONFIG_ESP_CONSOLE_USB_SERIAL_JTAG_ENABLED #include "hal/usb_serial_jtag_ll.h" #include "esp_intr_alloc.h" @@ -117,4 +117,4 @@ void usb_serial_jtag_tx_strn(const char *str, size_t len) { } } -#endif // CONFIG_ESP_CONSOLE_USB_SERIAL_JTAG +#endif // CONFIG_ESP_CONSOLE_USB_SERIAL_JTAG_ENABLED |