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

remove smart pointer in APRS IS Task

Browse source
This commit is contained in:
Peter Buchegger 2021-05-21 22:41:30 +02:00
parent d96e6cebc1
commit b24f42d00a
5 changed files with 128 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/TaskAprsIs.cpp
View file

@ -11,8 +11,7 @@ AprsIsTask::~AprsIsTask() {
}
bool AprsIsTask::setup(System &system) {
_aprs_is = std::shared_ptr<APRS_IS>(new APRS_IS(system.getUserConfig()->callsign, system.getUserConfig()->aprs_is.passcode, "ESP32-APRS-IS", "0.2"));
_aprs_is.setup(system.getUserConfig()->callsign, system.getUserConfig()->aprs_is.passcode, "ESP32-APRS-IS", "0.2");
return true;
}
@ -20,7 +19,7 @@ bool AprsIsTask::loop(System &system) {
if (!system.isWifiEthConnected()) {
return false;
}
if (!_aprs_is->connected()) {
if (!_aprs_is.connected()) {
if (!connect(system)) {
_stateInfo = "not connected";
_state = Error;
@ -31,11 +30,11 @@ bool AprsIsTask::loop(System &system) {
return false;
}
_aprs_is->getAPRSMessage();
_aprs_is.getAPRSMessage();
if (!_toAprsIs.empty()) {
std::shared_ptr<APRSMessage> msg = _toAprsIs.getElement();
_aprs_is->sendMessage(msg);
_aprs_is.sendMessage(msg);
}
return true;
@ -46,7 +45,7 @@ bool AprsIsTask::connect(System &system) {
logPrintI(system.getUserConfig()->aprs_is.server);
logPrintI(" on port: ");
logPrintlnI(String(system.getUserConfig()->aprs_is.port));
if (!_aprs_is->connect(system.getUserConfig()->aprs_is.server, system.getUserConfig()->aprs_is.port)) {
if (!_aprs_is.connect(system.getUserConfig()->aprs_is.server, system.getUserConfig()->aprs_is.port)) {
logPrintlnE("Connection failed.");
return false;
}

2
src/TaskAprsIs.h
View file

@ -15,7 +15,7 @@ public:
virtual bool loop(System &system) override;
private:
std::shared_ptr<APRS_IS> _aprs_is;
APRS_IS _aprs_is;
TaskQueue<std::shared_ptr<APRSMessage>> &_toAprsIs;