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

big changes:

Browse source 
- task manager working now in round robbin and returning after every task to arduino
- adding a system class which is managing all bigger things
This commit is contained in:
Peter Buchegger 2021-03-21 22:29:31 +01:00
parent 5a1a091fc7
commit 52d41dd9f6
27 changed files with 216 additions and 121 deletions
Download patch file Download diff file Expand all files Collapse all files

35
src/LoRa_APRS_iGate.cpp
View file

@ -2,6 +2,7 @@
#include <APRS-IS.h>
#include <BoardFinder.h>
#include <System.h>
#include <TaskManager.h>
#include <TimeLib.h>
#include <logger.h>
@ -22,9 +23,8 @@
String create_lat_aprs(double lat);
String create_long_aprs(double lng);
std::shared_ptr<Configuration> userConfig;
std::shared_ptr<BoardConfig> boardConfig;
HardwareSerial Serial(0);
std::shared_ptr<System> LoRaSystem;
HardwareSerial Serial(0);
// cppcheck-suppress unusedFunction
void setup() {
@ -35,7 +35,7 @@ void setup() {
logPrintlnW("Version: " VERSION);
ProjectConfigurationManagement confmg;
userConfig = confmg.readConfiguration();
std::shared_ptr<Configuration> userConfig = confmg.readConfiguration();
std::list<std::shared_ptr<BoardConfig>> boardConfigs;
// clang-format off
@ -49,8 +49,8 @@ void setup() {
boardConfigs.push_back(std::shared_ptr<BoardConfig>(new BoardConfig("HELTEC_WIFI_LORA_32_V2", eHELTEC_WIFI_LORA_32_V2, 4, 15, 0x3C, 16, 5, 19, 27, 18, 14, 26)));
// clang-format on
BoardFinder finder(boardConfigs);
boardConfig = finder.getBoardConfig(userConfig->board);
BoardFinder finder(boardConfigs);
std::shared_ptr<BoardConfig> boardConfig = finder.getBoardConfig(userConfig->board);
if (boardConfig == 0) {
boardConfig = finder.searchBoardConfig();
if (boardConfig == 0) {
@ -81,24 +81,25 @@ void setup() {
}
load_config(boardConfig);
LoRaSystem = std::shared_ptr<System>(new System(boardConfig, userConfig));
TaskManager::instance().addTask(std::shared_ptr<Task>(new DisplayTask()));
TaskManager::instance().addTask(std::shared_ptr<Task>(new LoraTask()));
LoRaSystem->getTaskManager().addTask(std::shared_ptr<Task>(new DisplayTask()));
LoRaSystem->getTaskManager().addTask(std::shared_ptr<Task>(new LoraTask()));
if (boardConfig->Type == eETH_BOARD) {
TaskManager::instance().addTask(std::shared_ptr<Task>(new EthTask()));
LoRaSystem->getTaskManager().addTask(std::shared_ptr<Task>(new EthTask()));
} else {
TaskManager::instance().addTask(std::shared_ptr<Task>(new WifiTask()));
LoRaSystem->getTaskManager().addTask(std::shared_ptr<Task>(new WifiTask()));
}
TaskManager::instance().addTask(std::shared_ptr<Task>(new OTATask()));
TaskManager::instance().addTask(std::shared_ptr<Task>(new NTPTask()));
LoRaSystem->getTaskManager().addTask(std::shared_ptr<Task>(new OTATask()));
LoRaSystem->getTaskManager().addTask(std::shared_ptr<Task>(new NTPTask()));
if (userConfig->ftp.active) {
TaskManager::instance().addTask(std::shared_ptr<Task>(new FTPTask()));
LoRaSystem->getTaskManager().addTask(std::shared_ptr<Task>(new FTPTask()));
}
TaskManager::instance().addTask(std::shared_ptr<Task>(new AprsIsTask()));
LoRaSystem->getTaskManager().addTask(std::shared_ptr<Task>(new AprsIsTask()));
TaskManager::instance().setup(userConfig, boardConfig);
LoRaSystem->getTaskManager().setup(LoRaSystem);
Display::instance().showSpashScreen("LoRa APRS iGate", VERSION);
LoRaSystem->getDisplay().showSpashScreen("LoRa APRS iGate", VERSION);
if (userConfig->display.overwritePin != 0) {
pinMode(userConfig->display.overwritePin, INPUT);
@ -111,7 +112,7 @@ void setup() {
// cppcheck-suppress unusedFunction
void loop() {
TaskManager::instance().loop(userConfig);
LoRaSystem->getTaskManager().loop(LoRaSystem);
}
String create_lat_aprs(double lat) {

28
src/TaskAprsIs.cpp
View file

@ -14,23 +14,23 @@ AprsIsTask::AprsIsTask() : Task(TASK_APRS_IS, TaskAprsIs) {
AprsIsTask::~AprsIsTask() {
}
bool AprsIsTask::setup(std::shared_ptr<Configuration> config, std::shared_ptr<BoardConfig> boardConfig) {
_beacon_timer.setTimeout(minutesToTime_t(config->beacon.timeout));
_aprs_is = std::shared_ptr<APRS_IS>(new APRS_IS(config->callsign, config->aprs_is.passcode, "ESP32-APRS-IS", "0.2"));
bool AprsIsTask::setup(std::shared_ptr<System> system) {
_beacon_timer.setTimeout(minutesToTime_t(system->getUserConfig()->beacon.timeout));
_aprs_is = std::shared_ptr<APRS_IS>(new APRS_IS(system->getUserConfig()->callsign, system->getUserConfig()->aprs_is.passcode, "ESP32-APRS-IS", "0.2"));
_beaconMsg = std::shared_ptr<APRSMessage>(new APRSMessage());
_beaconMsg->setSource(config->callsign);
_beaconMsg->setSource(system->getUserConfig()->callsign);
_beaconMsg->setDestination("APLG01");
String lat = create_lat_aprs(config->beacon.positionLatitude);
String lng = create_long_aprs(config->beacon.positionLongitude);
_beaconMsg->getBody()->setData(String("=") + lat + "L" + lng + "&" + config->beacon.message);
String lat = create_lat_aprs(system->getUserConfig()->beacon.positionLatitude);
String lng = create_long_aprs(system->getUserConfig()->beacon.positionLongitude);
_beaconMsg->getBody()->setData(String("=") + lat + "L" + lng + "&" + system->getUserConfig()->beacon.message);
return true;
}
bool AprsIsTask::loop(std::shared_ptr<Configuration> config) {
bool AprsIsTask::loop(std::shared_ptr<System> system) {
if (!_aprs_is->connected()) {
if (!connect(config)) {
if (!connect(system)) {
_stateInfo = "not connected";
_state = Error;
return false;
@ -51,7 +51,7 @@ bool AprsIsTask::loop(std::shared_ptr<Configuration> config) {
logPrintD("[" + timeString() + "] ");
logPrintlnD(_beaconMsg->encode());
_aprs_is->sendMessage(_beaconMsg);
Display::instance().addFrame(std::shared_ptr<DisplayFrame>(new TextFrame("BEACON", _beaconMsg->toString())));
system->getDisplay().addFrame(std::shared_ptr<DisplayFrame>(new TextFrame("BEACON", _beaconMsg->toString())));
_beacon_timer.start();
}
time_t diff = _beacon_timer.getTriggerTime() - now();
@ -60,12 +60,12 @@ bool AprsIsTask::loop(std::shared_ptr<Configuration> config) {
return true;
}
bool AprsIsTask::connect(std::shared_ptr<Configuration> config) {
bool AprsIsTask::connect(std::shared_ptr<System> system) {
logPrintI("connecting to APRS-IS server: ");
logPrintI(config->aprs_is.server);
logPrintI(system->getUserConfig()->aprs_is.server);
logPrintI(" on port: ");
logPrintlnI(String(config->aprs_is.port));
if (!_aprs_is->connect(config->aprs_is.server, config->aprs_is.port)) {
logPrintlnI(String(system->getUserConfig()->aprs_is.port));
if (!_aprs_is->connect(system->getUserConfig()->aprs_is.server, system->getUserConfig()->aprs_is.port)) {
logPrintlnE("Connection failed.");
return false;
}

6
src/TaskAprsIs.h
View file

@ -11,8 +11,8 @@ public:
AprsIsTask();
virtual ~AprsIsTask();
virtual bool setup(std::shared_ptr<Configuration> config, std::shared_ptr<BoardConfig> boardConfig) override;
virtual bool loop(std::shared_ptr<Configuration> config) override;
virtual bool setup(std::shared_ptr<System> system) override;
virtual bool loop(std::shared_ptr<System> system) override;
TaskQueue<std::shared_ptr<APRSMessage>> inputQueue;
@ -21,7 +21,7 @@ private:
std::shared_ptr<APRSMessage> _beaconMsg;
Timer _beacon_timer;
bool connect(std::shared_ptr<Configuration> config);
bool connect(std::shared_ptr<System> system);
};
#endif

24
src/TaskDisplay.cpp
View file

@ -10,22 +10,22 @@ DisplayTask::DisplayTask() : Task("DisplayTask", 0) {
DisplayTask::~DisplayTask() {
}
bool DisplayTask::setup(std::shared_ptr<Configuration> config, std::shared_ptr<BoardConfig> boardConfig) {
Display::instance().setup(boardConfig);
if (config->display.turn180) {
Display::instance().turn180();
bool DisplayTask::setup(std::shared_ptr<System> system) {
system->getDisplay().setup(system->getBoardConfig());
if (system->getUserConfig()->display.turn180) {
system->getDisplay().turn180();
}
std::shared_ptr<StatusFrame> statusFrame = std::shared_ptr<StatusFrame>(new StatusFrame(TaskManager::instance().getTasks()));
Display::instance().setStatusFrame(statusFrame);
if (!config->display.alwaysOn) {
Display::instance().activateDisplaySaveMode();
Display::instance().setDisplayTimeout(config->display.timeout);
std::shared_ptr<StatusFrame> statusFrame = std::shared_ptr<StatusFrame>(new StatusFrame(system->getTaskManager().getTasks()));
system->getDisplay().setStatusFrame(statusFrame);
if (!system->getUserConfig()->display.alwaysOn) {
system->getDisplay().activateDisplaySaveMode();
system->getDisplay().setDisplayTimeout(system->getUserConfig()->display.timeout);
}
_stateInfo = config->callsign;
_stateInfo = system->getUserConfig()->callsign;
return true;
}
bool DisplayTask::loop(std::shared_ptr<Configuration> config) {
Display::instance().update();
bool DisplayTask::loop(std::shared_ptr<System> system) {
system->getDisplay().update();
return true;
}

4
src/TaskDisplay.h
View file

@ -9,8 +9,8 @@ public:
DisplayTask();
virtual ~DisplayTask();
virtual bool setup(std::shared_ptr<Configuration> config, std::shared_ptr<BoardConfig> boardConfig) override;
virtual bool loop(std::shared_ptr<Configuration> config) override;
virtual bool setup(std::shared_ptr<System> system) override;
virtual bool loop(std::shared_ptr<System> system) override;
};
#endif

4
src/TaskEth.cpp
View file

@ -48,7 +48,7 @@ EthTask::EthTask() : Task(TASK_ETH, TaskEth) {
EthTask::~EthTask() {
}
bool EthTask::setup(std::shared_ptr<Configuration> config, std::shared_ptr<BoardConfig> boardConfig) {
bool EthTask::setup(std::shared_ptr<System> system) {
WiFi.onEvent(WiFiEvent);
constexpr uint8_t ETH_NRST = 5;
@ -73,7 +73,7 @@ bool EthTask::setup(std::shared_ptr<Configuration> config, std::shared_ptr<Board
return true;
}
bool EthTask::loop(std::shared_ptr<Configuration> config) {
bool EthTask::loop(std::shared_ptr<System> system) {
if (!eth_connected) {
_stateInfo = "Ethernet not connected";
_state = Error;

4
src/TaskEth.h
View file

@ -8,8 +8,8 @@ public:
EthTask();
virtual ~EthTask();
virtual bool setup(std::shared_ptr<Configuration> config, std::shared_ptr<BoardConfig> boardConfig) override;
virtual bool loop(std::shared_ptr<Configuration> config) override;
virtual bool setup(std::shared_ptr<System> system) override;
virtual bool loop(std::shared_ptr<System> system) override;
private:
};

6
src/TaskFTP.cpp
View file

@ -12,9 +12,9 @@ FTPTask::FTPTask() : Task(TASK_FTP, TaskFtp), _beginCalled(false) {
FTPTask::~FTPTask() {
}
bool FTPTask::setup(std::shared_ptr<Configuration> config, std::shared_ptr<BoardConfig> boardConfig) {
bool FTPTask::setup(std::shared_ptr<System> system) {
_ftpServer = std::shared_ptr<FTPServer>(new FTPServer());
for (Configuration::Ftp::User user : config->ftp.users) {
for (Configuration::Ftp::User user : system->getUserConfig()->ftp.users) {
logPrintD("Adding user to FTP Server: ");
logPrintlnD(user.name);
_ftpServer->addUser(user.name, user.password);
@ -24,7 +24,7 @@ bool FTPTask::setup(std::shared_ptr<Configuration> config, std::shared_ptr<Board
return true;
}
bool FTPTask::loop(std::shared_ptr<Configuration> config) {
bool FTPTask::loop(std::shared_ptr<System> system) {
if (!_beginCalled) {
_ftpServer->begin();
_beginCalled = true;

4
src/TaskFTP.h
View file

@ -9,8 +9,8 @@ public:
FTPTask();
virtual ~FTPTask();
virtual bool setup(std::shared_ptr<Configuration> config, std::shared_ptr<BoardConfig> boardConfig) override;
virtual bool loop(std::shared_ptr<Configuration> config) override;
virtual bool setup(std::shared_ptr<System> system) override;
virtual bool loop(std::shared_ptr<System> system) override;
private:
std::shared_ptr<FTPServer> _ftpServer;

22
src/TaskLora.cpp
View file

@ -12,8 +12,8 @@ LoraTask::LoraTask() : Task(TASK_LORA, TaskLora) {
LoraTask::~LoraTask() {
}
bool LoraTask::setup(std::shared_ptr<Configuration> config, std::shared_ptr<BoardConfig> boardConfig) {
_lora_aprs = std::shared_ptr<LoRa_APRS>(new LoRa_APRS(boardConfig));
bool LoraTask::setup(std::shared_ptr<System> system) {
_lora_aprs = std::shared_ptr<LoRa_APRS>(new LoRa_APRS(system->getBoardConfig()));
if (!_lora_aprs->begin(_lora_aprs->getRxFrequency())) {
logPrintlnE("Starting LoRa failed!");
_stateInfo = "LoRa-Modem failed";
@ -21,19 +21,19 @@ bool LoraTask::setup(std::shared_ptr<Configuration> config, std::shared_ptr<Boar
while (true)
;
}
_lora_aprs->setRxFrequency(config->lora.frequencyRx);
_lora_aprs->setTxFrequency(config->lora.frequencyTx);
_lora_aprs->setTxPower(config->lora.power);
_lora_aprs->setSpreadingFactor(config->lora.spreadingFactor);
_lora_aprs->setSignalBandwidth(config->lora.signalBandwidth);
_lora_aprs->setCodingRate4(config->lora.codingRate4);
_lora_aprs->setRxFrequency(system->getUserConfig()->lora.frequencyRx);
_lora_aprs->setTxFrequency(system->getUserConfig()->lora.frequencyTx);
_lora_aprs->setTxPower(system->getUserConfig()->lora.power);
_lora_aprs->setSpreadingFactor(system->getUserConfig()->lora.spreadingFactor);
_lora_aprs->setSignalBandwidth(system->getUserConfig()->lora.signalBandwidth);
_lora_aprs->setCodingRate4(system->getUserConfig()->lora.codingRate4);
_lora_aprs->enableCrc();
_stateInfo = "";
return true;
}
bool LoraTask::loop(std::shared_ptr<Configuration> config) {
bool LoraTask::loop(std::shared_ptr<System> system) {
if (_lora_aprs->checkMessage()) {
std::shared_ptr<APRSMessage> msg = _lora_aprs->getMessage();
// msg->getAPRSBody()->setData(msg->getAPRSBody()->getData() + " 123");
@ -44,9 +44,9 @@ bool LoraTask::loop(std::shared_ptr<Configuration> config) {
logPrintD(String(_lora_aprs->packetRssi()));
logPrintD(" and SNR ");
logPrintlnD(String(_lora_aprs->packetSnr()));
std::shared_ptr<AprsIsTask> is_thread = std::static_pointer_cast<AprsIsTask>(TaskManager::instance().getTask(TASK_APRS_IS));
std::shared_ptr<AprsIsTask> is_thread = std::static_pointer_cast<AprsIsTask>(system->getTaskManager().getTask(TASK_APRS_IS));
is_thread->inputQueue.addElement(msg);
Display::instance().addFrame(std::shared_ptr<DisplayFrame>(new TextFrame("LoRa", msg->toString())));
system->getDisplay().addFrame(std::shared_ptr<DisplayFrame>(new TextFrame("LoRa", msg->toString())));
}
if (!inputQueue.empty()) {

4
src/TaskLora.h
View file

@ -10,8 +10,8 @@ public:
LoraTask();
virtual ~LoraTask();
virtual bool setup(std::shared_ptr<Configuration> config, std::shared_ptr<BoardConfig> boardConfig) override;
virtual bool loop(std::shared_ptr<Configuration> config) override;
virtual bool setup(std::shared_ptr<System> system) override;
virtual bool loop(std::shared_ptr<System> system) override;
TaskQueue<std::shared_ptr<APRSMessage>> inputQueue;

6
src/TaskNTP.cpp
View file

@ -11,12 +11,12 @@ NTPTask::NTPTask() : Task(TASK_NTP, TaskNtp), _beginCalled(false) {
NTPTask::~NTPTask() {
}
bool NTPTask::setup(std::shared_ptr<Configuration> config, std::shared_ptr<BoardConfig> boardConfig) {
_ntpClient = std::shared_ptr<NTPClient>(new NTPClient(config->ntpServer.c_str()));
bool NTPTask::setup(std::shared_ptr<System> system) {
_ntpClient = std::shared_ptr<NTPClient>(new NTPClient(system->getUserConfig()->ntpServer.c_str()));
return true;
}
bool NTPTask::loop(std::shared_ptr<Configuration> config) {
bool NTPTask::loop(std::shared_ptr<System> system) {
if (!_beginCalled) {
_ntpClient->begin();
_beginCalled = true;

4
src/TaskNTP.h
View file

@ -9,8 +9,8 @@ public:
NTPTask();
virtual ~NTPTask();
virtual bool setup(std::shared_ptr<Configuration> config, std::shared_ptr<BoardConfig> boardConfig) override;
virtual bool loop(std::shared_ptr<Configuration> config) override;
virtual bool setup(std::shared_ptr<System> system) override;
virtual bool loop(std::shared_ptr<System> system) override;
private:
std::shared_ptr<NTPClient> _ntpClient;

6
src/TaskOTA.cpp
View file

@ -10,7 +10,7 @@ OTATask::OTATask() : Task(TASK_OTA, TaskOta), _beginCalled(false) {
OTATask::~OTATask() {
}
bool OTATask::setup(std::shared_ptr<Configuration> config, std::shared_ptr<BoardConfig> boardConfig) {
bool OTATask::setup(std::shared_ptr<System> system) {
_ota = std::shared_ptr<ArduinoOTAClass>(new ArduinoOTAClass());
_ota->onStart([&]() {
String type;
@ -44,12 +44,12 @@ bool OTATask::setup(std::shared_ptr<Configuration> config, std::shared_ptr<Board
else if (error == OTA_END_ERROR)
logPrintlnE("End Failed");
});
_ota->setHostname(config->callsign.c_str());
_ota->setHostname(system->getUserConfig()->callsign.c_str());
_stateInfo = "";
return true;
}
bool OTATask::loop(std::shared_ptr<Configuration> config) {
bool OTATask::loop(std::shared_ptr<System> system) {
if (!_beginCalled) {
_ota->begin();
_beginCalled = true;

4
src/TaskOTA.h
View file

@ -9,8 +9,8 @@ public:
OTATask();
virtual ~OTATask();
virtual bool setup(std::shared_ptr<Configuration> config, std::shared_ptr<BoardConfig> boardConfig) override;
virtual bool loop(std::shared_ptr<Configuration> config) override;
virtual bool setup(std::shared_ptr<System> system) override;
virtual bool loop(std::shared_ptr<System> system) override;
private:
std::shared_ptr<ArduinoOTAClass> _ota;

8
src/TaskWifi.cpp
View file

@ -11,12 +11,12 @@ WifiTask::WifiTask() : Task(TASK_WIFI, TaskWifi), _oldWifiStatus(WL_IDLE_STATUS)
WifiTask::~WifiTask() {
}
bool WifiTask::setup(std::shared_ptr<Configuration> config, std::shared_ptr<BoardConfig> boardConfig) {
bool WifiTask::setup(std::shared_ptr<System> system) {
// WiFi.onEvent(WiFiEvent);
WiFi.setHostname(config->callsign.c_str());
WiFi.setHostname(system->getUserConfig()->callsign.c_str());
_wiFiMulti = std::shared_ptr<WiFiMulti>(new WiFiMulti());
;
for (Configuration::Wifi::AP ap : config->wifi.APs) {
for (Configuration::Wifi::AP ap : system->getUserConfig()->wifi.APs) {
logPrintD("Looking for AP: ");
logPrintlnD(ap.SSID);
_wiFiMulti->addAP(ap.SSID.c_str(), ap.password.c_str());
@ -24,7 +24,7 @@ bool WifiTask::setup(std::shared_ptr<Configuration> config, std::shared_ptr<Boar
return true;
}
bool WifiTask::loop(std::shared_ptr<Configuration> config) {
bool WifiTask::loop(std::shared_ptr<System> system) {
const uint8_t wifi_status = _wiFiMulti->run();
if (wifi_status != WL_CONNECTED) {
logPrintlnE("WiFi not connected!");

4
src/TaskWifi.h
View file

@ -9,8 +9,8 @@ public:
WifiTask();
virtual ~WifiTask();
virtual bool setup(std::shared_ptr<Configuration> config, std::shared_ptr<BoardConfig> boardConfig) override;
virtual bool loop(std::shared_ptr<Configuration> config) override;
virtual bool setup(std::shared_ptr<System> system) override;
virtual bool loop(std::shared_ptr<System> system) override;
private:
std::shared_ptr<WiFiMulti> _wiFiMulti;