diff --git a/src/TaskEth.cpp b/src/TaskEth.cpp index c26aca3..e691c51 100644 --- a/src/TaskEth.cpp +++ b/src/TaskEth.cpp @@ -20,7 +20,13 @@ void WiFiEvent(WiFiEvent_t event) { logPrintI("WiFi MAC: "); logPrintI(WiFi.macAddress()); logPrintI(", IPv4: "); - logPrintlnI(WiFi.localIP().toString()); + logPrintI(WiFi.localIP().toString()); + logPrintI(", Gateway: "); + logPrintI(WiFi.gatewayIP().toString()); + logPrintI(", DNS1: "); + logPrintI(WiFi.dnsIP().toString()); + logPrintI(", DNS2: "); + logPrintlnI(WiFi.dnsIP(1).toString()); break; case SYSTEM_EVENT_STA_DISCONNECTED: logPrintlnW("WiFi Disconnected"); @@ -40,8 +46,12 @@ void WiFiEvent(WiFiEvent_t event) { logPrintI(ETH.macAddress()); logPrintI(", IPv4: "); logPrintI(ETH.localIP().toString()); - logPrintI(", DNS: "); + logPrintI(", Gateway: "); + logPrintI(ETH.gatewayIP().toString()); + logPrintI(", DNS1: "); logPrintI(ETH.dnsIP().toString()); + logPrintI(", DNS2: "); + logPrintI(ETH.dnsIP(1).toString()); if (ETH.fullDuplex()) { logPrintI(", FULL_DUPLEX"); } @@ -91,7 +101,7 @@ bool EthTask::setup(System &system) { digitalWrite(ETH_NRST, 1); if (system.getUserConfig()->network.DHCP == false) - ETH.config(system.getUserConfig()->network.staticIP, system.getUserConfig()->network.gateway, system.getUserConfig()->network.subnet, system.getUserConfig()->network.dns); + ETH.config(system.getUserConfig()->network.staticIP, system.getUserConfig()->network.gateway, system.getUserConfig()->network.subnet, system.getUserConfig()->network.dns1, system.getUserConfig()->network.dns2); ETH.begin(ETH_ADDR, ETH_POWER_PIN, ETH_MDC_PIN, ETH_MDIO_PIN, ETH_TYPE, ETH_CLK); return true; diff --git a/src/TaskWifi.cpp b/src/TaskWifi.cpp index f384043..922e3f9 100644 --- a/src/TaskWifi.cpp +++ b/src/TaskWifi.cpp @@ -23,7 +23,7 @@ bool WifiTask::setup(System &system) { WiFi.setHostname(system.getUserConfig()->callsign.c_str()); if (system.getUserConfig()->network.DHCP == false) - WiFi.config(system.getUserConfig()->network.staticIP, system.getUserConfig()->network.gateway, system.getUserConfig()->network.subnet, system.getUserConfig()->network.dns); + WiFi.config(system.getUserConfig()->network.staticIP, system.getUserConfig()->network.gateway, system.getUserConfig()->network.subnet, system.getUserConfig()->network.dns1, system.getUserConfig()->network.dns2); for (Configuration::Wifi::AP ap : system.getUserConfig()->wifi.APs) { logPrintD("Looking for AP: "); diff --git a/src/project_configuration.cpp b/src/project_configuration.cpp index a523662..145b0cd 100644 --- a/src/project_configuration.cpp +++ b/src/project_configuration.cpp @@ -13,7 +13,8 @@ void ProjectConfigurationManagement::readProjectConfiguration(DynamicJsonDocumen conf.network.staticIP.fromString(data["network"]["staticIP"].as()); conf.network.subnet.fromString(data["network"]["subnet"].as()); conf.network.gateway.fromString(data["network"]["gateway"].as()); - conf.network.dns.fromString(data["network"]["dns"].as()); + conf.network.dns1.fromString(data["network"]["dns1"].as()); + conf.network.dns2.fromString(data["network"]["dns2"].as()); } JsonArray aps = data["wifi"]["AP"].as(); @@ -77,7 +78,8 @@ void ProjectConfigurationManagement::writeProjectConfiguration(Configuration &co data["network"]["staticIP"] = conf.network.staticIP.toString(); data["network"]["subnet"] = conf.network.subnet.toString(); data["network"]["gateway"] = conf.network.gateway.toString(); - data["network"]["dns"] = conf.network.dns.toString(); + data["network"]["dns1"] = conf.network.dns1.toString(); + data["network"]["dns2"] = conf.network.dns2.toString(); } JsonArray aps = data["wifi"].createNestedArray("AP"); diff --git a/src/project_configuration.h b/src/project_configuration.h index 32db01d..4a03498 100644 --- a/src/project_configuration.h +++ b/src/project_configuration.h @@ -15,7 +15,8 @@ public: IPAddress staticIP; IPAddress subnet; IPAddress gateway; - IPAddress dns; + IPAddress dns1; + IPAddress dns2; }; class Wifi {