lora-aprs/LoRa_APRS_iGate
1
0
Fork 0
mirror of https://github.com/lora-aprs/LoRa_APRS_iGate.git synced 2025-12-06 07:42:00 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

clang-format

Browse source
This commit is contained in:
Peter Buchegger 2021-05-15 23:10:24 +02:00
parent 0cbf0a560c
commit a5dbb9fd77
7 changed files with 16 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/LoRa_APRS_iGate.cpp
View file

@ -15,8 +15,8 @@
#include "TaskModem.h" #include "TaskModem.h"
#include "TaskNTP.h" #include "TaskNTP.h"
#include "TaskOTA.h" #include "TaskOTA.h"
#include "TaskWifi.h"
#include "TaskRouter.h" #include "TaskRouter.h"
#include "TaskWifi.h"
#include "project_configuration.h" #include "project_configuration.h"
#define VERSION "21.14.0-dev" #define VERSION "21.14.0-dev"

2
src/TaskAprsIs.cpp
View file

@ -5,7 +5,7 @@
#include "TaskAprsIs.h" #include "TaskAprsIs.h"
#include "project_configuration.h" #include "project_configuration.h"
AprsIsTask::AprsIsTask(TaskQueue<std::shared_ptr<APRSMessage>> * const toAprsIs) : Task(TASK_APRS_IS, TaskAprsIs), _toAprsIs(toAprsIs) { AprsIsTask::AprsIsTask(TaskQueue<std::shared_ptr<APRSMessage>> *const toAprsIs) : Task(TASK_APRS_IS, TaskAprsIs), _toAprsIs(toAprsIs) {
} }
AprsIsTask::~AprsIsTask() { AprsIsTask::~AprsIsTask() {

6
src/TaskAprsIs.h
View file

@ -8,16 +8,16 @@
class AprsIsTask : public Task { class AprsIsTask : public Task {
public: public:
AprsIsTask(TaskQueue<std::shared_ptr<APRSMessage>> * const toAprsIs); AprsIsTask(TaskQueue<std::shared_ptr<APRSMessage>> *const toAprsIs);
virtual ~AprsIsTask(); virtual ~AprsIsTask();
virtual bool setup(std::shared_ptr<System> system) override; virtual bool setup(std::shared_ptr<System> system) override;
virtual bool loop(std::shared_ptr<System> system) override; virtual bool loop(std::shared_ptr<System> system) override;
private: private:
std::shared_ptr<APRS_IS> _aprs_is; std::shared_ptr<APRS_IS> _aprs_is;
TaskQueue<std::shared_ptr<APRSMessage>> * const _toAprsIs; TaskQueue<std::shared_ptr<APRSMessage>> *const _toAprsIs;
bool connect(std::shared_ptr<System> system); bool connect(std::shared_ptr<System> system);
}; };

2
src/TaskModem.cpp
View file

@ -6,7 +6,7 @@
#include "TaskModem.h" #include "TaskModem.h"
#include "project_configuration.h" #include "project_configuration.h"
ModemTask::ModemTask(TaskQueue<std::shared_ptr<APRSMessage>> * const fromModem) : Task(TASK_MODEM, TaskModem), _fromModem(fromModem) { ModemTask::ModemTask(TaskQueue<std::shared_ptr<APRSMessage>> *const fromModem) : Task(TASK_MODEM, TaskModem), _fromModem(fromModem) {
} }
ModemTask::~ModemTask() { ModemTask::~ModemTask() {

6
src/TaskModem.h
View file

@ -7,15 +7,15 @@
class ModemTask : public Task { class ModemTask : public Task {
public: public:
ModemTask(TaskQueue<std::shared_ptr<APRSMessage>> * const fromModem); ModemTask(TaskQueue<std::shared_ptr<APRSMessage>> *const fromModem);
virtual ~ModemTask(); virtual ~ModemTask();
virtual bool setup(std::shared_ptr<System> system) override; virtual bool setup(std::shared_ptr<System> system) override;
virtual bool loop(std::shared_ptr<System> system) override; virtual bool loop(std::shared_ptr<System> system) override;
private: private:
std::shared_ptr<LoRa_APRS> _lora_aprs; std::shared_ptr<LoRa_APRS> _lora_aprs;
TaskQueue<std::shared_ptr<APRSMessage>> * const _fromModem; TaskQueue<std::shared_ptr<APRSMessage>> *const _fromModem;
}; };
#endif #endif

6
src/TaskRouter.cpp
View file

@ -7,8 +7,7 @@
String create_lat_aprs(double lat); String create_lat_aprs(double lat);
String create_long_aprs(double lng); String create_long_aprs(double lng);
RouterTask::RouterTask(TaskQueue<std::shared_ptr<APRSMessage>> * const fromModem, TaskQueue<std::shared_ptr<APRSMessage>> * const toAprsIs) RouterTask::RouterTask(TaskQueue<std::shared_ptr<APRSMessage>> *const fromModem, TaskQueue<std::shared_ptr<APRSMessage>> *const toAprsIs) : Task(TASK_ROUTER, TaskRouter), _fromModem(fromModem), _toAprsIs(toAprsIs) {
: Task(TASK_ROUTER, TaskRouter), _fromModem(fromModem), _toAprsIs(toAprsIs) {
} }
RouterTask::~RouterTask() { RouterTask::~RouterTask() {
@ -29,8 +28,7 @@ bool RouterTask::setup(std::shared_ptr<System> system) {
bool RouterTask::loop(std::shared_ptr<System> system) { bool RouterTask::loop(std::shared_ptr<System> system) {
// do routing // do routing
if(!_fromModem->empty()) if (!_fromModem->empty()) {
{
_toAprsIs->addElement(_fromModem->getElement()); _toAprsIs->addElement(_fromModem->getElement());
} }

10
src/TaskRouter.h
View file

@ -1,21 +1,21 @@
#ifndef TASK_ROUTER_H_ #ifndef TASK_ROUTER_H_
#define TASK_ROUTER_H_ #define TASK_ROUTER_H_
#include <TaskManager.h>
#include <APRSMessage.h> #include <APRSMessage.h>
#include <TaskManager.h>
class RouterTask : public Task { class RouterTask : public Task {
public: public:
RouterTask(TaskQueue<std::shared_ptr<APRSMessage>> * const fromModem, TaskQueue<std::shared_ptr<APRSMessage>> * const toAprsIs); RouterTask(TaskQueue<std::shared_ptr<APRSMessage>> *const fromModem, TaskQueue<std::shared_ptr<APRSMessage>> *const toAprsIs);
virtual ~RouterTask(); virtual ~RouterTask();
virtual bool setup(std::shared_ptr<System> system) override; virtual bool setup(std::shared_ptr<System> system) override;
virtual bool loop(std::shared_ptr<System> system) override; virtual bool loop(std::shared_ptr<System> system) override;
private: private:
TaskQueue<std::shared_ptr<APRSMessage>> * const _fromModem; TaskQueue<std::shared_ptr<APRSMessage>> *const _fromModem;
TaskQueue<std::shared_ptr<APRSMessage>> * const _toAprsIs; TaskQueue<std::shared_ptr<APRSMessage>> *const _toAprsIs;
std::shared_ptr<APRSMessage> _beaconMsg; std::shared_ptr<APRSMessage> _beaconMsg;
Timer _beacon_timer; Timer _beacon_timer;
}; };