diff --git a/src/LoRa_APRS_iGate.cpp b/src/LoRa_APRS_iGate.cpp index 1c164e5..56990dc 100644 --- a/src/LoRa_APRS_iGate.cpp +++ b/src/LoRa_APRS_iGate.cpp @@ -20,7 +20,7 @@ Configuration Config; WiFiClient espClient; -String versionDate = "2023.06.19"; +String versionDate = "2023.06.25"; int myWiFiAPIndex = 0; int myWiFiAPSize = Config.wifiAPs.size(); WiFi_AP *currentWiFi = &Config.wifiAPs[myWiFiAPIndex]; diff --git a/src/configuration.cpp b/src/configuration.cpp index ae9edad..4f2ce2a 100644 --- a/src/configuration.cpp +++ b/src/configuration.cpp @@ -34,8 +34,8 @@ void Configuration::readFile(fs::FS &fs, const char *fileName) { callsign = data["callsign"].as(); stationMode = data["stationMode"].as(); iGateComment = data["iGateComment"].as(); - beaconInterval = data["other"]["beaconInterval"].as() | 15; - rememberStationTime = data["other"]["rememberStationTime"].as() | 30; + beaconInterval = data["other"]["beaconInterval"].as(); + rememberStationTime = data["other"]["rememberStationTime"].as(); digi.comment = data["digi"]["comment"].as(); digi.latitude = data["digi"]["latitude"].as(); @@ -43,26 +43,26 @@ void Configuration::readFile(fs::FS &fs, const char *fileName) { aprs_is.passcode = data["aprs_is"]["passcode"].as(); aprs_is.server = data["aprs_is"]["server"].as(); - aprs_is.port = data["aprs_is"]["port"].as() | 14580; - aprs_is.reportingDistance = data["aprs_is"]["reportingDistance"].as() | 30; + aprs_is.port = data["aprs_is"]["port"].as(); + aprs_is.reportingDistance = data["aprs_is"]["reportingDistance"].as(); - loramodule.iGateFreq = data["lora"]["iGateFreq"].as() | 433775000; - loramodule.digirepeaterTxFreq = data["lora"]["digirepeaterTxFreq"].as() | 433775000; - loramodule.digirepeaterRxFreq = data["lora"]["digirepeaterRxFreq"].as() | 433900000; - loramodule.spreadingFactor = data["lora"]["spreadingFactor"].as() | 12; - loramodule.signalBandwidth = data["lora"]["signalBandwidth"].as() | 125000; - loramodule.codingRate4 = data["lora"]["codingRate4"].as() | 5; - loramodule.power = data["lora"]["power"].as() | 20; + loramodule.iGateFreq = data["lora"]["iGateFreq"].as(); + loramodule.digirepeaterTxFreq = data["lora"]["digirepeaterTxFreq"].as(); + loramodule.digirepeaterRxFreq = data["lora"]["digirepeaterRxFreq"].as(); + loramodule.spreadingFactor = data["lora"]["spreadingFactor"].as(); + loramodule.signalBandwidth = data["lora"]["signalBandwidth"].as(); + loramodule.codingRate4 = data["lora"]["codingRate4"].as(); + loramodule.power = data["lora"]["power"].as(); - display.alwaysOn = data["display"]["alwaysOn"].as() | true; - display.timeout = data["display"]["timeout"].as() | 4; - display.turn180 = data["display"]["turn180"].as() | false; + display.alwaysOn = data["display"]["alwaysOn"].as(); + display.timeout = data["display"]["timeout"].as(); + display.turn180 = data["display"]["turn180"].as(); - syslog.active = data["syslog"]["active"].as() | false; + syslog.active = data["syslog"]["active"].as(); syslog.server = data["syslog"]["server"].as(); syslog.port = data["syslog"]["port"].as(); - bme.active = data["bme"]["active"].as() | false; + bme.active = data["bme"]["active"].as(); configFile.close(); }