From d8d0a0a2827b908d5ea72ccb35a13f437f171d20 Mon Sep 17 00:00:00 2001 From: FUJIURA Toyonori Date: Sun, 27 Mar 2022 10:02:37 +0900 Subject: [PATCH 1/2] syslog doesn't work properly if aprs_is is false. --- src/LoRa_APRS_iGate.cpp | 29 ++++++++++++++++++----------- 1 file changed, 18 insertions(+), 11 deletions(-) diff --git a/src/LoRa_APRS_iGate.cpp b/src/LoRa_APRS_iGate.cpp index 62355c98..b3cbeef1 100644 --- a/src/LoRa_APRS_iGate.cpp +++ b/src/LoRa_APRS_iGate.cpp @@ -109,23 +109,30 @@ void setup() { LoRaSystem.getTaskManager().addTask(&routerTask); LoRaSystem.getTaskManager().addTask(&beaconTask); - if (userConfig.aprs_is.active) { - if (boardConfig->Type == eETH_BOARD && !userConfig.wifi.active) { - LoRaSystem.getTaskManager().addAlwaysRunTask(ðTask); - } - if (userConfig.wifi.active) { - LoRaSystem.getTaskManager().addAlwaysRunTask(&wifiTask); - } + bool tcpip = false; + + if (userConfig.wifi.active) { + LoRaSystem.getTaskManager().addAlwaysRunTask(&wifiTask); LoRaSystem.getTaskManager().addTask(&otaTask); + tcpip = true; + } else if (boardConfig->Type == eETH_BOARD) { + LoRaSystem.getTaskManager().addAlwaysRunTask(ðTask); + tcpip = true; + } + + if (tcpip) { LoRaSystem.getTaskManager().addTask(&ntpTask); if (userConfig.ftp.active) { LoRaSystem.getTaskManager().addTask(&ftpTask); } - LoRaSystem.getTaskManager().addTask(&aprsIsTask); - } - if (userConfig.mqtt.active) { - LoRaSystem.getTaskManager().addTask(&mqttTask); + if (userConfig.aprs_is.active) { + LoRaSystem.getTaskManager().addTask(&aprsIsTask); + } + + if (userConfig.mqtt.active) { + LoRaSystem.getTaskManager().addTask(&mqttTask); + } } LoRaSystem.getTaskManager().setup(LoRaSystem); From 8277fd228e2bd12a22ddc6e9ee7172ad09979537 Mon Sep 17 00:00:00 2001 From: FUJIURA Toyonori Date: Sun, 27 Mar 2022 10:05:25 +0900 Subject: [PATCH 2/2] Change VERSION. --- 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 b3cbeef1..b839e471 100644 --- a/src/LoRa_APRS_iGate.cpp +++ b/src/LoRa_APRS_iGate.cpp @@ -20,7 +20,7 @@ #include "TaskWifi.h" #include "project_configuration.h" -#define VERSION "22.12.2" +#define VERSION "22.12.3" #define MODULE_NAME "Main" String create_lat_aprs(double lat);