diff --git a/src/ETHTransport.c b/src/ETHTransport.c index ef8d975..f308f48 100644 --- a/src/ETHTransport.c +++ b/src/ETHTransport.c @@ -115,6 +115,9 @@ static void got_ip_event_handler(void *arg, esp_event_base_t event_base, { ip_event_got_ip_t *event = (ip_event_got_ip_t*) event_data; const esp_netif_ip_info_t *ip_info = &event->ip_info; + memcpy(&GetSysConf()->ethSettings.IPAddr, &event->ip_info.ip, sizeof(event->ip_info.ip)); + memcpy(&GetSysConf()->ethSettings.Mask, &event->ip_info.netmask, sizeof(event->ip_info.netmask)); + memcpy(&GetSysConf()->ethSettings.Gateway, &event->ip_info.gw, sizeof(event->ip_info.gw)); ESP_LOGI(TAG, "Ethernet Got IP Address"); ESP_LOGI(TAG, "~~~~~~~~~~~"); ESP_LOGI(TAG, "ETHIP:" IPSTR, IP2STR(&ip_info->ip)); diff --git a/src/RestApiHandler.c b/src/RestApiHandler.c index 130e477..557365d 100644 --- a/src/RestApiHandler.c +++ b/src/RestApiHandler.c @@ -244,16 +244,15 @@ const rest_var_t SystemVariables[] = #endif #if CONFIG_WEBGUIAPP_ETHERNET_ENABLE - { 0, "eth_ip", &SysConfig.wifiSettings.InfIPAddr, VAR_IPADDR,RW, 0, 0 }, - { 0, "eth_mask", &SysConfig.wifiSettings.InfMask, VAR_IPADDR,RW, 0, 0 }, - { 0, "eth_gw", &SysConfig.wifiSettings.InfGateway, VAR_IPADDR,RW, 0, 0 }, - { 0, "eth_dns1", &SysConfig.wifiSettings.DNSAddr1, VAR_IPADDR,RW, 0, 0 }, - { 0, "eth_dns2", &SysConfig.wifiSettings.DNSAddr2, VAR_IPADDR,RW, 0, 0 }, - { 0, "eth_dns3", &SysConfig.wifiSettings.DNSAddr3, VAR_IPADDR,RW, 0, 0 }, + { 0, "eth_enab", &SysConfig.ethSettings.Flags1.bIsETHEnabled, VAR_BOOL, RW, 0, 1 }, + { 0, "eth_isdhcp", &SysConfig.ethSettings.Flags1.bIsDHCPEnabled, VAR_BOOL, RW, 0, 1 }, + { 0, "eth_ip", &SysConfig.ethSettings.IPAddr, VAR_IPADDR,RW, 0, 0 }, + { 0, "eth_mask", &SysConfig.ethSettings.Mask, VAR_IPADDR,RW, 0, 0 }, + { 0, "eth_gw", &SysConfig.ethSettings.Gateway, VAR_IPADDR,RW, 0, 0 }, + { 0, "eth_dns1", &SysConfig.ethSettings.DNSAddr1, VAR_IPADDR,RW, 0, 0 }, + { 0, "eth_dns2", &SysConfig.ethSettings.DNSAddr2, VAR_IPADDR,RW, 0, 0 }, + { 0, "eth_dns3", &SysConfig.ethSettings.DNSAddr3, VAR_IPADDR,RW, 0, 0 }, { 0, "eth_stat", &funct_eth_stat, VAR_FUNCT, R, 0, 0 }, - - - #endif #if CONFIG_WEBGUIAPP_WIFI_ENABLE