Merge pull request #177 from toyo/master

This commit is contained in:
Peter Buchegger 2022-03-27 03:19:53 +02:00 committed by GitHub
commit e0f9f1f5a9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -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);
@ -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(&ethTask);
}
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(&ethTask);
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);