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

Merge branch 'master' into develop

Browse source
This commit is contained in:
Peter Buchegger 2021-12-18 18:27:50 +01:00 committed by GitHub
parent 6897dd4856 15a58d6701
commit 4784d2c62c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
data/is-cfg.json
View file

@ -1,6 +1,7 @@
{ {
"callsign": "NOCALL-10", "callsign": "NOCALL-10",
"network": { "network": {
"hostname": "NOCALL-10",
"DHCP": true, "DHCP": true,
"staticIP": "192.0.2.100", "staticIP": "192.0.2.100",
"subnet": "255.255.255.0", "subnet": "255.255.255.0",

11
src/TaskEth.cpp
View file

@ -36,13 +36,15 @@ void WiFiEvent(WiFiEvent_t event) {
break; break;
case SYSTEM_EVENT_ETH_START: case SYSTEM_EVENT_ETH_START:
logPrintlnI("ETH Started"); logPrintlnI("ETH Started");
ETH.setHostname("esp32-ethernet");
break; break;
case SYSTEM_EVENT_ETH_CONNECTED: case SYSTEM_EVENT_ETH_CONNECTED:
logPrintlnI("ETH Connected"); logPrintlnI("ETH Connected");
ETH.setHostname("esp32-ethernet");
break; break;
case SYSTEM_EVENT_ETH_GOT_IP: case SYSTEM_EVENT_ETH_GOT_IP:
logPrintI("ETH MAC: "); logPrintI("Hostname: ");
logPrintI(ETH.getHostname());
logPrintI(", ETH MAC: ");
logPrintI(ETH.macAddress()); logPrintI(ETH.macAddress());
logPrintI(", IPv4: "); logPrintI(", IPv4: ");
logPrintI(ETH.localIP().toString()); logPrintI(ETH.localIP().toString());
@ -100,11 +102,12 @@ bool EthTask::setup(System &system) {
delay(200); delay(200);
digitalWrite(ETH_NRST, 1); digitalWrite(ETH_NRST, 1);
ETH.begin(ETH_ADDR, ETH_POWER_PIN, ETH_MDC_PIN, ETH_MDIO_PIN, ETH_TYPE, ETH_CLK);
if (!system.getUserConfig()->network.DHCP) { 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.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());
ETH.begin(ETH_ADDR, ETH_POWER_PIN, ETH_MDC_PIN, ETH_MDIO_PIN, ETH_TYPE, ETH_CLK);
return true; return true;
} }

4
src/project_configuration.cpp
View file

@ -9,7 +9,8 @@ void ProjectConfigurationManagement::readProjectConfiguration(DynamicJsonDocumen
conf.callsign = data["callsign"].as<String>(); conf.callsign = data["callsign"].as<String>();
if (data.containsKey("network") && data["network"].containsKey("DHCP")) { if (data.containsKey("network") && data["network"].containsKey("DHCP")) {
conf.network.DHCP = data["network"]["DHCP"]; conf.network.hostname = data["network"]["hostname"].as<String>();
conf.network.DHCP = data["network"]["DHCP"];
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>());
@ -76,6 +77,7 @@ void ProjectConfigurationManagement::writeProjectConfiguration(Configuration &co
data["callsign"] = conf.callsign; data["callsign"] = conf.callsign;
if (!conf.network.DHCP) { if (!conf.network.DHCP) {
data["network"]["hostname"] = conf.network.hostname;
data["network"]["DHCP"] = conf.network.DHCP; data["network"]["DHCP"] = conf.network.DHCP;
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();

1
src/project_configuration.h
View file

@ -11,6 +11,7 @@ public:
Network() : DHCP(true) { Network() : DHCP(true) {
} }
String hostname;
bool DHCP; bool DHCP;
IPAddress staticIP; IPAddress staticIP;
IPAddress subnet; IPAddress subnet;