Skip to content

Commit ff182d4

Browse files
committed
Redirect ESP_LOG macro output to CPX and IO1
1 parent 59d4a29 commit ff182d4

File tree

3 files changed

+54
-18
lines changed

3 files changed

+54
-18
lines changed

main/aideck_esp_main.c

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -109,9 +109,14 @@
109109
// printf("Done in %f ms, %f pk/s, %f B/s\n", runtime * 1000, pk_per_seconds, pk_per_seconds * ESP_TRANSPORT_MTU);
110110
// }
111111

112-
int my_vprintf(const char * fmt, va_list ap) {
113-
int len = vprintf("Hello: ", ap);
114-
len += vprintf(fmt, ap);
112+
static esp_routable_packet_t txp;
113+
int cpx_and_uart_vprintf(const char * fmt, va_list ap) {
114+
int len = vprintf(fmt, ap);
115+
116+
cpxInitRoute(CPX_T_ESP32, CPX_T_STM32, CPX_F_CONSOLE, &txp.route);
117+
txp.dataLength = vsprintf((char*)txp.data, fmt, ap) + 1;
118+
espAppSendToRouterBlocking(&txp);
119+
115120
return len;
116121
}
117122

@@ -132,7 +137,6 @@ void app_main(void)
132137
esp_log_level_set("COM", ESP_LOG_INFO);
133138
esp_log_level_set("TEST", ESP_LOG_INFO);
134139
esp_log_level_set("WIFI", ESP_LOG_INFO);
135-
//esp_log_set_vprintf(my_vprintf);
136140

137141
ESP_ERROR_CHECK(nvs_flash_init());
138142
ESP_ERROR_CHECK(esp_event_loop_create_default());
@@ -172,6 +176,8 @@ void app_main(void)
172176
wifi_init();
173177
router_init();
174178

179+
esp_log_set_vprintf(cpx_and_uart_vprintf);
180+
175181
system_init();
176182

177183
while(1) {

main/wifi.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -427,9 +427,9 @@ void wifi_init() {
427427

428428
startUpEventGroup = xEventGroupCreate();
429429
xEventGroupClearBits(startUpEventGroup, START_UP_MAIN_TASK | START_UP_RX_TASK | START_UP_TX_TASK | START_UP_CTRL_TASK);
430-
xTaskCreate(wifi_task, "WiFi TASK", 5000, NULL, 1, NULL);
431-
xTaskCreate(wifi_sending_task, "WiFi TX", 5000, NULL, 1, NULL);
432-
xTaskCreate(wifi_receiving_task, "WiFi RX", 5000, NULL, 1, NULL);
430+
xTaskCreate(wifi_task, "WiFi TASK", 6000, NULL, 1, NULL);
431+
xTaskCreate(wifi_sending_task, "WiFi TX", 6000, NULL, 1, NULL);
432+
xTaskCreate(wifi_receiving_task, "WiFi RX", 6000, NULL, 1, NULL);
433433
ESP_LOGI(TAG, "Waiting for main, RX and TX tasks to start");
434434
xEventGroupWaitBits(startUpEventGroup,
435435
START_UP_MAIN_TASK | START_UP_RX_TASK | START_UP_TX_TASK,

sdkconfig

Lines changed: 41 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
# Automatically generated file. DO NOT EDIT.
33
# Espressif IoT Development Framework (ESP-IDF) Project Configuration
44
#
5-
CONFIG_IDF_CMAKE=y
65
CONFIG_IDF_TARGET_ARCH_XTENSA=y
76
CONFIG_IDF_TARGET="esp32"
87
CONFIG_IDF_TARGET_ESP32=y
@@ -12,6 +11,8 @@ CONFIG_IDF_FIRMWARE_CHIP_ID=0x0000
1211
# SDK tool configuration
1312
#
1413
CONFIG_SDK_TOOLPREFIX="xtensa-esp32-elf-"
14+
CONFIG_SDK_PYTHON="python"
15+
CONFIG_SDK_MAKE_WARN_UNDEFINED_VARIABLES=y
1516
# CONFIG_SDK_TOOLCHAIN_SUPPORTS_TIME_WIDE_64_BITS is not set
1617
# end of SDK tool configuration
1718

@@ -76,7 +77,15 @@ CONFIG_BOOTLOADER_RESERVE_RTC_SIZE=0
7677
#
7778
# Serial flasher config
7879
#
80+
CONFIG_ESPTOOLPY_PORT="/dev/ttyUSB0"
81+
CONFIG_ESPTOOLPY_BAUD_115200B=y
82+
# CONFIG_ESPTOOLPY_BAUD_230400B is not set
83+
# CONFIG_ESPTOOLPY_BAUD_921600B is not set
84+
# CONFIG_ESPTOOLPY_BAUD_2MB is not set
85+
# CONFIG_ESPTOOLPY_BAUD_OTHER is not set
7986
CONFIG_ESPTOOLPY_BAUD_OTHER_VAL=115200
87+
CONFIG_ESPTOOLPY_BAUD=115200
88+
CONFIG_ESPTOOLPY_COMPRESSED=y
8089
# CONFIG_ESPTOOLPY_NO_STUB is not set
8190
# CONFIG_ESPTOOLPY_FLASHMODE_QIO is not set
8291
# CONFIG_ESPTOOLPY_FLASHMODE_QOUT is not set
@@ -333,6 +342,30 @@ CONFIG_ESP32_XTAL_FREQ=40
333342
CONFIG_ESP32_DPORT_DIS_INTERRUPT_LVL=5
334343
# end of ESP32-specific
335344

345+
CONFIG_ESP32C3_DEBUG_OCDAWARE=y
346+
CONFIG_ESP32C3_BROWNOUT_DET=y
347+
CONFIG_ESP32C3_LIGHTSLEEP_GPIO_RESET_WORKAROUND=y
348+
349+
#
350+
# Cache config
351+
#
352+
# end of Cache config
353+
354+
CONFIG_ESP32S2_TRACEMEM_RESERVE_DRAM=0x0
355+
CONFIG_ESP32S2_ULP_COPROC_RESERVE_MEM=0
356+
CONFIG_ESP32S2_DEBUG_OCDAWARE=y
357+
CONFIG_ESP32S2_BROWNOUT_DET=y
358+
359+
#
360+
# Cache config
361+
#
362+
# end of Cache config
363+
364+
CONFIG_ESP32S3_TRACEMEM_RESERVE_DRAM=0x0
365+
CONFIG_ESP32S3_ULP_COPROC_RESERVE_MEM=0
366+
CONFIG_ESP32S3_DEBUG_OCDAWARE=y
367+
CONFIG_ESP32S3_BROWNOUT_DET=y
368+
336369
#
337370
# ADC-Calibration
338371
#
@@ -346,8 +379,8 @@ CONFIG_ADC_CAL_LUT_ENABLE=y
346379
#
347380
CONFIG_ESP_ERR_TO_NAME_LOOKUP=y
348381
CONFIG_ESP_SYSTEM_EVENT_QUEUE_SIZE=32
349-
CONFIG_ESP_SYSTEM_EVENT_TASK_STACK_SIZE=5000
350-
CONFIG_ESP_MAIN_TASK_STACK_SIZE=5000
382+
CONFIG_ESP_SYSTEM_EVENT_TASK_STACK_SIZE=6000
383+
CONFIG_ESP_MAIN_TASK_STACK_SIZE=6000
351384
CONFIG_ESP_IPC_TASK_STACK_SIZE=1024
352385
CONFIG_ESP_IPC_USES_CALLERS_PRIORITY=y
353386
CONFIG_ESP_MINIMAL_SHARED_STACK_SIZE=2048
@@ -665,7 +698,7 @@ CONFIG_HEAP_TRACING_OFF=y
665698
CONFIG_LOG_DEFAULT_LEVEL_DEBUG=y
666699
# CONFIG_LOG_DEFAULT_LEVEL_VERBOSE is not set
667700
CONFIG_LOG_DEFAULT_LEVEL=4
668-
CONFIG_LOG_COLORS=y
701+
# CONFIG_LOG_COLORS is not set
669702
CONFIG_LOG_TIMESTAMP_SOURCE_RTOS=y
670703
# CONFIG_LOG_TIMESTAMP_SOURCE_SYSTEM is not set
671704
# end of Log output
@@ -1064,11 +1097,6 @@ CONFIG_WS_BUFFER_SIZE=1024
10641097
# end of Websocket
10651098
# end of TCP Transport
10661099

1067-
#
1068-
# TinyUSB
1069-
#
1070-
# end of TinyUSB
1071-
10721100
#
10731101
# Unity unit testing library
10741102
#
@@ -1132,6 +1160,8 @@ CONFIG_WPA_MBEDTLS_CRYPTO=y
11321160

11331161
# Deprecated options for backward compatibility
11341162
CONFIG_TOOLPREFIX="xtensa-esp32-elf-"
1163+
CONFIG_PYTHON="python"
1164+
CONFIG_MAKE_WARN_UNDEFINED_VARIABLES=y
11351165
CONFIG_LOG_BOOTLOADER_LEVEL_NONE=y
11361166
# CONFIG_LOG_BOOTLOADER_LEVEL_ERROR is not set
11371167
# CONFIG_LOG_BOOTLOADER_LEVEL_WARN is not set
@@ -1200,8 +1230,8 @@ CONFIG_ESP32_RTC_CLOCK_SOURCE_INTERNAL_RC=y
12001230
# CONFIG_NO_BLOBS is not set
12011231
# CONFIG_COMPATIBLE_PRE_V2_1_BOOTLOADERS is not set
12021232
CONFIG_SYSTEM_EVENT_QUEUE_SIZE=32
1203-
CONFIG_SYSTEM_EVENT_TASK_STACK_SIZE=5000
1204-
CONFIG_MAIN_TASK_STACK_SIZE=5000
1233+
CONFIG_SYSTEM_EVENT_TASK_STACK_SIZE=6000
1234+
CONFIG_MAIN_TASK_STACK_SIZE=6000
12051235
CONFIG_IPC_TASK_STACK_SIZE=1024
12061236
# CONFIG_CONSOLE_UART_DEFAULT is not set
12071237
CONFIG_CONSOLE_UART_CUSTOM=y

0 commit comments

Comments
 (0)