From a1379f0a6bab6acd25540f7095f2f54cfd7daa6b Mon Sep 17 00:00:00 2001 From: aleks Date: Thu, 15 Jan 2026 13:06:06 +0100 Subject: [PATCH] fix(test_messages): fix vfs logging, fix test configs, enable custom key config --- .gitlab-ci.yml | 4 ++ .../mb_serial_master/main/serial_master.c | 8 +++ .../mb_serial_master/sdkconfig.ci.ascii | 3 +- .../serial/mb_serial_master/sdkconfig.ci.rtu | 3 +- .../mb_serial_master/sdkconfig.defaults | 2 + .../mb_serial_slave/main/serial_slave.c | 8 +++ .../serial/mb_serial_slave/sdkconfig.ci.ascii | 3 +- .../serial/mb_serial_slave/sdkconfig.ci.rtu | 3 +- .../serial/mb_serial_slave/sdkconfig.defaults | 2 + examples/tcp/mb_tcp_master/main/tcp_master.c | 8 +++ .../tcp/mb_tcp_master/sdkconfig.ci.ethernet | 3 +- examples/tcp/mb_tcp_master/sdkconfig.ci.wifi | 3 +- examples/tcp/mb_tcp_master/sdkconfig.defaults | 2 + examples/tcp/mb_tcp_slave/main/tcp_slave.c | 9 ++++ .../tcp/mb_tcp_slave/sdkconfig.ci.ethernet | 3 +- examples/tcp/mb_tcp_slave/sdkconfig.ci.wifi | 3 +- examples/tcp/mb_tcp_slave/sdkconfig.defaults | 3 +- test_apps/adapter_tests/sdkconfig.ci.serial | 2 + test_apps/adapter_tests/sdkconfig.ci.tcp | 2 + test_apps/adapter_tests/sdkconfig.defaults | 2 + .../modbus_serial_cpp_test/sdkconfig.defaults | 2 + test_apps/physical_tests/main/test_app_main.c | 8 +++ .../physical_tests/sdkconfig.ci.ethernet | 3 +- test_apps/physical_tests/sdkconfig.ci.serial | 3 +- test_apps/physical_tests/sdkconfig.ci.wifi | 3 +- test_apps/physical_tests/sdkconfig.defaults | 3 +- .../main/tcp_master_instances.c | 9 ++++ .../sdkconfig.ci.ethernet | 3 +- .../mb_tcp_master_instances/sdkconfig.ci.wifi | 3 +- .../sdkconfig.defaults | 3 +- .../main/tcp_slave_instances.c | 8 +++ .../sdkconfig.ci.ethernet | 3 +- .../mb_tcp_slave_instances/sdkconfig.ci.wifi | 3 +- .../mb_tcp_slave_instances/sdkconfig.defaults | 3 +- .../mb_controller_common/sdkconfig.ci.generic | 2 + .../mb_controller_mapping/sdkconfig.ci.serial | 2 + .../mb_controller_mapping/sdkconfig.default | 2 + .../mb_ext_types/sdkconfig.defaults | 2 + .../test_config_parser/sdkconfig.defaults | 2 + tools/setup_config_key.sh | 49 +++++++++++++++++++ 40 files changed, 173 insertions(+), 19 deletions(-) create mode 100755 tools/setup_config_key.sh diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1ec8a4c..76515de 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -82,6 +82,10 @@ after_script: - echo "Component manager version ${COMPOTE_VER}" - PIP_VERS=$(python -m pip freeze) - echo "PIP component versions ${PIP_VERS}" + # Allows to debug jobs overriding the ESP_MODBUS_CONFIG_KEY to ESP_MODBUS_CONFIG_VALUE + # in all registered application configs that match the pattern ESP_MODBUS_CONFIG_PATTERN + - echo "Setup job with parameters ${ESP_MODBUS_CONFIG_KEY}, ${ESP_MODBUS_CONFIG_VALUE}, ${ESP_MODBUS_CONFIG_PATTERN}" + - ${TEST_DIR}/tools/setup_config_key.sh "${ESP_MODBUS_CONFIG_KEY}" "${ESP_MODBUS_CONFIG_VALUE}" "${ESP_MODBUS_CONFIG_PATTERN}" # Note: this script builds the folder against all targets and then deletes # all other artifacts except the esp32 to decrease the size of artifacs (may cause failures) diff --git a/examples/serial/mb_serial_master/main/serial_master.c b/examples/serial/mb_serial_master/main/serial_master.c index 78700ad..9685b91 100644 --- a/examples/serial/mb_serial_master/main/serial_master.c +++ b/examples/serial/mb_serial_master/main/serial_master.c @@ -638,6 +638,14 @@ static esp_err_t master_init(void) void app_main(void) { +#if !CONFIG_LOG_DEFAULT_LEVEL_DEBUG + esp_log_level_set("mb_object.master",ESP_LOG_DEBUG); + esp_log_level_set("mbc_serial.master",ESP_LOG_DEBUG); +#else + // Disable VFS logs as they are too verbose + esp_log_level_set("vfs_calls", ESP_LOG_NONE); +#endif + // Initialization of device peripheral and objects ESP_ERROR_CHECK(master_init()); vTaskDelay(10); diff --git a/examples/serial/mb_serial_master/sdkconfig.ci.ascii b/examples/serial/mb_serial_master/sdkconfig.ci.ascii index ca51d1b..cb7845c 100644 --- a/examples/serial/mb_serial_master/sdkconfig.ci.ascii +++ b/examples/serial/mb_serial_master/sdkconfig.ci.ascii @@ -7,4 +7,5 @@ CONFIG_FMB_TIMER_USE_ISR_DISPATCH_METHOD=y CONFIG_FMB_EXT_TYPE_SUPPORT=y CONFIG_HEAP_POISONING_COMPREHENSIVE=y CONFIG_HEAP_TRACING_OFF=y -CONFIG_LOG_DEFAULT_LEVEL_DEBUG=y # intentionally keep it here to change when needed! +CONFIG_LOG_DEFAULT_LEVEL_DEBUG=n +CONFIG_LOG_MAXIMUM_LEVEL_DEBUG=y diff --git a/examples/serial/mb_serial_master/sdkconfig.ci.rtu b/examples/serial/mb_serial_master/sdkconfig.ci.rtu index 18970a6..0fed5b9 100644 --- a/examples/serial/mb_serial_master/sdkconfig.ci.rtu +++ b/examples/serial/mb_serial_master/sdkconfig.ci.rtu @@ -7,4 +7,5 @@ CONFIG_FMB_TIMER_USE_ISR_DISPATCH_METHOD=y CONFIG_FMB_EXT_TYPE_SUPPORT=y CONFIG_HEAP_POISONING_COMPREHENSIVE=y CONFIG_HEAP_TRACING_OFF=y -CONFIG_LOG_DEFAULT_LEVEL_DEBUG=y # intentionally keep it here to change when needed! +CONFIG_LOG_DEFAULT_LEVEL_DEBUG=n +CONFIG_LOG_MAXIMUM_LEVEL_DEBUG=y diff --git a/examples/serial/mb_serial_master/sdkconfig.defaults b/examples/serial/mb_serial_master/sdkconfig.defaults index 80f3665..0fed5b9 100644 --- a/examples/serial/mb_serial_master/sdkconfig.defaults +++ b/examples/serial/mb_serial_master/sdkconfig.defaults @@ -7,3 +7,5 @@ CONFIG_FMB_TIMER_USE_ISR_DISPATCH_METHOD=y CONFIG_FMB_EXT_TYPE_SUPPORT=y CONFIG_HEAP_POISONING_COMPREHENSIVE=y CONFIG_HEAP_TRACING_OFF=y +CONFIG_LOG_DEFAULT_LEVEL_DEBUG=n +CONFIG_LOG_MAXIMUM_LEVEL_DEBUG=y diff --git a/examples/serial/mb_serial_slave/main/serial_slave.c b/examples/serial/mb_serial_slave/main/serial_slave.c index 3d56f9c..228a98f 100644 --- a/examples/serial/mb_serial_slave/main/serial_slave.c +++ b/examples/serial/mb_serial_slave/main/serial_slave.c @@ -175,6 +175,14 @@ void app_main(void) // Set UART log level esp_log_level_set(TAG, ESP_LOG_INFO); +#if !CONFIG_LOG_DEFAULT_LEVEL_DEBUG + esp_log_level_set("mbc_serial.slave",ESP_LOG_DEBUG); + esp_log_level_set("mb_object.slave",ESP_LOG_DEBUG); +#else + // Disable VFS logs as they are too verbose + esp_log_level_set("vfs_calls", ESP_LOG_NONE); +#endif + // Initialize Modbus controller mb_communication_info_t comm_config = { .ser_opts.port = MB_PORT_NUM, diff --git a/examples/serial/mb_serial_slave/sdkconfig.ci.ascii b/examples/serial/mb_serial_slave/sdkconfig.ci.ascii index a81dcc6..114b366 100644 --- a/examples/serial/mb_serial_slave/sdkconfig.ci.ascii +++ b/examples/serial/mb_serial_slave/sdkconfig.ci.ascii @@ -6,4 +6,5 @@ CONFIG_FMB_TIMER_USE_ISR_DISPATCH_METHOD=y CONFIG_FMB_EXT_TYPE_SUPPORT=y CONFIG_HEAP_POISONING_COMPREHENSIVE=y CONFIG_HEAP_TRACING_OFF=y -CONFIG_LOG_DEFAULT_LEVEL_DEBUG=y # intentionally keep it here to change when needed! +CONFIG_LOG_DEFAULT_LEVEL_DEBUG=n +CONFIG_LOG_MAXIMUM_LEVEL_DEBUG=y diff --git a/examples/serial/mb_serial_slave/sdkconfig.ci.rtu b/examples/serial/mb_serial_slave/sdkconfig.ci.rtu index bfd1e6c..ed6f25a 100644 --- a/examples/serial/mb_serial_slave/sdkconfig.ci.rtu +++ b/examples/serial/mb_serial_slave/sdkconfig.ci.rtu @@ -6,4 +6,5 @@ CONFIG_FMB_TIMER_USE_ISR_DISPATCH_METHOD=y CONFIG_FMB_EXT_TYPE_SUPPORT=y CONFIG_HEAP_POISONING_COMPREHENSIVE=y CONFIG_HEAP_TRACING_OFF=y -CONFIG_LOG_DEFAULT_LEVEL_DEBUG=y # intentionally keep it here to change when needed! +CONFIG_LOG_DEFAULT_LEVEL_DEBUG=n +CONFIG_LOG_MAXIMUM_LEVEL_DEBUG=y diff --git a/examples/serial/mb_serial_slave/sdkconfig.defaults b/examples/serial/mb_serial_slave/sdkconfig.defaults index 57eb523..316fb9b 100644 --- a/examples/serial/mb_serial_slave/sdkconfig.defaults +++ b/examples/serial/mb_serial_slave/sdkconfig.defaults @@ -9,3 +9,5 @@ CONFIG_FMB_TIMER_USE_ISR_DISPATCH_METHOD=y CONFIG_FMB_EXT_TYPE_SUPPORT=y CONFIG_HEAP_POISONING_COMPREHENSIVE=y CONFIG_HEAP_TRACING_OFF=y +CONFIG_LOG_DEFAULT_LEVEL_DEBUG=n +CONFIG_LOG_MAXIMUM_LEVEL_DEBUG=y diff --git a/examples/tcp/mb_tcp_master/main/tcp_master.c b/examples/tcp/mb_tcp_master/main/tcp_master.c index 4783289..f7836ac 100644 --- a/examples/tcp/mb_tcp_master/main/tcp_master.c +++ b/examples/tcp/mb_tcp_master/main/tcp_master.c @@ -819,6 +819,14 @@ static esp_err_t master_destroy(void) void app_main(void) { +#if !CONFIG_LOG_DEFAULT_LEVEL_DEBUG + esp_log_level_set("mbc_tcp.master",ESP_LOG_DEBUG); + esp_log_level_set("mb_object.master",ESP_LOG_DEBUG); +#else + // Disable VFS logs as they are too verbose + esp_log_level_set("vfs_calls", ESP_LOG_NONE); +#endif + mb_tcp_addr_type_t ip_addr_type; #if !CONFIG_EXAMPLE_CONNECT_IPV6 ip_addr_type = MB_IPV4; diff --git a/examples/tcp/mb_tcp_master/sdkconfig.ci.ethernet b/examples/tcp/mb_tcp_master/sdkconfig.ci.ethernet index 2dae385..cfd0dcb 100644 --- a/examples/tcp/mb_tcp_master/sdkconfig.ci.ethernet +++ b/examples/tcp/mb_tcp_master/sdkconfig.ci.ethernet @@ -13,7 +13,6 @@ CONFIG_FMB_MASTER_DELAY_MS_CONVERT=300 CONFIG_FMB_TCP_UID_ENABLED=y CONFIG_FMB_TIMER_USE_ISR_DISPATCH_METHOD=y CONFIG_MB_SLAVE_IP_FROM_STDIN=y -CONFIG_LOG_DEFAULT_LEVEL_DEBUG=y CONFIG_FMB_EXT_TYPE_SUPPORT=y CONFIG_EXAMPLE_CONNECT_IPV6=n @@ -33,3 +32,5 @@ CONFIG_ETH_USE_SPI_ETHERNET=n CONFIG_HEAP_POISONING_COMPREHENSIVE=y CONFIG_HEAP_TRACING_OFF=y +CONFIG_LOG_DEFAULT_LEVEL_DEBUG=n +CONFIG_LOG_MAXIMUM_LEVEL_DEBUG=y diff --git a/examples/tcp/mb_tcp_master/sdkconfig.ci.wifi b/examples/tcp/mb_tcp_master/sdkconfig.ci.wifi index 60c98ab..65a5294 100644 --- a/examples/tcp/mb_tcp_master/sdkconfig.ci.wifi +++ b/examples/tcp/mb_tcp_master/sdkconfig.ci.wifi @@ -7,7 +7,6 @@ CONFIG_FMB_COMM_MODE_RTU_EN=n CONFIG_FMB_COMM_MODE_ASCII_EN=n CONFIG_FMB_MASTER_TIMEOUT_MS_RESPOND=3000 CONFIG_FMB_MASTER_DELAY_MS_CONVERT=300 -CONFIG_LOG_DEFAULT_LEVEL_DEBUG=y CONFIG_FMB_TCP_UID_ENABLED=y CONFIG_MB_SLAVE_IP_FROM_STDIN=y CONFIG_EXAMPLE_CONNECT_IPV6=n @@ -21,3 +20,5 @@ CONFIG_EXAMPLE_WIFI_PASSWORD="${CI_WIFI_PASSW}" CONFIG_HEAP_POISONING_COMPREHENSIVE=y CONFIG_HEAP_TRACING_OFF=y +CONFIG_LOG_DEFAULT_LEVEL_DEBUG=n +CONFIG_LOG_MAXIMUM_LEVEL_DEBUG=y diff --git a/examples/tcp/mb_tcp_master/sdkconfig.defaults b/examples/tcp/mb_tcp_master/sdkconfig.defaults index bb75d1b..d85c11c 100644 --- a/examples/tcp/mb_tcp_master/sdkconfig.defaults +++ b/examples/tcp/mb_tcp_master/sdkconfig.defaults @@ -19,3 +19,5 @@ CONFIG_EXAMPLE_CONNECT_ETHERNET=n CONFIG_EXAMPLE_CONNECT_WIFI=y CONFIG_EXAMPLE_WIFI_SSID="${CI_WIFI_SSID}" CONFIG_EXAMPLE_WIFI_PASSWORD="${CI_WIFI_PASSW}" +CONFIG_LOG_DEFAULT_LEVEL_DEBUG=n +CONFIG_LOG_MAXIMUM_LEVEL_DEBUG=y diff --git a/examples/tcp/mb_tcp_slave/main/tcp_slave.c b/examples/tcp/mb_tcp_slave/main/tcp_slave.c index f30d1be..1d93ccc 100644 --- a/examples/tcp/mb_tcp_slave/main/tcp_slave.c +++ b/examples/tcp/mb_tcp_slave/main/tcp_slave.c @@ -433,6 +433,15 @@ static esp_err_t slave_destroy(void) // by external Modbus master host. void app_main(void) { + +#if !CONFIG_LOG_DEFAULT_LEVEL_DEBUG + esp_log_level_set("mbc_tcp.slave",ESP_LOG_DEBUG); + esp_log_level_set("mb_object.slave",ESP_LOG_DEBUG); +#else + // Disable VFS logs as they are too verbose + esp_log_level_set("vfs_calls", ESP_LOG_NONE); +#endif + ESP_ERROR_CHECK(init_services()); // Set UART log level diff --git a/examples/tcp/mb_tcp_slave/sdkconfig.ci.ethernet b/examples/tcp/mb_tcp_slave/sdkconfig.ci.ethernet index bfcdd79..1110f53 100644 --- a/examples/tcp/mb_tcp_slave/sdkconfig.ci.ethernet +++ b/examples/tcp/mb_tcp_slave/sdkconfig.ci.ethernet @@ -14,7 +14,6 @@ CONFIG_FMB_EXT_TYPE_SUPPORT=y CONFIG_FMB_TCP_UID_ENABLED=y CONFIG_FMB_TIMER_USE_ISR_DISPATCH_METHOD=y CONFIG_MB_SLAVE_ADDR=1 -CONFIG_LOG_DEFAULT_LEVEL_DEBUG=y # intentionally keep it here to change when needed! CONFIG_EXAMPLE_CONNECT_IPV6=n CONFIG_EXAMPLE_CONNECT_WIFI=n CONFIG_EXAMPLE_CONNECT_ETHERNET=y @@ -32,3 +31,5 @@ CONFIG_ETH_USE_SPI_ETHERNET=n CONFIG_HEAP_POISONING_COMPREHENSIVE=y CONFIG_HEAP_TRACING_OFF=y +CONFIG_LOG_DEFAULT_LEVEL_DEBUG=n +CONFIG_LOG_MAXIMUM_LEVEL_DEBUG=y diff --git a/examples/tcp/mb_tcp_slave/sdkconfig.ci.wifi b/examples/tcp/mb_tcp_slave/sdkconfig.ci.wifi index 0704fbc..5c74c7b 100644 --- a/examples/tcp/mb_tcp_slave/sdkconfig.ci.wifi +++ b/examples/tcp/mb_tcp_slave/sdkconfig.ci.wifi @@ -8,7 +8,6 @@ CONFIG_FMB_COMM_MODE_ASCII_EN=n CONFIG_FMB_EXT_TYPE_SUPPORT=y CONFIG_FMB_MASTER_TIMEOUT_MS_RESPOND=3000 CONFIG_FMB_MASTER_DELAY_MS_CONVERT=300 -CONFIG_LOG_DEFAULT_LEVEL_DEBUG=y CONFIG_FMB_TCP_UID_ENABLED=y CONFIG_MB_SLAVE_ADDR=1 CONFIG_EXAMPLE_CONNECT_IPV6=n @@ -20,3 +19,5 @@ CONFIG_EXAMPLE_WIFI_PASSWORD="${CI_WIFI_PASSW}" CONFIG_HEAP_POISONING_COMPREHENSIVE=y CONFIG_HEAP_TRACING_OFF=y +CONFIG_LOG_DEFAULT_LEVEL_DEBUG=n +CONFIG_LOG_MAXIMUM_LEVEL_DEBUG=y diff --git a/examples/tcp/mb_tcp_slave/sdkconfig.defaults b/examples/tcp/mb_tcp_slave/sdkconfig.defaults index e5d5305..6c33141 100644 --- a/examples/tcp/mb_tcp_slave/sdkconfig.defaults +++ b/examples/tcp/mb_tcp_slave/sdkconfig.defaults @@ -12,10 +12,11 @@ CONFIG_FMB_MASTER_TIMEOUT_MS_RESPOND=2000 CONFIG_FMB_MASTER_DELAY_MS_CONVERT=300 CONFIG_FMB_TCP_UID_ENABLED=y CONFIG_MB_SLAVE_ADDR=1 -CONFIG_LOG_DEFAULT_LEVEL_DEBUG=y CONFIG_EXAMPLE_CONNECT_IPV6=n CONFIG_FMB_TIMER_USE_ISR_DISPATCH_METHOD=y CONFIG_EXAMPLE_WIFI_SSID="${CI_WIFI_SSID}" CONFIG_EXAMPLE_WIFI_PASSWORD="${CI_WIFI_PASSW}" CONFIG_EXAMPLE_CONNECT_ETHERNET=n CONFIG_EXAMPLE_CONNECT_WIFI=y +CONFIG_LOG_DEFAULT_LEVEL_DEBUG=n +CONFIG_LOG_MAXIMUM_LEVEL_DEBUG=y diff --git a/test_apps/adapter_tests/sdkconfig.ci.serial b/test_apps/adapter_tests/sdkconfig.ci.serial index 1291792..187544e 100644 --- a/test_apps/adapter_tests/sdkconfig.ci.serial +++ b/test_apps/adapter_tests/sdkconfig.ci.serial @@ -20,3 +20,5 @@ CONFIG_MB_TEST_MASTER_TASK_PRIO=4 CONFIG_MB_TEST_COMM_CYCLE_COUNTER=10 CONFIG_MB_TEST_LEAK_CRITICAL_LEVEL=256 CONFIG_MB_TEST_LEAK_WARN_LEVEL=256 +CONFIG_LOG_DEFAULT_LEVEL_DEBUG=n +CONFIG_LOG_MAXIMUM_LEVEL_DEBUG=y diff --git a/test_apps/adapter_tests/sdkconfig.ci.tcp b/test_apps/adapter_tests/sdkconfig.ci.tcp index 57932d9..22fe168 100644 --- a/test_apps/adapter_tests/sdkconfig.ci.tcp +++ b/test_apps/adapter_tests/sdkconfig.ci.tcp @@ -20,3 +20,5 @@ CONFIG_MB_TEST_MASTER_TASK_PRIO=4 CONFIG_MB_TEST_COMM_CYCLE_COUNTER=10 CONFIG_MB_TEST_LEAK_CRITICAL_LEVEL=256 CONFIG_MB_TEST_LEAK_WARN_LEVEL=256 +CONFIG_LOG_DEFAULT_LEVEL_DEBUG=n +CONFIG_LOG_MAXIMUM_LEVEL_DEBUG=y diff --git a/test_apps/adapter_tests/sdkconfig.defaults b/test_apps/adapter_tests/sdkconfig.defaults index 4bafbd1..9cbaa1c 100644 --- a/test_apps/adapter_tests/sdkconfig.defaults +++ b/test_apps/adapter_tests/sdkconfig.defaults @@ -19,3 +19,5 @@ CONFIG_MB_PORT_ADAPTER_EN=y CONFIG_MB_TEST_MASTER_TASK_PRIO=4 CONFIG_MB_TEST_SLAVE_TASK_PRIO=4 CONFIG_MB_TEST_COMM_CYCLE_COUNTER=10 +CONFIG_LOG_DEFAULT_LEVEL_DEBUG=n +CONFIG_LOG_MAXIMUM_LEVEL_DEBUG=y diff --git a/test_apps/cpp/modbus_serial_cpp_test/sdkconfig.defaults b/test_apps/cpp/modbus_serial_cpp_test/sdkconfig.defaults index eee55f2..1770e23 100644 --- a/test_apps/cpp/modbus_serial_cpp_test/sdkconfig.defaults +++ b/test_apps/cpp/modbus_serial_cpp_test/sdkconfig.defaults @@ -1,3 +1,5 @@ # General options for test CONFIG_HEAP_POISONING_COMPREHENSIVE=y CONFIG_HEAP_TRACING_OFF=y +CONFIG_LOG_DEFAULT_LEVEL_DEBUG=n +CONFIG_LOG_MAXIMUM_LEVEL_DEBUG=y diff --git a/test_apps/physical_tests/main/test_app_main.c b/test_apps/physical_tests/main/test_app_main.c index 25ee4ca..7150928 100644 --- a/test_apps/physical_tests/main/test_app_main.c +++ b/test_apps/physical_tests/main/test_app_main.c @@ -9,6 +9,14 @@ void app_main(void) { +#if !CONFIG_LOG_DEFAULT_LEVEL_DEBUG + esp_log_level_set("mbc_tcp.slave",ESP_LOG_DEBUG); + esp_log_level_set("mbc_serial.slave",ESP_LOG_DEBUG); + esp_log_level_set("mb_object.slave",ESP_LOG_DEBUG); +#else + // Disable VFS logs as they are too verbose + esp_log_level_set("vfs_calls", ESP_LOG_NONE); +#endif printf("Modbus RS485 multi-device test cases/n"); unity_run_menu(); } diff --git a/test_apps/physical_tests/sdkconfig.ci.ethernet b/test_apps/physical_tests/sdkconfig.ci.ethernet index 827a63a..e3705c2 100644 --- a/test_apps/physical_tests/sdkconfig.ci.ethernet +++ b/test_apps/physical_tests/sdkconfig.ci.ethernet @@ -30,4 +30,5 @@ CONFIG_ETH_USE_ESP32_EMAC=y CONFIG_ETH_USE_SPI_ETHERNET=n # Enable debug logging -CONFIG_LOG_DEFAULT_LEVEL_DEBUG=y +CONFIG_LOG_DEFAULT_LEVEL_DEBUG=n +CONFIG_LOG_MAXIMUM_LEVEL_DEBUG=y diff --git a/test_apps/physical_tests/sdkconfig.ci.serial b/test_apps/physical_tests/sdkconfig.ci.serial index c5220bb..db1d7fe 100644 --- a/test_apps/physical_tests/sdkconfig.ci.serial +++ b/test_apps/physical_tests/sdkconfig.ci.serial @@ -26,4 +26,5 @@ CONFIG_PARTITION_TABLE_SINGLE_APP_LARGE=y CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y # Enable debug logging -CONFIG_LOG_DEFAULT_LEVEL_DEBUG=y +CONFIG_LOG_DEFAULT_LEVEL_DEBUG=n +CONFIG_LOG_MAXIMUM_LEVEL_DEBUG=y diff --git a/test_apps/physical_tests/sdkconfig.ci.wifi b/test_apps/physical_tests/sdkconfig.ci.wifi index 2cd6de6..141bbd1 100644 --- a/test_apps/physical_tests/sdkconfig.ci.wifi +++ b/test_apps/physical_tests/sdkconfig.ci.wifi @@ -21,4 +21,5 @@ CONFIG_PARTITION_TABLE_SINGLE_APP_LARGE=y CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y # Enable debug logging -CONFIG_LOG_DEFAULT_LEVEL_DEBUG=y +CONFIG_LOG_DEFAULT_LEVEL_DEBUG=n +CONFIG_LOG_MAXIMUM_LEVEL_DEBUG=y diff --git a/test_apps/physical_tests/sdkconfig.defaults b/test_apps/physical_tests/sdkconfig.defaults index a0107e8..fee7151 100644 --- a/test_apps/physical_tests/sdkconfig.defaults +++ b/test_apps/physical_tests/sdkconfig.defaults @@ -24,4 +24,5 @@ CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y CONFIG_PARTITION_TABLE_SINGLE_APP_LARGE=y # Enable debug logging -CONFIG_LOG_DEFAULT_LEVEL_DEBUG=y +CONFIG_LOG_DEFAULT_LEVEL_DEBUG=n +CONFIG_LOG_MAXIMUM_LEVEL_DEBUG=y diff --git a/test_apps/tcp_instances_tests/mb_tcp_master_instances/main/tcp_master_instances.c b/test_apps/tcp_instances_tests/mb_tcp_master_instances/main/tcp_master_instances.c index cea2d76..5ef2403 100644 --- a/test_apps/tcp_instances_tests/mb_tcp_master_instances/main/tcp_master_instances.c +++ b/test_apps/tcp_instances_tests/mb_tcp_master_instances/main/tcp_master_instances.c @@ -667,7 +667,16 @@ TaskHandle_t master_tcp_create_instance(mb_communication_info_t *pconfig, uint32 void app_main(void) { +#if !CONFIG_LOG_DEFAULT_LEVEL_DEBUG + esp_log_level_set("mbc_tcp.master",ESP_LOG_DEBUG); + esp_log_level_set("mb_object.master",ESP_LOG_DEBUG); +#else + // Disable VFS logs as they are too verbose + esp_log_level_set("vfs_calls", ESP_LOG_NONE); +#endif + void *pnetif = NULL; + TEST_ASSERT_TRUE(test_tcp_services_init(&pnetif) == ESP_OK); TEST_ASSERT_NOT_NULL(pnetif); test_common_start(); diff --git a/test_apps/tcp_instances_tests/mb_tcp_master_instances/sdkconfig.ci.ethernet b/test_apps/tcp_instances_tests/mb_tcp_master_instances/sdkconfig.ci.ethernet index a8ea1dd..0842092 100644 --- a/test_apps/tcp_instances_tests/mb_tcp_master_instances/sdkconfig.ci.ethernet +++ b/test_apps/tcp_instances_tests/mb_tcp_master_instances/sdkconfig.ci.ethernet @@ -12,7 +12,6 @@ CONFIG_FMB_MASTER_TIMEOUT_MS_RESPOND=3000 CONFIG_FMB_MASTER_DELAY_MS_CONVERT=300 CONFIG_FMB_TCP_UID_ENABLED=n CONFIG_FMB_TIMER_USE_ISR_DISPATCH_METHOD=y -CONFIG_LOG_DEFAULT_LEVEL_DEBUG=y CONFIG_FMB_EXT_TYPE_SUPPORT=y CONFIG_EXAMPLE_CONNECT_IPV6=n @@ -29,3 +28,5 @@ CONFIG_EXAMPLE_ETHERNET_EMAC_TASK_STACK_SIZE=4096 CONFIG_ETH_ENABLED=y CONFIG_ETH_USE_ESP32_EMAC=y CONFIG_ETH_USE_SPI_ETHERNET=n +CONFIG_LOG_DEFAULT_LEVEL_DEBUG=n +CONFIG_LOG_MAXIMUM_LEVEL_DEBUG=y diff --git a/test_apps/tcp_instances_tests/mb_tcp_master_instances/sdkconfig.ci.wifi b/test_apps/tcp_instances_tests/mb_tcp_master_instances/sdkconfig.ci.wifi index 2cd6de6..141bbd1 100644 --- a/test_apps/tcp_instances_tests/mb_tcp_master_instances/sdkconfig.ci.wifi +++ b/test_apps/tcp_instances_tests/mb_tcp_master_instances/sdkconfig.ci.wifi @@ -21,4 +21,5 @@ CONFIG_PARTITION_TABLE_SINGLE_APP_LARGE=y CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y # Enable debug logging -CONFIG_LOG_DEFAULT_LEVEL_DEBUG=y +CONFIG_LOG_DEFAULT_LEVEL_DEBUG=n +CONFIG_LOG_MAXIMUM_LEVEL_DEBUG=y diff --git a/test_apps/tcp_instances_tests/mb_tcp_master_instances/sdkconfig.defaults b/test_apps/tcp_instances_tests/mb_tcp_master_instances/sdkconfig.defaults index 7fe960e..65af2a7 100644 --- a/test_apps/tcp_instances_tests/mb_tcp_master_instances/sdkconfig.defaults +++ b/test_apps/tcp_instances_tests/mb_tcp_master_instances/sdkconfig.defaults @@ -24,4 +24,5 @@ CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y CONFIG_PARTITION_TABLE_SINGLE_APP_LARGE=y # Enable debug logging -CONFIG_LOG_DEFAULT_LEVEL_DEBUG=y +CONFIG_LOG_DEFAULT_LEVEL_DEBUG=n +CONFIG_LOG_MAXIMUM_LEVEL_DEBUG=y diff --git a/test_apps/tcp_instances_tests/mb_tcp_slave_instances/main/tcp_slave_instances.c b/test_apps/tcp_instances_tests/mb_tcp_slave_instances/main/tcp_slave_instances.c index 7b30e37..60a619f 100644 --- a/test_apps/tcp_instances_tests/mb_tcp_slave_instances/main/tcp_slave_instances.c +++ b/test_apps/tcp_instances_tests/mb_tcp_slave_instances/main/tcp_slave_instances.c @@ -424,6 +424,14 @@ TaskHandle_t slave_tcp_create_instance(mb_communication_info_t *pconfig, uint32_ void app_main(void) { +#if !CONFIG_LOG_DEFAULT_LEVEL_DEBUG + esp_log_level_set("mbc_tcp.slave",ESP_LOG_DEBUG); + esp_log_level_set("mb_object.slave",ESP_LOG_DEBUG); +#else + // Disable VFS logs as they are too verbose + esp_log_level_set("vfs_calls", ESP_LOG_NONE); +#endif + void *pnetif = NULL; TEST_ASSERT_TRUE(test_tcp_services_init(&pnetif) == ESP_OK); TEST_ASSERT_NOT_NULL(pnetif); diff --git a/test_apps/tcp_instances_tests/mb_tcp_slave_instances/sdkconfig.ci.ethernet b/test_apps/tcp_instances_tests/mb_tcp_slave_instances/sdkconfig.ci.ethernet index 6c244b4..950b6ae 100644 --- a/test_apps/tcp_instances_tests/mb_tcp_slave_instances/sdkconfig.ci.ethernet +++ b/test_apps/tcp_instances_tests/mb_tcp_slave_instances/sdkconfig.ci.ethernet @@ -13,7 +13,6 @@ CONFIG_FMB_MASTER_DELAY_MS_CONVERT=300 CONFIG_FMB_EXT_TYPE_SUPPORT=y CONFIG_FMB_TCP_UID_ENABLED=n CONFIG_FMB_TIMER_USE_ISR_DISPATCH_METHOD=y -CONFIG_LOG_DEFAULT_LEVEL_DEBUG=y CONFIG_EXAMPLE_CONNECT_IPV6=n CONFIG_EXAMPLE_CONNECT_WIFI=n CONFIG_EXAMPLE_CONNECT_ETHERNET=y @@ -28,3 +27,5 @@ CONFIG_EXAMPLE_ETHERNET_EMAC_TASK_STACK_SIZE=4096 CONFIG_ETH_ENABLED=y CONFIG_ETH_USE_ESP32_EMAC=y CONFIG_ETH_USE_SPI_ETHERNET=n +CONFIG_LOG_DEFAULT_LEVEL_DEBUG=n +CONFIG_LOG_MAXIMUM_LEVEL_DEBUG=y diff --git a/test_apps/tcp_instances_tests/mb_tcp_slave_instances/sdkconfig.ci.wifi b/test_apps/tcp_instances_tests/mb_tcp_slave_instances/sdkconfig.ci.wifi index 2cd6de6..141bbd1 100644 --- a/test_apps/tcp_instances_tests/mb_tcp_slave_instances/sdkconfig.ci.wifi +++ b/test_apps/tcp_instances_tests/mb_tcp_slave_instances/sdkconfig.ci.wifi @@ -21,4 +21,5 @@ CONFIG_PARTITION_TABLE_SINGLE_APP_LARGE=y CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y # Enable debug logging -CONFIG_LOG_DEFAULT_LEVEL_DEBUG=y +CONFIG_LOG_DEFAULT_LEVEL_DEBUG=n +CONFIG_LOG_MAXIMUM_LEVEL_DEBUG=y diff --git a/test_apps/tcp_instances_tests/mb_tcp_slave_instances/sdkconfig.defaults b/test_apps/tcp_instances_tests/mb_tcp_slave_instances/sdkconfig.defaults index 7fe960e..65af2a7 100644 --- a/test_apps/tcp_instances_tests/mb_tcp_slave_instances/sdkconfig.defaults +++ b/test_apps/tcp_instances_tests/mb_tcp_slave_instances/sdkconfig.defaults @@ -24,4 +24,5 @@ CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y CONFIG_PARTITION_TABLE_SINGLE_APP_LARGE=y # Enable debug logging -CONFIG_LOG_DEFAULT_LEVEL_DEBUG=y +CONFIG_LOG_DEFAULT_LEVEL_DEBUG=n +CONFIG_LOG_MAXIMUM_LEVEL_DEBUG=y diff --git a/test_apps/unit_tests/mb_controller_common/sdkconfig.ci.generic b/test_apps/unit_tests/mb_controller_common/sdkconfig.ci.generic index c5d691d..f70a848 100644 --- a/test_apps/unit_tests/mb_controller_common/sdkconfig.ci.generic +++ b/test_apps/unit_tests/mb_controller_common/sdkconfig.ci.generic @@ -20,3 +20,5 @@ CONFIG_MB_TEST_MASTER_TASK_PRIO=4 CONFIG_MB_TEST_COMM_CYCLE_COUNTER=10 CONFIG_MB_TEST_LEAK_CRITICAL_LEVEL=128 CONFIG_MB_TEST_LEAK_WARN_LEVEL=128 +CONFIG_LOG_DEFAULT_LEVEL_DEBUG=n +CONFIG_LOG_MAXIMUM_LEVEL_DEBUG=y diff --git a/test_apps/unit_tests/mb_controller_mapping/sdkconfig.ci.serial b/test_apps/unit_tests/mb_controller_mapping/sdkconfig.ci.serial index 083e1cd..f25fe12 100644 --- a/test_apps/unit_tests/mb_controller_mapping/sdkconfig.ci.serial +++ b/test_apps/unit_tests/mb_controller_mapping/sdkconfig.ci.serial @@ -16,3 +16,5 @@ CONFIG_FMB_TIMER_USE_ISR_DISPATCH_METHOD=y CONFIG_MB_PORT_ADAPTER_EN=y CONFIG_MB_TEST_LEAK_CRITICAL_LEVEL=128 CONFIG_MB_TEST_LEAK_WARN_LEVEL=128 +CONFIG_LOG_DEFAULT_LEVEL_DEBUG=n +CONFIG_LOG_MAXIMUM_LEVEL_DEBUG=y diff --git a/test_apps/unit_tests/mb_controller_mapping/sdkconfig.default b/test_apps/unit_tests/mb_controller_mapping/sdkconfig.default index be00a20..fd07349 100644 --- a/test_apps/unit_tests/mb_controller_mapping/sdkconfig.default +++ b/test_apps/unit_tests/mb_controller_mapping/sdkconfig.default @@ -14,3 +14,5 @@ CONFIG_FMB_MASTER_TIMEOUT_MS_RESPOND=2000 CONFIG_FMB_MASTER_DELAY_MS_CONVERT=300 CONFIG_FMB_TIMER_USE_ISR_DISPATCH_METHOD=y CONFIG_MB_PORT_ADAPTER_EN=y +CONFIG_LOG_DEFAULT_LEVEL_DEBUG=n +CONFIG_LOG_MAXIMUM_LEVEL_DEBUG=y diff --git a/test_apps/unit_tests/mb_ext_types/sdkconfig.defaults b/test_apps/unit_tests/mb_ext_types/sdkconfig.defaults index 7b32825..bc6c768 100644 --- a/test_apps/unit_tests/mb_ext_types/sdkconfig.defaults +++ b/test_apps/unit_tests/mb_ext_types/sdkconfig.defaults @@ -1,2 +1,4 @@ # General options for test CONFIG_FMB_EXT_TYPE_SUPPORT=y +CONFIG_LOG_DEFAULT_LEVEL_DEBUG=n +CONFIG_LOG_MAXIMUM_LEVEL_DEBUG=y diff --git a/test_apps/unit_tests/test_config_parser/sdkconfig.defaults b/test_apps/unit_tests/test_config_parser/sdkconfig.defaults index 9ae0d8e..909ad49 100644 --- a/test_apps/unit_tests/test_config_parser/sdkconfig.defaults +++ b/test_apps/unit_tests/test_config_parser/sdkconfig.defaults @@ -1,2 +1,4 @@ # General options for test CONFIG_UNITY_ENABLE_FIXTURE=y +CONFIG_LOG_DEFAULT_LEVEL_DEBUG=n +CONFIG_LOG_MAXIMUM_LEVEL_DEBUG=y diff --git a/tools/setup_config_key.sh b/tools/setup_config_key.sh new file mode 100755 index 0000000..17b9d35 --- /dev/null +++ b/tools/setup_config_key.sh @@ -0,0 +1,49 @@ +#!/bin/bash + +ROOT_DIR="$( cd "$(dirname "$0")/../" ; pwd -P )" + +# Parse parameters: require at least key and value, optional file mask +if [ $# -lt 2 ] || [ $# -gt 6 ]; then + echo "Parameters provided: $#, $@, Usage: $0 CONFIG_KEY KEY_VALUE [CONFIG_MASK] " + echo "Example: $0 CONFIG_FMB_SETUP_DEBUG_MESSAGING y 'sdkconfig.ci.*'" + exit 1 +fi + +echo "Script called with $# parameters: $@" +echo "Root project path: ${ROOT_DIR}" + +KEY="${1:-CONFIG_FMB_SETUP_DEBUG_MESSAGING}" +VALUE="${2:-y}" +FILE_PATTERN="${3:-sdkconfig.*}" # default mask if not provided + +export APPS=$( find "${ROOT_DIR}" -type d ! -path "build_*" ! -path "*espressif__*" ! -path "managed_components*" ! -path "*arch*" \ + \( -exec test -f '{}/CMakeLists.txt' \; -and \ + -exec test -d '{}/main' \; -and \ + -exec test -f '{}/main/CMakeLists.txt' \; \ + \) -print ) + +echo "Found applications to check: ${APPS}" +for APP_DIR in ${APPS} +do + pushd ${APP_DIR} + echo "Checking for files matching: ${APP_DIR}/${FILE_PATTERN}" + shopt -s nullglob + matches=( ${FILE_PATTERN} ) + if [ ${#matches[@]} -eq 0 ]; then + echo "No matching files in ${APP_DIR}" + else + for FILE in "${matches[@]}"; do + echo "Found file: ${APP_DIR}/${FILE}" + if grep -q "^${KEY}=" "${FILE}"; then + echo "Updating ${KEY} in ${FILE} to ${VALUE}" + # use '|' delimiter to allow slashes in VALUE + sed -i "s|^${KEY}=.*|${KEY}=${VALUE}|" "${FILE}" + else + echo "Setting ${KEY} in ${FILE} to ${VALUE}" + echo "${KEY}=${VALUE}" >> "${FILE}" + fi + done + fi + shopt -u nullglob + popd +done