From 2563e66b57f22ffea97e9fc1e1f60752589e289e Mon Sep 17 00:00:00 2001 From: Morgan Diepart Date: Mon, 24 Oct 2022 19:00:27 +0200 Subject: [PATCH 1/9] Disabled default syslog Why was it even enabled at this unknown address? --- data/is-cfg.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/is-cfg.json b/data/is-cfg.json index 47d6f65..9047a3b 100644 --- a/data/is-cfg.json +++ b/data/is-cfg.json @@ -76,8 +76,8 @@ "topic": "LoraAPRS/Data" }, "syslog": { - "active": true, - "server": "syslog.lora-aprs.info", + "active": false, + "server": "", "port": 514 }, "ntp_server": "pool.ntp.org" From d984dadb5dd8939ae402a60aae6ba549effcd92a Mon Sep 17 00:00:00 2001 From: Morgan Diepart Date: Tue, 25 Oct 2022 19:13:21 +0200 Subject: [PATCH 2/9] Fixed monitor flags --- platformio.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platformio.ini b/platformio.ini index 7c1aa1c..75d41b9 100644 --- a/platformio.ini +++ b/platformio.ini @@ -6,7 +6,7 @@ platform = espressif32 @ 3.1.1 framework = arduino lib_ldf_mode = deep+ monitor_speed = 115200 -monitor_flags = --raw +monitor_raw = yes lib_deps = bblanchon/ArduinoJson @ 6.17.0 lewisxhe/AXP202X_Library @ 1.1.2 From 1547d5b8b132672a6588a367b0c335f2d53cacd9 Mon Sep 17 00:00:00 2001 From: Morgan Diepart Date: Wed, 26 Oct 2022 00:43:57 +0200 Subject: [PATCH 3/9] Added watchdog timer Allows to automatically reboot the device if crashed. --- src/LoRa_APRS_iGate.cpp | 5 +++++ src/TaskOTA.cpp | 4 ++++ 2 files changed, 9 insertions(+) diff --git a/src/LoRa_APRS_iGate.cpp b/src/LoRa_APRS_iGate.cpp index da05b99..4654d46 100644 --- a/src/LoRa_APRS_iGate.cpp +++ b/src/LoRa_APRS_iGate.cpp @@ -6,6 +6,7 @@ #include #include #include +#include #include "TaskAprsIs.h" #include "TaskBeacon.h" @@ -48,6 +49,8 @@ RouterTask routerTask(fromModem, toModem, toAprsIs, toMQTT); BeaconTask beaconTask(toModem, toAprsIs); void setup() { + esp_task_wdt_init(10, true); + esp_task_wdt_add(NULL); Serial.begin(115200); LoRaSystem.getLogger().setSerial(&Serial); setWiFiLogger(&LoRaSystem.getLogger()); @@ -137,6 +140,7 @@ void setup() { } } + esp_task_wdt_reset(); LoRaSystem.getTaskManager().setup(LoRaSystem); LoRaSystem.getDisplay().showSpashScreen("LoRa APRS iGate", VERSION); @@ -166,6 +170,7 @@ void setup() { volatile bool syslogSet = false; void loop() { + esp_task_wdt_reset(); LoRaSystem.getTaskManager().loop(LoRaSystem); if (LoRaSystem.isWifiOrEthConnected() && LoRaSystem.getUserConfig()->syslog.active && !syslogSet) { LoRaSystem.getLogger().setSyslogServer(LoRaSystem.getUserConfig()->syslog.server, LoRaSystem.getUserConfig()->syslog.port, LoRaSystem.getUserConfig()->callsign); diff --git a/src/TaskOTA.cpp b/src/TaskOTA.cpp index 08f90fa..7f2d2cd 100644 --- a/src/TaskOTA.cpp +++ b/src/TaskOTA.cpp @@ -1,4 +1,5 @@ #include +#include #include "Task.h" #include "TaskOTA.h" @@ -37,6 +38,9 @@ bool OTATask::setup(System &system) { error_str = "End Failed"; } system.getLogger().log(logging::LoggerLevel::LOGGER_LEVEL_ERROR, getName(), "Error[%d]: %s", error, error_str.c_str()); + }) + .onProgress([&](unsigned int received, unsigned int total_size){ + esp_task_wdt_reset(); }); if (system.getUserConfig()->network.hostname.overwrite) { _ota.setHostname(system.getUserConfig()->network.hostname.name.c_str()); From 13e95ac4d2cb9f0f5137f86f810415a7dc78e6ad Mon Sep 17 00:00:00 2001 From: Morgan Diepart Date: Sun, 13 Nov 2022 22:27:42 +0100 Subject: [PATCH 4/9] Removed extra "%s" --- src/TaskRadiolib.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/TaskRadiolib.cpp b/src/TaskRadiolib.cpp index 295753a..f71dbb7 100644 --- a/src/TaskRadiolib.cpp +++ b/src/TaskRadiolib.cpp @@ -134,7 +134,7 @@ bool RadiolibTask::loop(System &system) { system.getLogger().log(logging::LoggerLevel::LOGGER_LEVEL_ERROR, getName(), "[%s] readData failed, code %d", timeString().c_str(), state); } else { if (str.substring(0, 3) != "<\xff\x01") { - system.getLogger().log(logging::LoggerLevel::LOGGER_LEVEL_DEBUG, getName(), "[%s] Unknown packet '%s' with RSSI %.0fdBm, SNR %.2fdB and FreqErr %fHz%s", timeString().c_str(), str.c_str(), radio->getRSSI(), radio->getSNR(), -radio->getFrequencyError()); + system.getLogger().log(logging::LoggerLevel::LOGGER_LEVEL_DEBUG, getName(), "[%s] Unknown packet '%s' with RSSI %.0fdBm, SNR %.2fdB and FreqErr %fHz", timeString().c_str(), str.c_str(), radio->getRSSI(), radio->getSNR(), -radio->getFrequencyError()); } else { std::shared_ptr msg = std::shared_ptr(new APRSMessage()); msg->decode(str.substring(3)); From c8ae26c9cfbee8ce94c8689d6c26dc9fe7136c9c Mon Sep 17 00:00:00 2001 From: Peter Buchegger Date: Wed, 16 Nov 2022 20:14:48 +0100 Subject: [PATCH 5/9] Update is-cfg.json --- data/is-cfg.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/is-cfg.json b/data/is-cfg.json index 9047a3b..63becf5 100644 --- a/data/is-cfg.json +++ b/data/is-cfg.json @@ -77,7 +77,7 @@ }, "syslog": { "active": false, - "server": "", + "server": "syslog.lora-aprs.info", "port": 514 }, "ntp_server": "pool.ntp.org" From 3ab673ceaa7bf8176636b8f7e67f5f5893a920a8 Mon Sep 17 00:00:00 2001 From: Morgan Diepart Date: Wed, 16 Nov 2022 20:22:03 +0100 Subject: [PATCH 6/9] clang format --- src/TaskOTA.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/TaskOTA.cpp b/src/TaskOTA.cpp index 7f2d2cd..b8da848 100644 --- a/src/TaskOTA.cpp +++ b/src/TaskOTA.cpp @@ -39,7 +39,7 @@ bool OTATask::setup(System &system) { } system.getLogger().log(logging::LoggerLevel::LOGGER_LEVEL_ERROR, getName(), "Error[%d]: %s", error, error_str.c_str()); }) - .onProgress([&](unsigned int received, unsigned int total_size){ + .onProgress([&](unsigned int received, unsigned int total_size) { esp_task_wdt_reset(); }); if (system.getUserConfig()->network.hostname.overwrite) { From 251a2c623ba670fc6971f5ed1a63a563bf611df6 Mon Sep 17 00:00:00 2001 From: Peter Buchegger Date: Wed, 16 Nov 2022 21:41:50 +0100 Subject: [PATCH 7/9] Update TaskOTA.cpp --- src/TaskOTA.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/TaskOTA.cpp b/src/TaskOTA.cpp index b8da848..8be9330 100644 --- a/src/TaskOTA.cpp +++ b/src/TaskOTA.cpp @@ -1,5 +1,5 @@ -#include #include +#include #include "Task.h" #include "TaskOTA.h" From b10a7fbabbe3f0b5202beba369d509842b4c6c83 Mon Sep 17 00:00:00 2001 From: Peter Buchegger Date: Wed, 16 Nov 2022 21:42:21 +0100 Subject: [PATCH 8/9] Update LoRa_APRS_iGate.cpp --- src/LoRa_APRS_iGate.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/LoRa_APRS_iGate.cpp b/src/LoRa_APRS_iGate.cpp index 4654d46..49e6822 100644 --- a/src/LoRa_APRS_iGate.cpp +++ b/src/LoRa_APRS_iGate.cpp @@ -2,11 +2,11 @@ #include #include +#include #include #include #include #include -#include #include "TaskAprsIs.h" #include "TaskBeacon.h" From c88cdb63e10e508b0114a6638adb16a3bef69808 Mon Sep 17 00:00:00 2001 From: Peter Buchegger Date: Wed, 16 Nov 2022 21:45:48 +0100 Subject: [PATCH 9/9] Update LoRa_APRS_iGate.cpp --- src/LoRa_APRS_iGate.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/LoRa_APRS_iGate.cpp b/src/LoRa_APRS_iGate.cpp index 49e6822..1665a6d 100644 --- a/src/LoRa_APRS_iGate.cpp +++ b/src/LoRa_APRS_iGate.cpp @@ -2,9 +2,9 @@ #include #include -#include #include #include +#include #include #include