lora-aprs/LoRa_APRS_iGate
1
0
Fork 0
mirror of https://github.com/lora-aprs/LoRa_APRS_iGate.git synced 2025-12-06 07:42:00 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

+ add DNS2 parameter

Browse source
This commit is contained in:
Christoph Kottke 2021-07-18 19:41:15 +02:00
parent bd34ad7070
commit c06efb910a
4 changed files with 20 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/TaskEth.cpp
View file

@ -20,7 +20,13 @@ void WiFiEvent(WiFiEvent_t event) {
logPrintI("WiFi MAC: "); logPrintI("WiFi MAC: ");
logPrintI(WiFi.macAddress()); logPrintI(WiFi.macAddress());
logPrintI(", IPv4: "); 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; break;
case SYSTEM_EVENT_STA_DISCONNECTED: case SYSTEM_EVENT_STA_DISCONNECTED:
logPrintlnW("WiFi Disconnected"); logPrintlnW("WiFi Disconnected");
@ -40,8 +46,12 @@ void WiFiEvent(WiFiEvent_t event) {
logPrintI(ETH.macAddress()); logPrintI(ETH.macAddress());
logPrintI(", IPv4: "); logPrintI(", IPv4: ");
logPrintI(ETH.localIP().toString()); logPrintI(ETH.localIP().toString());
logPrintI(", DNS: "); logPrintI(", Gateway: ");
logPrintI(ETH.gatewayIP().toString());
logPrintI(", DNS1: ");
logPrintI(ETH.dnsIP().toString()); logPrintI(ETH.dnsIP().toString());
logPrintI(", DNS2: ");
logPrintI(ETH.dnsIP(1).toString());
if (ETH.fullDuplex()) { if (ETH.fullDuplex()) {
logPrintI(", FULL_DUPLEX"); logPrintI(", FULL_DUPLEX");
} }
@ -91,7 +101,7 @@ bool EthTask::setup(System &system) {
digitalWrite(ETH_NRST, 1); digitalWrite(ETH_NRST, 1);
if (system.getUserConfig()->network.DHCP == false) 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); ETH.begin(ETH_ADDR, ETH_POWER_PIN, ETH_MDC_PIN, ETH_MDIO_PIN, ETH_TYPE, ETH_CLK);
return true; return true;

2
src/TaskWifi.cpp
View file

@ -23,7 +23,7 @@ bool WifiTask::setup(System &system) {
WiFi.setHostname(system.getUserConfig()->callsign.c_str()); WiFi.setHostname(system.getUserConfig()->callsign.c_str());
if (system.getUserConfig()->network.DHCP == false) 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) { for (Configuration::Wifi::AP ap : system.getUserConfig()->wifi.APs) {
logPrintD("Looking for AP: "); logPrintD("Looking for AP: ");

6
src/project_configuration.cpp
View file

@ -13,7 +13,8 @@ void ProjectConfigurationManagement::readProjectConfiguration(DynamicJsonDocumen
conf.network.staticIP.fromString(data["network"]["staticIP"].as<String>()); conf.network.staticIP.fromString(data["network"]["staticIP"].as<String>());
conf.network.subnet.fromString(data["network"]["subnet"].as<String>()); conf.network.subnet.fromString(data["network"]["subnet"].as<String>());
conf.network.gateway.fromString(data["network"]["gateway"].as<String>()); conf.network.gateway.fromString(data["network"]["gateway"].as<String>());
conf.network.dns.fromString(data["network"]["dns"].as<String>()); conf.network.dns1.fromString(data["network"]["dns1"].as<String>());
conf.network.dns2.fromString(data["network"]["dns2"].as<String>());
} }
JsonArray aps = data["wifi"]["AP"].as<JsonArray>(); JsonArray aps = data["wifi"]["AP"].as<JsonArray>();
@ -77,7 +78,8 @@ void ProjectConfigurationManagement::writeProjectConfiguration(Configuration &co
data["network"]["staticIP"] = conf.network.staticIP.toString(); data["network"]["staticIP"] = conf.network.staticIP.toString();
data["network"]["subnet"] = conf.network.subnet.toString(); data["network"]["subnet"] = conf.network.subnet.toString();
data["network"]["gateway"] = conf.network.gateway.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"); JsonArray aps = data["wifi"].createNestedArray("AP");

3
src/project_configuration.h
View file

@ -15,7 +15,8 @@ public:
IPAddress staticIP; IPAddress staticIP;
IPAddress subnet; IPAddress subnet;
IPAddress gateway; IPAddress gateway;
IPAddress dns; IPAddress dns1;
IPAddress dns2;
}; };
class Wifi { class Wifi {