lora-aprs/LoRa_APRS_iGate
1
0
Fork 0
mirror of https://github.com/lora-aprs/LoRa_APRS_iGate.git synced 2026-01-04 07:40:14 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #19 from lora-aprs/develop_fixes

Browse source 
some little fixes which i forgot
This commit is contained in:
Peter Buchegger 2020-11-14 13:12:04 +01:00 committed by GitHub
parent ef05824ed6 327b277a95
commit eb5801d476
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
data/is-cfg.json
View file

@ -1,5 +1,4 @@
{
"version":4,
"callsign":"NOCALL-10",
"wifi":
{

6
src/LoRa_APRS_iGate.cpp
View file

@ -415,10 +415,10 @@ void setup_lora()
void setup_ntp()
{
timeClient.begin();
if(!timeClient.forceUpdate())
while(!timeClient.forceUpdate())
{
logPrintlnW("NTP Client force update issue!");
show_display("WARN", "NTP Client force update issue!", 2000);
logPrintlnW("NTP Client force update issue! Waiting 1 sek...");
show_display("WARN", "NTP Client force update issue! Waiting 1 sek...", 1000);
}
logPrintlnI("NTP Client init done!");
show_display("INFO", "NTP Client init done!", 2000);

6
src/configuration.cpp
View file

@ -48,14 +48,14 @@ Configuration ConfigurationManagement::readConfiguration()
ap.password = v["password"].as<String>();
conf.wifi.APs.push_back(ap);
}
if(data.containsKey("beacon") && data.containsKey("message"))
if(data.containsKey("beacon") && data["beacon"].containsKey("message"))
conf.beacon.message = data["beacon"]["message"].as<String>();
conf.beacon.positionLatitude = data["beacon"]["position"]["latitude"] | 0.0;
conf.beacon.positionLongitude = data["beacon"]["position"]["longitude"] | 0.0;
conf.aprs_is.active = data["aprs_is"]["active"] | false;
if(data.containsKey("aprs_is") && data.containsKey("password"))
if(data.containsKey("aprs_is") && data["aprs_is"].containsKey("password"))
conf.aprs_is.password = data["aprs_is"]["password"].as<String>();
if(data.containsKey("aprs_is") && data.containsKey("server"))
if(data.containsKey("aprs_is") && data["aprs_is"].containsKey("server"))
conf.aprs_is.server = data["aprs_is"]["server"].as<String>();
conf.aprs_is.port = data["aprs_is"]["port"] | 14580;
conf.aprs_is.beacon = data["aprs_is"]["beacon"] | true;