From a5dbb9fd778893f06afaba4427f31f47fe18861d Mon Sep 17 00:00:00 2001 From: Peter Buchegger Date: Sat, 15 May 2021 23:10:24 +0200 Subject: [PATCH] clang-format --- src/LoRa_APRS_iGate.cpp | 2 +- src/TaskAprsIs.cpp | 2 +- src/TaskAprsIs.h | 6 +++--- src/TaskModem.cpp | 2 +- src/TaskModem.h | 6 +++--- src/TaskRouter.cpp | 6 ++---- src/TaskRouter.h | 10 +++++----- 7 files changed, 16 insertions(+), 18 deletions(-) diff --git a/src/LoRa_APRS_iGate.cpp b/src/LoRa_APRS_iGate.cpp index b12443a..18e9d48 100644 --- a/src/LoRa_APRS_iGate.cpp +++ b/src/LoRa_APRS_iGate.cpp @@ -15,8 +15,8 @@ #include "TaskModem.h" #include "TaskNTP.h" #include "TaskOTA.h" -#include "TaskWifi.h" #include "TaskRouter.h" +#include "TaskWifi.h" #include "project_configuration.h" #define VERSION "21.14.0-dev" diff --git a/src/TaskAprsIs.cpp b/src/TaskAprsIs.cpp index cb79802..c7c0ca3 100644 --- a/src/TaskAprsIs.cpp +++ b/src/TaskAprsIs.cpp @@ -5,7 +5,7 @@ #include "TaskAprsIs.h" #include "project_configuration.h" -AprsIsTask::AprsIsTask(TaskQueue> * const toAprsIs) : Task(TASK_APRS_IS, TaskAprsIs), _toAprsIs(toAprsIs) { +AprsIsTask::AprsIsTask(TaskQueue> *const toAprsIs) : Task(TASK_APRS_IS, TaskAprsIs), _toAprsIs(toAprsIs) { } AprsIsTask::~AprsIsTask() { diff --git a/src/TaskAprsIs.h b/src/TaskAprsIs.h index 4e38615..229e113 100644 --- a/src/TaskAprsIs.h +++ b/src/TaskAprsIs.h @@ -8,16 +8,16 @@ class AprsIsTask : public Task { public: - AprsIsTask(TaskQueue> * const toAprsIs); + AprsIsTask(TaskQueue> *const toAprsIs); virtual ~AprsIsTask(); virtual bool setup(std::shared_ptr system) override; virtual bool loop(std::shared_ptr system) override; private: - std::shared_ptr _aprs_is; + std::shared_ptr _aprs_is; - TaskQueue> * const _toAprsIs; + TaskQueue> *const _toAprsIs; bool connect(std::shared_ptr system); }; diff --git a/src/TaskModem.cpp b/src/TaskModem.cpp index 6b78738..17dafe9 100644 --- a/src/TaskModem.cpp +++ b/src/TaskModem.cpp @@ -6,7 +6,7 @@ #include "TaskModem.h" #include "project_configuration.h" -ModemTask::ModemTask(TaskQueue> * const fromModem) : Task(TASK_MODEM, TaskModem), _fromModem(fromModem) { +ModemTask::ModemTask(TaskQueue> *const fromModem) : Task(TASK_MODEM, TaskModem), _fromModem(fromModem) { } ModemTask::~ModemTask() { diff --git a/src/TaskModem.h b/src/TaskModem.h index 8be2403..ebedcbb 100644 --- a/src/TaskModem.h +++ b/src/TaskModem.h @@ -7,15 +7,15 @@ class ModemTask : public Task { public: - ModemTask(TaskQueue> * const fromModem); + ModemTask(TaskQueue> *const fromModem); virtual ~ModemTask(); virtual bool setup(std::shared_ptr system) override; virtual bool loop(std::shared_ptr system) override; private: - std::shared_ptr _lora_aprs; - TaskQueue> * const _fromModem; + std::shared_ptr _lora_aprs; + TaskQueue> *const _fromModem; }; #endif diff --git a/src/TaskRouter.cpp b/src/TaskRouter.cpp index 4b983d9..59fcb63 100644 --- a/src/TaskRouter.cpp +++ b/src/TaskRouter.cpp @@ -7,8 +7,7 @@ String create_lat_aprs(double lat); String create_long_aprs(double lng); -RouterTask::RouterTask(TaskQueue> * const fromModem, TaskQueue> * const toAprsIs) -: Task(TASK_ROUTER, TaskRouter), _fromModem(fromModem), _toAprsIs(toAprsIs) { +RouterTask::RouterTask(TaskQueue> *const fromModem, TaskQueue> *const toAprsIs) : Task(TASK_ROUTER, TaskRouter), _fromModem(fromModem), _toAprsIs(toAprsIs) { } RouterTask::~RouterTask() { @@ -29,8 +28,7 @@ bool RouterTask::setup(std::shared_ptr system) { bool RouterTask::loop(std::shared_ptr system) { // do routing - if(!_fromModem->empty()) - { + if (!_fromModem->empty()) { _toAprsIs->addElement(_fromModem->getElement()); } diff --git a/src/TaskRouter.h b/src/TaskRouter.h index 1888ea3..e673be6 100644 --- a/src/TaskRouter.h +++ b/src/TaskRouter.h @@ -1,21 +1,21 @@ #ifndef TASK_ROUTER_H_ #define TASK_ROUTER_H_ -#include #include +#include class RouterTask : public Task { public: - RouterTask(TaskQueue> * const fromModem, TaskQueue> * const toAprsIs); + RouterTask(TaskQueue> *const fromModem, TaskQueue> *const toAprsIs); virtual ~RouterTask(); virtual bool setup(std::shared_ptr system) override; virtual bool loop(std::shared_ptr system) override; private: - TaskQueue> * const _fromModem; - TaskQueue> * const _toAprsIs; - + TaskQueue> *const _fromModem; + TaskQueue> *const _toAprsIs; + std::shared_ptr _beaconMsg; Timer _beacon_timer; };