fixed display turn off mode

This commit is contained in:
richonguzman 2023-06-25 10:45:43 -04:00
parent fc4366d80f
commit 8cd56d3bef
2 changed files with 17 additions and 17 deletions

View file

@ -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];

View file

@ -34,8 +34,8 @@ void Configuration::readFile(fs::FS &fs, const char *fileName) {
callsign = data["callsign"].as<String>();
stationMode = data["stationMode"].as<int>();
iGateComment = data["iGateComment"].as<String>();
beaconInterval = data["other"]["beaconInterval"].as<int>() | 15;
rememberStationTime = data["other"]["rememberStationTime"].as<int>() | 30;
beaconInterval = data["other"]["beaconInterval"].as<int>();
rememberStationTime = data["other"]["rememberStationTime"].as<int>();
digi.comment = data["digi"]["comment"].as<String>();
digi.latitude = data["digi"]["latitude"].as<double>();
@ -43,26 +43,26 @@ void Configuration::readFile(fs::FS &fs, const char *fileName) {
aprs_is.passcode = data["aprs_is"]["passcode"].as<String>();
aprs_is.server = data["aprs_is"]["server"].as<String>();
aprs_is.port = data["aprs_is"]["port"].as<int>() | 14580;
aprs_is.reportingDistance = data["aprs_is"]["reportingDistance"].as<int>() | 30;
aprs_is.port = data["aprs_is"]["port"].as<int>();
aprs_is.reportingDistance = data["aprs_is"]["reportingDistance"].as<int>();
loramodule.iGateFreq = data["lora"]["iGateFreq"].as<long>() | 433775000;
loramodule.digirepeaterTxFreq = data["lora"]["digirepeaterTxFreq"].as<long>() | 433775000;
loramodule.digirepeaterRxFreq = data["lora"]["digirepeaterRxFreq"].as<long>() | 433900000;
loramodule.spreadingFactor = data["lora"]["spreadingFactor"].as<int>() | 12;
loramodule.signalBandwidth = data["lora"]["signalBandwidth"].as<long>() | 125000;
loramodule.codingRate4 = data["lora"]["codingRate4"].as<int>() | 5;
loramodule.power = data["lora"]["power"].as<int>() | 20;
loramodule.iGateFreq = data["lora"]["iGateFreq"].as<long>();
loramodule.digirepeaterTxFreq = data["lora"]["digirepeaterTxFreq"].as<long>();
loramodule.digirepeaterRxFreq = data["lora"]["digirepeaterRxFreq"].as<long>();
loramodule.spreadingFactor = data["lora"]["spreadingFactor"].as<int>();
loramodule.signalBandwidth = data["lora"]["signalBandwidth"].as<long>();
loramodule.codingRate4 = data["lora"]["codingRate4"].as<int>();
loramodule.power = data["lora"]["power"].as<int>();
display.alwaysOn = data["display"]["alwaysOn"].as<bool>() | true;
display.timeout = data["display"]["timeout"].as<int>() | 4;
display.turn180 = data["display"]["turn180"].as<bool>() | false;
display.alwaysOn = data["display"]["alwaysOn"].as<bool>();
display.timeout = data["display"]["timeout"].as<int>();
display.turn180 = data["display"]["turn180"].as<bool>();
syslog.active = data["syslog"]["active"].as<bool>() | false;
syslog.active = data["syslog"]["active"].as<bool>();
syslog.server = data["syslog"]["server"].as<String>();
syslog.port = data["syslog"]["port"].as<int>();
bme.active = data["bme"]["active"].as<bool>() | false;
bme.active = data["bme"]["active"].as<bool>();
configFile.close();
}