From ba3f9ec69bdbd3390e6b9db1ce1457016f2c0c5f Mon Sep 17 00:00:00 2001 From: Yu-886 <2860280851@qq.com> Date: Fri, 14 Mar 2025 17:33:21 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=80=8F=E4=BC=A0bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/esp-flasher/flasher_common.c | 2 +- main/usb_serial_echo_main.c | 6 +++--- sdkconfig | 16 ++++++++-------- sdkconfig.old | 24 ++++++++++-------------- 4 files changed, 22 insertions(+), 26 deletions(-) diff --git a/components/esp-flasher/flasher_common.c b/components/esp-flasher/flasher_common.c index c314ce7..1d76b41 100644 --- a/components/esp-flasher/flasher_common.c +++ b/components/esp-flasher/flasher_common.c @@ -21,7 +21,7 @@ #include #include "esp_loader_io.h" #include "esp_loader.h" -#include "example_common.h" +#include "flasher_common.h" #ifndef SINGLE_TARGET_SUPPORT diff --git a/main/usb_serial_echo_main.c b/main/usb_serial_echo_main.c index 145bcb4..cf6383c 100755 --- a/main/usb_serial_echo_main.c +++ b/main/usb_serial_echo_main.c @@ -27,7 +27,7 @@ #include "esp32_port.h" #include "esp_loader.h" -#include "example_common.h" +#include "flasher_common.h" #include "driver/uart.h" #include "driver/gpio.h" @@ -422,7 +422,7 @@ void app_main(void) //Install UART driver, and get the queue. uart_driver_install(EX_UART_NUM, BUF_SIZE * 2, BUF_SIZE * 2, 20, &uart0_queue, 0); uart_param_config(EX_UART_NUM, &uart_config); - // xTaskCreate(echo_task, "USB SERIAL JTAG_echo_task", ECHO_TASK_STACK_SIZE, NULL, 10, NULL); + xTaskCreate(echo_task, "USB SERIAL JTAG_echo_task", ECHO_TASK_STACK_SIZE, NULL, 10, NULL); //Create a task to handler UART event from ISR xTaskCreate(uart_event_task, "uart_event_task", 2048*10, NULL, 12, NULL); @@ -448,7 +448,7 @@ void app_main(void) if (connect_to_target(230400) == ESP_LOADER_SUCCESS) { - ESP_LOGI(TAG, "connect_to_target initialization ESP_LOADER_success."); + ESP_LOGI(TAG, "connect_to_target initialization success."); }else{ ESP_LOGE(TAG, "connect_to_target initialization failed."); } diff --git a/sdkconfig b/sdkconfig index 6e16b6b..40349f0 100644 --- a/sdkconfig +++ b/sdkconfig @@ -480,8 +480,8 @@ CONFIG_ESP_ROM_SUPPORT_DEEP_SLEEP_WAKEUP_STUB=y # # Boot ROM Behavior # -CONFIG_BOOT_ROM_LOG_ALWAYS_ON=y -# CONFIG_BOOT_ROM_LOG_ALWAYS_OFF is not set +# CONFIG_BOOT_ROM_LOG_ALWAYS_ON is not set +CONFIG_BOOT_ROM_LOG_ALWAYS_OFF=y # CONFIG_BOOT_ROM_LOG_ON_GPIO_HIGH is not set # CONFIG_BOOT_ROM_LOG_ON_GPIO_LOW is not set # end of Boot ROM Behavior @@ -1122,13 +1122,13 @@ CONFIG_ESP_MAIN_TASK_AFFINITY=0x0 CONFIG_ESP_MINIMAL_SHARED_STACK_SIZE=2048 # CONFIG_ESP_CONSOLE_UART_DEFAULT is not set # CONFIG_ESP_CONSOLE_USB_CDC is not set -CONFIG_ESP_CONSOLE_USB_SERIAL_JTAG=y +# CONFIG_ESP_CONSOLE_USB_SERIAL_JTAG is not set # CONFIG_ESP_CONSOLE_UART_CUSTOM is not set -# CONFIG_ESP_CONSOLE_NONE is not set +CONFIG_ESP_CONSOLE_NONE=y CONFIG_ESP_CONSOLE_SECONDARY_NONE=y -CONFIG_ESP_CONSOLE_USB_SERIAL_JTAG_ENABLED=y +# CONFIG_ESP_CONSOLE_SECONDARY_USB_SERIAL_JTAG is not set CONFIG_ESP_CONSOLE_UART_NUM=-1 -CONFIG_ESP_CONSOLE_ROM_SERIAL_PORT_NUM=4 +CONFIG_ESP_CONSOLE_ROM_SERIAL_PORT_NUM=-1 CONFIG_ESP_INT_WDT=y CONFIG_ESP_INT_WDT_TIMEOUT_MS=300 CONFIG_ESP_INT_WDT_CHECK_CPU1=y @@ -2102,8 +2102,8 @@ CONFIG_SYSTEM_EVENT_TASK_STACK_SIZE=2304 CONFIG_MAIN_TASK_STACK_SIZE=3584 # CONFIG_CONSOLE_UART_DEFAULT is not set # CONFIG_CONSOLE_UART_CUSTOM is not set -# CONFIG_CONSOLE_UART_NONE is not set -# CONFIG_ESP_CONSOLE_UART_NONE is not set +CONFIG_CONSOLE_UART_NONE=y +CONFIG_ESP_CONSOLE_UART_NONE=y CONFIG_CONSOLE_UART_NUM=-1 CONFIG_INT_WDT=y CONFIG_INT_WDT_TIMEOUT_MS=300 diff --git a/sdkconfig.old b/sdkconfig.old index 20245fe..6e16b6b 100644 --- a/sdkconfig.old +++ b/sdkconfig.old @@ -1122,13 +1122,13 @@ CONFIG_ESP_MAIN_TASK_AFFINITY=0x0 CONFIG_ESP_MINIMAL_SHARED_STACK_SIZE=2048 # CONFIG_ESP_CONSOLE_UART_DEFAULT is not set # CONFIG_ESP_CONSOLE_USB_CDC is not set -# CONFIG_ESP_CONSOLE_USB_SERIAL_JTAG is not set +CONFIG_ESP_CONSOLE_USB_SERIAL_JTAG=y # CONFIG_ESP_CONSOLE_UART_CUSTOM is not set -CONFIG_ESP_CONSOLE_NONE=y +# CONFIG_ESP_CONSOLE_NONE is not set CONFIG_ESP_CONSOLE_SECONDARY_NONE=y -# CONFIG_ESP_CONSOLE_SECONDARY_USB_SERIAL_JTAG is not set +CONFIG_ESP_CONSOLE_USB_SERIAL_JTAG_ENABLED=y CONFIG_ESP_CONSOLE_UART_NUM=-1 -CONFIG_ESP_CONSOLE_ROM_SERIAL_PORT_NUM=-1 +CONFIG_ESP_CONSOLE_ROM_SERIAL_PORT_NUM=4 CONFIG_ESP_INT_WDT=y CONFIG_ESP_INT_WDT_TIMEOUT_MS=300 CONFIG_ESP_INT_WDT_CHECK_CPU1=y @@ -1395,20 +1395,16 @@ CONFIG_HEAP_TRACING_OFF=y # # Log output # -CONFIG_LOG_DEFAULT_LEVEL_NONE=y +# CONFIG_LOG_DEFAULT_LEVEL_NONE is not set # CONFIG_LOG_DEFAULT_LEVEL_ERROR is not set # CONFIG_LOG_DEFAULT_LEVEL_WARN is not set # CONFIG_LOG_DEFAULT_LEVEL_INFO is not set -# CONFIG_LOG_DEFAULT_LEVEL_DEBUG is not set +CONFIG_LOG_DEFAULT_LEVEL_DEBUG=y # CONFIG_LOG_DEFAULT_LEVEL_VERBOSE is not set -CONFIG_LOG_DEFAULT_LEVEL=0 +CONFIG_LOG_DEFAULT_LEVEL=4 CONFIG_LOG_MAXIMUM_EQUALS_DEFAULT=y -# CONFIG_LOG_MAXIMUM_LEVEL_ERROR is not set -# CONFIG_LOG_MAXIMUM_LEVEL_WARN is not set -# CONFIG_LOG_MAXIMUM_LEVEL_INFO is not set -# CONFIG_LOG_MAXIMUM_LEVEL_DEBUG is not set # CONFIG_LOG_MAXIMUM_LEVEL_VERBOSE is not set -CONFIG_LOG_MAXIMUM_LEVEL=0 +CONFIG_LOG_MAXIMUM_LEVEL=4 # CONFIG_LOG_MASTER_LEVEL is not set CONFIG_LOG_COLORS=y CONFIG_LOG_TIMESTAMP_SOURCE_RTOS=y @@ -2106,8 +2102,8 @@ CONFIG_SYSTEM_EVENT_TASK_STACK_SIZE=2304 CONFIG_MAIN_TASK_STACK_SIZE=3584 # CONFIG_CONSOLE_UART_DEFAULT is not set # CONFIG_CONSOLE_UART_CUSTOM is not set -CONFIG_CONSOLE_UART_NONE=y -CONFIG_ESP_CONSOLE_UART_NONE=y +# CONFIG_CONSOLE_UART_NONE is not set +# CONFIG_ESP_CONSOLE_UART_NONE is not set CONFIG_CONSOLE_UART_NUM=-1 CONFIG_INT_WDT=y CONFIG_INT_WDT_TIMEOUT_MS=300