From 6e54f526435a02715918ba98d6a448ba6c65dcc8 Mon Sep 17 00:00:00 2001 From: Peter Buchegger Date: Sun, 8 Nov 2020 17:43:56 +0100 Subject: [PATCH 1/3] fixing config --- src/configuration.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/configuration.cpp b/src/configuration.cpp index 257f02e..bbc8d3a 100644 --- a/src/configuration.cpp +++ b/src/configuration.cpp @@ -48,14 +48,14 @@ Configuration ConfigurationManagement::readConfiguration() ap.password = v["password"].as(); 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(); 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(); - 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(); conf.aprs_is.port = data["aprs_is"]["port"] | 14580; conf.aprs_is.beacon = data["aprs_is"]["beacon"] | true; From 1e97541c1c3a7d541e85fbda5fd9ced225a758b9 Mon Sep 17 00:00:00 2001 From: Peter Buchegger Date: Sat, 14 Nov 2020 13:02:54 +0100 Subject: [PATCH 2/3] wait for NTP client to get correct time --- src/LoRa_APRS_iGate.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/LoRa_APRS_iGate.cpp b/src/LoRa_APRS_iGate.cpp index acb2a86..0ddc08f 100644 --- a/src/LoRa_APRS_iGate.cpp +++ b/src/LoRa_APRS_iGate.cpp @@ -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); From 327b277a953c6aedb7c677f73544744fa4b8273b Mon Sep 17 00:00:00 2001 From: Peter Buchegger Date: Sat, 14 Nov 2020 13:03:57 +0100 Subject: [PATCH 3/3] remove version information in json --- data/is-cfg.json | 1 - 1 file changed, 1 deletion(-) diff --git a/data/is-cfg.json b/data/is-cfg.json index 5b91a4f..8c3ed65 100644 --- a/data/is-cfg.json +++ b/data/is-cfg.json @@ -1,5 +1,4 @@ { - "version":4, "callsign":"NOCALL-10", "wifi": {