From 45f5bf9bb8857c448735529240c7e404fbcf67e3 Mon Sep 17 00:00:00 2001 From: Denis Apel <35398698+stardado@users.noreply.github.com> Date: Sat, 18 Dec 2021 17:23:50 +0100 Subject: [PATCH 1/7] Add files via upload --- src/TaskEth.cpp | 15 +++++++++------ src/project_configuration.cpp | 2 ++ src/project_configuration.h | 1 + 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/src/TaskEth.cpp b/src/TaskEth.cpp index c25120e..ed59daa 100644 --- a/src/TaskEth.cpp +++ b/src/TaskEth.cpp @@ -36,13 +36,15 @@ void WiFiEvent(WiFiEvent_t event) { break; case SYSTEM_EVENT_ETH_START: logPrintlnI("ETH Started"); - ETH.setHostname("esp32-ethernet"); break; case SYSTEM_EVENT_ETH_CONNECTED: logPrintlnI("ETH Connected"); + ETH.setHostname("esp32-ethernet"); break; case SYSTEM_EVENT_ETH_GOT_IP: - logPrintI("ETH MAC: "); + logPrintI("Hostname: "); + logPrintI(ETH.getHostname()); + logPrintI(", ETH MAC: "); logPrintI(ETH.macAddress()); logPrintI(", IPv4: "); logPrintI(ETH.localIP().toString()); @@ -100,11 +102,12 @@ bool EthTask::setup(System &system) { delay(200); digitalWrite(ETH_NRST, 1); - if (!system.getUserConfig()->network.DHCP) { - 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); + + if (!system.getUserConfig()->network.DHCP) { + ETH.config(system.getUserConfig()->network.staticIP, system.getUserConfig()->network.gateway, system.getUserConfig()->network.subnet, system.getUserConfig()->network.dns1, system.getUserConfig()->network.dns2); + } + ETH.setHostname(system.getUserConfig()->network.hostname.c_str()); return true; } diff --git a/src/project_configuration.cpp b/src/project_configuration.cpp index 656d284..b81e706 100644 --- a/src/project_configuration.cpp +++ b/src/project_configuration.cpp @@ -9,6 +9,7 @@ void ProjectConfigurationManagement::readProjectConfiguration(DynamicJsonDocumen conf.callsign = data["callsign"].as(); if (data.containsKey("network") && data["network"].containsKey("DHCP")) { + conf.network.hostname = data["network"]["hostname"].as(); conf.network.DHCP = data["network"]["DHCP"]; conf.network.staticIP.fromString(data["network"]["staticIP"].as()); conf.network.subnet.fromString(data["network"]["subnet"].as()); @@ -74,6 +75,7 @@ void ProjectConfigurationManagement::writeProjectConfiguration(Configuration &co data["callsign"] = conf.callsign; if (!conf.network.DHCP) { + data["network"]["hostname"] = conf.network.hostname; data["network"]["DHCP"] = conf.network.DHCP; data["network"]["staticIP"] = conf.network.staticIP.toString(); data["network"]["subnet"] = conf.network.subnet.toString(); diff --git a/src/project_configuration.h b/src/project_configuration.h index b2ba0bc..f3510b9 100644 --- a/src/project_configuration.h +++ b/src/project_configuration.h @@ -11,6 +11,7 @@ public: Network() : DHCP(true) { } + String hostname; bool DHCP; IPAddress staticIP; IPAddress subnet; From 75e85d8080e4511ad5e5464e958aec6f4f242e9b Mon Sep 17 00:00:00 2001 From: Denis Apel <35398698+stardado@users.noreply.github.com> Date: Sat, 18 Dec 2021 17:24:08 +0100 Subject: [PATCH 2/7] Add files via upload From 6e10e0ce05c100f950f7487a92aa716f28369d92 Mon Sep 17 00:00:00 2001 From: Denis Apel <35398698+stardado@users.noreply.github.com> Date: Sat, 18 Dec 2021 17:24:46 +0100 Subject: [PATCH 3/7] Add files via upload --- data/is-cfg.json | 1 + 1 file changed, 1 insertion(+) diff --git a/data/is-cfg.json b/data/is-cfg.json index 736d44c..029798b 100644 --- a/data/is-cfg.json +++ b/data/is-cfg.json @@ -1,6 +1,7 @@ { "callsign": "NOCALL-10", "network": { + "hostname": "lora-igate", "DHCP": true, "staticIP": "192.0.2.100", "subnet": "255.255.255.0", From fe860dad03b7474377cf64839b6875dbfd07b33f Mon Sep 17 00:00:00 2001 From: Peter Buchegger Date: Sat, 18 Dec 2021 18:05:14 +0100 Subject: [PATCH 4/7] Update project_configuration.h --- src/project_configuration.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/project_configuration.h b/src/project_configuration.h index f3510b9..cdc0982 100644 --- a/src/project_configuration.h +++ b/src/project_configuration.h @@ -11,7 +11,7 @@ public: Network() : DHCP(true) { } - String hostname; + String hostname; bool DHCP; IPAddress staticIP; IPAddress subnet; From f28a551d1dd2d96eaeaa7a9d29bd673597eaca89 Mon Sep 17 00:00:00 2001 From: Peter Buchegger Date: Sat, 18 Dec 2021 18:06:07 +0100 Subject: [PATCH 5/7] Update project_configuration.cpp --- src/project_configuration.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/project_configuration.cpp b/src/project_configuration.cpp index b81e706..c5e044f 100644 --- a/src/project_configuration.cpp +++ b/src/project_configuration.cpp @@ -10,7 +10,7 @@ void ProjectConfigurationManagement::readProjectConfiguration(DynamicJsonDocumen if (data.containsKey("network") && data["network"].containsKey("DHCP")) { conf.network.hostname = data["network"]["hostname"].as(); - conf.network.DHCP = data["network"]["DHCP"]; + conf.network.DHCP = data["network"]["DHCP"]; conf.network.staticIP.fromString(data["network"]["staticIP"].as()); conf.network.subnet.fromString(data["network"]["subnet"].as()); conf.network.gateway.fromString(data["network"]["gateway"].as()); From 87ce3b9800329c8c2cea42dd8f996d797973b795 Mon Sep 17 00:00:00 2001 From: Peter Buchegger Date: Sat, 18 Dec 2021 18:07:37 +0100 Subject: [PATCH 6/7] Update TaskEth.cpp --- src/TaskEth.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/TaskEth.cpp b/src/TaskEth.cpp index ed59daa..1d74eb5 100644 --- a/src/TaskEth.cpp +++ b/src/TaskEth.cpp @@ -104,8 +104,8 @@ bool EthTask::setup(System &system) { ETH.begin(ETH_ADDR, ETH_POWER_PIN, ETH_MDC_PIN, ETH_MDIO_PIN, ETH_TYPE, ETH_CLK); - if (!system.getUserConfig()->network.DHCP) { - ETH.config(system.getUserConfig()->network.staticIP, system.getUserConfig()->network.gateway, system.getUserConfig()->network.subnet, system.getUserConfig()->network.dns1, system.getUserConfig()->network.dns2); + if (!system.getUserConfig()->network.DHCP) { + ETH.config(system.getUserConfig()->network.staticIP, system.getUserConfig()->network.gateway, system.getUserConfig()->network.subnet, system.getUserConfig()->network.dns1, system.getUserConfig()->network.dns2); } ETH.setHostname(system.getUserConfig()->network.hostname.c_str()); return true; From 6869a22a6d928742690522802fe18530f3caf5c2 Mon Sep 17 00:00:00 2001 From: Peter Buchegger Date: Sat, 18 Dec 2021 18:08:41 +0100 Subject: [PATCH 7/7] Update is-cfg.json --- data/is-cfg.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/is-cfg.json b/data/is-cfg.json index 029798b..5018eb0 100644 --- a/data/is-cfg.json +++ b/data/is-cfg.json @@ -1,7 +1,7 @@ { "callsign": "NOCALL-10", "network": { - "hostname": "lora-igate", + "hostname": "NOCALL-10", "DHCP": true, "staticIP": "192.0.2.100", "subnet": "255.255.255.0",