Crash_Override/OVMS3-idf
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Rename Kconfig options (components/tcpip_adapter)

Browse source
This commit is contained in:
Roland Dobai 2019-05-02 15:06:44 +02:00
parent d61d58e78d
commit 24a2e5a17e
4 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
components/tcpip_adapter/Kconfig
View file

@ -1,6 +1,6 @@
menu "TCP/IP Adapter" menu "TCP/IP Adapter"
config IP_LOST_TIMER_INTERVAL config NETIF_IP_LOST_TIMER_INTERVAL
int "IP Address lost timer interval (seconds)" int "IP Address lost timer interval (seconds)"
range 0 65535 range 0 65535
default 120 default 120
@ -13,7 +13,7 @@ menu "TCP/IP Adapter"
the timer expires. The IP lost timer is stopped if the station get the IP again before the timer expires. The IP lost timer is stopped if the station get the IP again before
the timer expires. the timer expires.
choice USE_TCPIP_STACK_LIB choice NETIF_USE_TCPIP_STACK_LIB
prompt "TCP/IP Stack Library" prompt "TCP/IP Stack Library"
default TCPIP_LWIP default TCPIP_LWIP
help help

5
components/tcpip_adapter/sdkconfig.rename Normal file
View file

@ -0,0 +1,5 @@
# sdkconfig replacement configurations for deprecated options formatted as
# CONFIG_DEPRECATED_OPTION CONFIG_NEW_OPTION
CONFIG_IP_LOST_TIMER_INTERVAL CONFIG_NETIF_IP_LOST_TIMER_INTERVAL
CONFIG_USE_TCPIP_STACK_LIB CONFIG_NETIF_USE_TCPIP_STACK_LIB

8
components/tcpip_adapter/tcpip_adapter_lwip.c
View file

@ -953,15 +953,15 @@ static esp_err_t tcpip_adapter_start_ip_lost_timer(tcpip_adapter_if_t tcpip_if)
return ESP_OK; return ESP_OK;
} }
if ( netif && (CONFIG_IP_LOST_TIMER_INTERVAL > 0) && !ip4_addr_isany_val(ip_info_old->ip)) { if ( netif && (CONFIG_NETIF_IP_LOST_TIMER_INTERVAL > 0) && !ip4_addr_isany_val(ip_info_old->ip)) {
esp_ip_lost_timer[tcpip_if].timer_running = true; esp_ip_lost_timer[tcpip_if].timer_running = true;
sys_timeout(CONFIG_IP_LOST_TIMER_INTERVAL*1000, tcpip_adapter_ip_lost_timer, (void*)tcpip_if); sys_timeout(CONFIG_NETIF_IP_LOST_TIMER_INTERVAL*1000, tcpip_adapter_ip_lost_timer, (void*)tcpip_if);
ESP_LOGD(TAG, "if%d start ip lost tmr: interval=%d", tcpip_if, CONFIG_IP_LOST_TIMER_INTERVAL); ESP_LOGD(TAG, "if%d start ip lost tmr: interval=%d", tcpip_if, CONFIG_NETIF_IP_LOST_TIMER_INTERVAL);
return ESP_OK; return ESP_OK;
} }
ESP_LOGD(TAG, "if%d start ip lost tmr: no need start because netif=%p interval=%d ip=%x", ESP_LOGD(TAG, "if%d start ip lost tmr: no need start because netif=%p interval=%d ip=%x",
tcpip_if, netif, CONFIG_IP_LOST_TIMER_INTERVAL, ip_info_old->ip.addr); tcpip_if, netif, CONFIG_NETIF_IP_LOST_TIMER_INTERVAL, ip_info_old->ip.addr);
return ESP_OK; return ESP_OK;
} }

2
tools/ldgen/samples/sdkconfig
View file

@ -532,7 +532,7 @@ CONFIG_SPIFFS_TEST_VISUALISATION=
# #
# tcpip adapter # tcpip adapter
# #
CONFIG_IP_LOST_TIMER_INTERVAL=120 CONFIG_NETIF_IP_LOST_TIMER_INTERVAL=120
# #
# Wear Levelling # Wear Levelling