From ff182d48e7da64434911c1651cc6b6aadf21e996 Mon Sep 17 00:00:00 2001 From: Marcus Date: Thu, 7 Apr 2022 06:49:32 +0200 Subject: [PATCH 1/2] Redirect ESP_LOG macro output to CPX and IO1 --- main/aideck_esp_main.c | 14 ++++++++---- main/wifi.c | 6 ++--- sdkconfig | 52 +++++++++++++++++++++++++++++++++--------- 3 files changed, 54 insertions(+), 18 deletions(-) diff --git a/main/aideck_esp_main.c b/main/aideck_esp_main.c index 0ead8f9..11345a8 100644 --- a/main/aideck_esp_main.c +++ b/main/aideck_esp_main.c @@ -109,9 +109,14 @@ // printf("Done in %f ms, %f pk/s, %f B/s\n", runtime * 1000, pk_per_seconds, pk_per_seconds * ESP_TRANSPORT_MTU); // } -int my_vprintf(const char * fmt, va_list ap) { - int len = vprintf("Hello: ", ap); - len += vprintf(fmt, ap); +static esp_routable_packet_t txp; +int cpx_and_uart_vprintf(const char * fmt, va_list ap) { + int len = vprintf(fmt, ap); + + cpxInitRoute(CPX_T_ESP32, CPX_T_STM32, CPX_F_CONSOLE, &txp.route); + txp.dataLength = vsprintf((char*)txp.data, fmt, ap) + 1; + espAppSendToRouterBlocking(&txp); + return len; } @@ -132,7 +137,6 @@ void app_main(void) esp_log_level_set("COM", ESP_LOG_INFO); esp_log_level_set("TEST", ESP_LOG_INFO); esp_log_level_set("WIFI", ESP_LOG_INFO); - //esp_log_set_vprintf(my_vprintf); ESP_ERROR_CHECK(nvs_flash_init()); ESP_ERROR_CHECK(esp_event_loop_create_default()); @@ -172,6 +176,8 @@ void app_main(void) wifi_init(); router_init(); + esp_log_set_vprintf(cpx_and_uart_vprintf); + system_init(); while(1) { diff --git a/main/wifi.c b/main/wifi.c index fc81f5c..5f2c732 100644 --- a/main/wifi.c +++ b/main/wifi.c @@ -427,9 +427,9 @@ void wifi_init() { startUpEventGroup = xEventGroupCreate(); xEventGroupClearBits(startUpEventGroup, START_UP_MAIN_TASK | START_UP_RX_TASK | START_UP_TX_TASK | START_UP_CTRL_TASK); - xTaskCreate(wifi_task, "WiFi TASK", 5000, NULL, 1, NULL); - xTaskCreate(wifi_sending_task, "WiFi TX", 5000, NULL, 1, NULL); - xTaskCreate(wifi_receiving_task, "WiFi RX", 5000, NULL, 1, NULL); + xTaskCreate(wifi_task, "WiFi TASK", 6000, NULL, 1, NULL); + xTaskCreate(wifi_sending_task, "WiFi TX", 6000, NULL, 1, NULL); + xTaskCreate(wifi_receiving_task, "WiFi RX", 6000, NULL, 1, NULL); ESP_LOGI(TAG, "Waiting for main, RX and TX tasks to start"); xEventGroupWaitBits(startUpEventGroup, START_UP_MAIN_TASK | START_UP_RX_TASK | START_UP_TX_TASK, diff --git a/sdkconfig b/sdkconfig index bfbea32..e61d5b4 100644 --- a/sdkconfig +++ b/sdkconfig @@ -2,7 +2,6 @@ # Automatically generated file. DO NOT EDIT. # Espressif IoT Development Framework (ESP-IDF) Project Configuration # -CONFIG_IDF_CMAKE=y CONFIG_IDF_TARGET_ARCH_XTENSA=y CONFIG_IDF_TARGET="esp32" CONFIG_IDF_TARGET_ESP32=y @@ -12,6 +11,8 @@ CONFIG_IDF_FIRMWARE_CHIP_ID=0x0000 # SDK tool configuration # CONFIG_SDK_TOOLPREFIX="xtensa-esp32-elf-" +CONFIG_SDK_PYTHON="python" +CONFIG_SDK_MAKE_WARN_UNDEFINED_VARIABLES=y # CONFIG_SDK_TOOLCHAIN_SUPPORTS_TIME_WIDE_64_BITS is not set # end of SDK tool configuration @@ -76,7 +77,15 @@ CONFIG_BOOTLOADER_RESERVE_RTC_SIZE=0 # # Serial flasher config # +CONFIG_ESPTOOLPY_PORT="/dev/ttyUSB0" +CONFIG_ESPTOOLPY_BAUD_115200B=y +# CONFIG_ESPTOOLPY_BAUD_230400B is not set +# CONFIG_ESPTOOLPY_BAUD_921600B is not set +# CONFIG_ESPTOOLPY_BAUD_2MB is not set +# CONFIG_ESPTOOLPY_BAUD_OTHER is not set CONFIG_ESPTOOLPY_BAUD_OTHER_VAL=115200 +CONFIG_ESPTOOLPY_BAUD=115200 +CONFIG_ESPTOOLPY_COMPRESSED=y # CONFIG_ESPTOOLPY_NO_STUB is not set # CONFIG_ESPTOOLPY_FLASHMODE_QIO is not set # CONFIG_ESPTOOLPY_FLASHMODE_QOUT is not set @@ -333,6 +342,30 @@ CONFIG_ESP32_XTAL_FREQ=40 CONFIG_ESP32_DPORT_DIS_INTERRUPT_LVL=5 # end of ESP32-specific +CONFIG_ESP32C3_DEBUG_OCDAWARE=y +CONFIG_ESP32C3_BROWNOUT_DET=y +CONFIG_ESP32C3_LIGHTSLEEP_GPIO_RESET_WORKAROUND=y + +# +# Cache config +# +# end of Cache config + +CONFIG_ESP32S2_TRACEMEM_RESERVE_DRAM=0x0 +CONFIG_ESP32S2_ULP_COPROC_RESERVE_MEM=0 +CONFIG_ESP32S2_DEBUG_OCDAWARE=y +CONFIG_ESP32S2_BROWNOUT_DET=y + +# +# Cache config +# +# end of Cache config + +CONFIG_ESP32S3_TRACEMEM_RESERVE_DRAM=0x0 +CONFIG_ESP32S3_ULP_COPROC_RESERVE_MEM=0 +CONFIG_ESP32S3_DEBUG_OCDAWARE=y +CONFIG_ESP32S3_BROWNOUT_DET=y + # # ADC-Calibration # @@ -346,8 +379,8 @@ CONFIG_ADC_CAL_LUT_ENABLE=y # CONFIG_ESP_ERR_TO_NAME_LOOKUP=y CONFIG_ESP_SYSTEM_EVENT_QUEUE_SIZE=32 -CONFIG_ESP_SYSTEM_EVENT_TASK_STACK_SIZE=5000 -CONFIG_ESP_MAIN_TASK_STACK_SIZE=5000 +CONFIG_ESP_SYSTEM_EVENT_TASK_STACK_SIZE=6000 +CONFIG_ESP_MAIN_TASK_STACK_SIZE=6000 CONFIG_ESP_IPC_TASK_STACK_SIZE=1024 CONFIG_ESP_IPC_USES_CALLERS_PRIORITY=y CONFIG_ESP_MINIMAL_SHARED_STACK_SIZE=2048 @@ -665,7 +698,7 @@ CONFIG_HEAP_TRACING_OFF=y CONFIG_LOG_DEFAULT_LEVEL_DEBUG=y # CONFIG_LOG_DEFAULT_LEVEL_VERBOSE is not set CONFIG_LOG_DEFAULT_LEVEL=4 -CONFIG_LOG_COLORS=y +# CONFIG_LOG_COLORS is not set CONFIG_LOG_TIMESTAMP_SOURCE_RTOS=y # CONFIG_LOG_TIMESTAMP_SOURCE_SYSTEM is not set # end of Log output @@ -1064,11 +1097,6 @@ CONFIG_WS_BUFFER_SIZE=1024 # end of Websocket # end of TCP Transport -# -# TinyUSB -# -# end of TinyUSB - # # Unity unit testing library # @@ -1132,6 +1160,8 @@ CONFIG_WPA_MBEDTLS_CRYPTO=y # Deprecated options for backward compatibility CONFIG_TOOLPREFIX="xtensa-esp32-elf-" +CONFIG_PYTHON="python" +CONFIG_MAKE_WARN_UNDEFINED_VARIABLES=y CONFIG_LOG_BOOTLOADER_LEVEL_NONE=y # CONFIG_LOG_BOOTLOADER_LEVEL_ERROR is not set # CONFIG_LOG_BOOTLOADER_LEVEL_WARN is not set @@ -1200,8 +1230,8 @@ CONFIG_ESP32_RTC_CLOCK_SOURCE_INTERNAL_RC=y # CONFIG_NO_BLOBS is not set # CONFIG_COMPATIBLE_PRE_V2_1_BOOTLOADERS is not set CONFIG_SYSTEM_EVENT_QUEUE_SIZE=32 -CONFIG_SYSTEM_EVENT_TASK_STACK_SIZE=5000 -CONFIG_MAIN_TASK_STACK_SIZE=5000 +CONFIG_SYSTEM_EVENT_TASK_STACK_SIZE=6000 +CONFIG_MAIN_TASK_STACK_SIZE=6000 CONFIG_IPC_TASK_STACK_SIZE=1024 # CONFIG_CONSOLE_UART_DEFAULT is not set CONFIG_CONSOLE_UART_CUSTOM=y From 21f5dbb01d6a4875a7d1cc920aec09c066ec0f43 Mon Sep 17 00:00:00 2001 From: Marcus Date: Thu, 7 Apr 2022 06:57:13 +0200 Subject: [PATCH 2/2] Removed extra memory from debuggin --- main/wifi.c | 6 +++--- sdkconfig | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/main/wifi.c b/main/wifi.c index 5f2c732..fc81f5c 100644 --- a/main/wifi.c +++ b/main/wifi.c @@ -427,9 +427,9 @@ void wifi_init() { startUpEventGroup = xEventGroupCreate(); xEventGroupClearBits(startUpEventGroup, START_UP_MAIN_TASK | START_UP_RX_TASK | START_UP_TX_TASK | START_UP_CTRL_TASK); - xTaskCreate(wifi_task, "WiFi TASK", 6000, NULL, 1, NULL); - xTaskCreate(wifi_sending_task, "WiFi TX", 6000, NULL, 1, NULL); - xTaskCreate(wifi_receiving_task, "WiFi RX", 6000, NULL, 1, NULL); + xTaskCreate(wifi_task, "WiFi TASK", 5000, NULL, 1, NULL); + xTaskCreate(wifi_sending_task, "WiFi TX", 5000, NULL, 1, NULL); + xTaskCreate(wifi_receiving_task, "WiFi RX", 5000, NULL, 1, NULL); ESP_LOGI(TAG, "Waiting for main, RX and TX tasks to start"); xEventGroupWaitBits(startUpEventGroup, START_UP_MAIN_TASK | START_UP_RX_TASK | START_UP_TX_TASK, diff --git a/sdkconfig b/sdkconfig index e61d5b4..a271465 100644 --- a/sdkconfig +++ b/sdkconfig @@ -379,8 +379,8 @@ CONFIG_ADC_CAL_LUT_ENABLE=y # CONFIG_ESP_ERR_TO_NAME_LOOKUP=y CONFIG_ESP_SYSTEM_EVENT_QUEUE_SIZE=32 -CONFIG_ESP_SYSTEM_EVENT_TASK_STACK_SIZE=6000 -CONFIG_ESP_MAIN_TASK_STACK_SIZE=6000 +CONFIG_ESP_SYSTEM_EVENT_TASK_STACK_SIZE=5000 +CONFIG_ESP_MAIN_TASK_STACK_SIZE=5000 CONFIG_ESP_IPC_TASK_STACK_SIZE=1024 CONFIG_ESP_IPC_USES_CALLERS_PRIORITY=y CONFIG_ESP_MINIMAL_SHARED_STACK_SIZE=2048 @@ -1230,8 +1230,8 @@ CONFIG_ESP32_RTC_CLOCK_SOURCE_INTERNAL_RC=y # CONFIG_NO_BLOBS is not set # CONFIG_COMPATIBLE_PRE_V2_1_BOOTLOADERS is not set CONFIG_SYSTEM_EVENT_QUEUE_SIZE=32 -CONFIG_SYSTEM_EVENT_TASK_STACK_SIZE=6000 -CONFIG_MAIN_TASK_STACK_SIZE=6000 +CONFIG_SYSTEM_EVENT_TASK_STACK_SIZE=5000 +CONFIG_MAIN_TASK_STACK_SIZE=5000 CONFIG_IPC_TASK_STACK_SIZE=1024 # CONFIG_CONSOLE_UART_DEFAULT is not set CONFIG_CONSOLE_UART_CUSTOM=y