Merge branch 'bugfix/fix_incorrect_settings_from_ci_config' into 'master'

alisitsyn · alisitsyn · commit f0e78b6d274f · 2023-12-20T23:56:29.000+08:00
fix sdkconfig settings for ci

See merge request idf/esp-modbus!55
diff --git a/test/tcp/mb_tcp_master/sdkconfig.ci.ethernet b/test/tcp/mb_tcp_master/sdkconfig.ci.ethernet
@@ -14,7 +14,6 @@ CONFIG_FMB_TCP_UID_ENABLED=n
 CONFIG_FMB_TIMER_USE_ISR_DISPATCH_METHOD=y
 CONFIG_MB_MDNS_IP_RESOLVER=n
 CONFIG_MB_SLAVE_IP_FROM_STDIN=y
-CONFIG_MB_SLAVE_ADDR=1
 CONFIG_LOG_DEFAULT_LEVEL_DEBUG=y
 CONFIG_EXAMPLE_CONNECT_IPV6=n
 CONFIG_EXAMPLE_CONNECT_WIFI=n
diff --git a/test/tcp/mb_tcp_slave/sdkconfig.ci.ethernet b/test/tcp/mb_tcp_slave/sdkconfig.ci.ethernet
@@ -14,7 +14,6 @@ CONFIG_FMB_TIMER_PORT_ENABLED=y
 CONFIG_FMB_TCP_UID_ENABLED=n
 CONFIG_FMB_TIMER_USE_ISR_DISPATCH_METHOD=y
 CONFIG_MB_MDNS_IP_RESOLVER=n
-CONFIG_MB_SLAVE_IP_FROM_STDIN=y
 CONFIG_MB_SLAVE_ADDR=1
 CONFIG_LOG_DEFAULT_LEVEL_DEBUG=y
 CONFIG_EXAMPLE_CONNECT_IPV6=n
diff --git a/test/tcp/mb_tcp_slave/sdkconfig.ci.wifi b/test/tcp/mb_tcp_slave/sdkconfig.ci.wifi
@@ -10,7 +10,6 @@ CONFIG_FMB_MASTER_DELAY_MS_CONVERT=300
 CONFIG_LOG_DEFAULT_LEVEL_DEBUG=y
 CONFIG_FMB_TCP_UID_ENABLED=n
 CONFIG_MB_MDNS_IP_RESOLVER=n
-CONFIG_MB_SLAVE_IP_FROM_STDIN=y
 CONFIG_MB_SLAVE_ADDR=1
 CONFIG_EXAMPLE_CONNECT_IPV6=n
 CONFIG_FMB_TIMER_USE_ISR_DISPATCH_METHOD=y
diff --git a/test/tcp/mb_tcp_slave/sdkconfig.defaults b/test/tcp/mb_tcp_slave/sdkconfig.defaults
@@ -10,11 +10,9 @@ CONFIG_FMB_COMM_MODE_RTU_EN=n
 CONFIG_FMB_COMM_MODE_ASCII_EN=n
 CONFIG_FMB_MASTER_TIMEOUT_MS_RESPOND=2000
 CONFIG_FMB_MASTER_DELAY_MS_CONVERT=300
-CONFIG_MB_SLAVE_IP_FROM_STDIN=y
 CONFIG_FMB_TIMER_USE_ISR_DISPATCH_METHOD=y
 CONFIG_MB_MDNS_IP_RESOLVER=n
 CONFIG_FMB_TCP_UID_ENABLED=n
-CONFIG_MB_SLAVE_IP_FROM_STDIN=y
 CONFIG_MB_SLAVE_ADDR=1
 CONFIG_EXAMPLE_CONNECT_IPV6=n
 CONFIG_EXAMPLE_WIFI_SSID="${CI_WIFI_SSID}"
