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

requested changes

Browse source
This commit is contained in:
Christoph Kottke 2021-07-23 10:37:58 +02:00
parent c06efb910a
commit 3485426843
4 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/TaskEth.cpp
View file

@ -100,8 +100,9 @@ bool EthTask::setup(System &system) {
delay(200); delay(200);
digitalWrite(ETH_NRST, 1); digitalWrite(ETH_NRST, 1);
if (system.getUserConfig()->network.DHCP == false) 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.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;

3
src/TaskWifi.cpp
View file

@ -22,8 +22,9 @@ bool WifiTask::setup(System &system) {
WiFi.onEvent(WiFiEvent); WiFi.onEvent(WiFiEvent);
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) {
WiFi.config(system.getUserConfig()->network.staticIP, system.getUserConfig()->network.gateway, system.getUserConfig()->network.subnet, system.getUserConfig()->network.dns1, system.getUserConfig()->network.dns2); 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: ");

2
src/project_configuration.cpp
View file

@ -73,7 +73,7 @@ void ProjectConfigurationManagement::readProjectConfiguration(DynamicJsonDocumen
void ProjectConfigurationManagement::writeProjectConfiguration(Configuration &conf, DynamicJsonDocument &data) { void ProjectConfigurationManagement::writeProjectConfiguration(Configuration &conf, DynamicJsonDocument &data) {
data["callsign"] = conf.callsign; data["callsign"] = conf.callsign;
if (conf.network.DHCP == false) { if (!conf.network.DHCP) {
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();

6
src/project_configuration.h
View file

@ -6,9 +6,9 @@
class Configuration { class Configuration {
public: public:
class NETWORK { class Network {
public: public:
NETWORK() : DHCP(true) { Network() : DHCP(true) {
} }
bool DHCP; bool DHCP;
@ -106,7 +106,7 @@ public:
Configuration() : callsign("NOCALL-10"), board(""), ntpServer("pool.ntp.org"){}; Configuration() : callsign("NOCALL-10"), board(""), ntpServer("pool.ntp.org"){};
String callsign; String callsign;
NETWORK network; Network network;
Wifi wifi; Wifi wifi;
Beacon beacon; Beacon beacon;
APRS_IS aprs_is; APRS_IS aprs_is;