From a8873e608c7f86ca544221b02b583e664584c803 Mon Sep 17 00:00:00 2001 From: "Robin.Mueller" Date: Mon, 11 Jan 2021 22:25:39 +0100 Subject: [PATCH] cleaning up --- controller/ExtendedControllerBase.cpp | 3 +-- controller/ExtendedControllerBase.h | 2 +- datapoollocal/AccessLocalDataPoolIF.h | 21 --------------------- datapoollocal/HasLocalDataPoolIF.h | 2 +- datapoollocal/LocalDataPoolManager.h | 3 --- devicehandlers/DeviceHandlerBase.cpp | 2 +- devicehandlers/DeviceHandlerBase.h | 2 +- internalError/InternalErrorReporter.cpp | 5 ++--- internalError/InternalErrorReporter.h | 2 +- 9 files changed, 8 insertions(+), 34 deletions(-) delete mode 100644 datapoollocal/AccessLocalDataPoolIF.h diff --git a/controller/ExtendedControllerBase.cpp b/controller/ExtendedControllerBase.cpp index 101ac558..3759d9c7 100644 --- a/controller/ExtendedControllerBase.cpp +++ b/controller/ExtendedControllerBase.cpp @@ -114,7 +114,6 @@ LocalPoolDataSetBase* ExtendedControllerBase::getDataSetHandle(sid_t sid) { return nullptr; } -ProvidesDataPoolSubscriptionIF* ExtendedControllerBase::getSubsciptionInterface( - ) { +ProvidesDataPoolSubscriptionIF* ExtendedControllerBase::getSubscriptionInterface() { return &localPoolManager; } diff --git a/controller/ExtendedControllerBase.h b/controller/ExtendedControllerBase.h index ec8d149d..7e6d32da 100644 --- a/controller/ExtendedControllerBase.h +++ b/controller/ExtendedControllerBase.h @@ -32,7 +32,7 @@ public: virtual ReturnValue_t performOperation(uint8_t opCode) override; virtual ReturnValue_t initializeAfterTaskCreation() override; - ProvidesDataPoolSubscriptionIF* getSubsciptionInterface() override; + ProvidesDataPoolSubscriptionIF* getSubscriptionInterface() override; protected: LocalDataPoolManager localPoolManager; diff --git a/datapoollocal/AccessLocalDataPoolIF.h b/datapoollocal/AccessLocalDataPoolIF.h deleted file mode 100644 index 5bed34ad..00000000 --- a/datapoollocal/AccessLocalDataPoolIF.h +++ /dev/null @@ -1,21 +0,0 @@ -#ifndef FSFW_DATAPOOLLOCAL_ACCESSLOCALDATAPOOLIF_H_ -#define FSFW_DATAPOOLLOCAL_ACCESSLOCALDATAPOOLIF_H_ - -#include - - -//class AccessLocalDataPoolIF { -//public: -// virtual ~AccessLocalDataPoolIF() {}; -// -//protected: -// -// template ReturnValue_t fetchPoolEntry(LocalDataPoolManager& manager, -// lp_id_t localPoolId, PoolEntry **poolEntry) { -// return manager.fetchPoolEntry(localPoolId, poolEntry); -// } -// -//}; - - -#endif /* FSFW_DATAPOOLLOCAL_ACCESSLOCALDATAPOOLIF_H_ */ diff --git a/datapoollocal/HasLocalDataPoolIF.h b/datapoollocal/HasLocalDataPoolIF.h index 215ac8a5..263a4e79 100644 --- a/datapoollocal/HasLocalDataPoolIF.h +++ b/datapoollocal/HasLocalDataPoolIF.h @@ -123,7 +123,7 @@ public: * which allows subscriptions to dataset and variable updates. * @return */ - virtual ProvidesDataPoolSubscriptionIF* getSubsciptionInterface() = 0; + virtual ProvidesDataPoolSubscriptionIF* getSubscriptionInterface() = 0; protected: /** diff --git a/datapoollocal/LocalDataPoolManager.h b/datapoollocal/LocalDataPoolManager.h index 8571aa02..6a87e716 100644 --- a/datapoollocal/LocalDataPoolManager.h +++ b/datapoollocal/LocalDataPoolManager.h @@ -54,10 +54,7 @@ class LocalDataPoolManager: public ProvidesDataPoolSubscriptionIF { template friend class LocalPoolVariable; template friend class LocalPoolVector; friend class LocalPoolDataSetBase; - //friend class AccessLocalDataPoolIF; friend void (Factory::setStaticFrameworkObjectIds)(); - - public: static constexpr uint8_t INTERFACE_ID = CLASS_ID::HOUSEKEEPING_MANAGER; diff --git a/devicehandlers/DeviceHandlerBase.cpp b/devicehandlers/DeviceHandlerBase.cpp index de45c7d4..8f64dd25 100644 --- a/devicehandlers/DeviceHandlerBase.cpp +++ b/devicehandlers/DeviceHandlerBase.cpp @@ -1533,6 +1533,6 @@ void DeviceHandlerBase::printWarningOrError(fsfw::OutputTypes errorType, } -ProvidesDataPoolSubscriptionIF* DeviceHandlerBase::getSubsciptionInterface() { +ProvidesDataPoolSubscriptionIF* DeviceHandlerBase::getSubscriptionInterface() { return &hkManager; } diff --git a/devicehandlers/DeviceHandlerBase.h b/devicehandlers/DeviceHandlerBase.h index 556c23a2..19084358 100644 --- a/devicehandlers/DeviceHandlerBase.h +++ b/devicehandlers/DeviceHandlerBase.h @@ -520,7 +520,7 @@ protected: /** Get the HK manager object handle */ LocalDataPoolManager* getHkManagerHandle() override; - ProvidesDataPoolSubscriptionIF* getSubsciptionInterface() override; + ProvidesDataPoolSubscriptionIF* getSubscriptionInterface() override; /** * @brief Hook function for child handlers which is called once per diff --git a/internalError/InternalErrorReporter.cpp b/internalError/InternalErrorReporter.cpp index 16c6412b..6c722789 100644 --- a/internalError/InternalErrorReporter.cpp +++ b/internalError/InternalErrorReporter.cpp @@ -2,7 +2,7 @@ #include "../ipc/QueueFactory.h" #include "../ipc/MutexFactory.h" -#include "../serviceinterface/ServiceInterfaceStream.h" +#include "../serviceinterface/ServiceInterface.h" InternalErrorReporter::InternalErrorReporter(object_id_t setObjectId, uint32_t messageQueueDepth): SystemObject(setObjectId), @@ -196,7 +196,6 @@ void InternalErrorReporter::setMutexTimeout(MutexIF::TimeoutType timeoutType, this->timeoutMs = timeoutMs; } -ProvidesDataPoolSubscriptionIF* InternalErrorReporter::getSubsciptionInterface( - ) { +ProvidesDataPoolSubscriptionIF* InternalErrorReporter::getSubscriptionInterface() { return &poolManager; } diff --git a/internalError/InternalErrorReporter.h b/internalError/InternalErrorReporter.h index 1fcf733f..8085d918 100644 --- a/internalError/InternalErrorReporter.h +++ b/internalError/InternalErrorReporter.h @@ -46,7 +46,7 @@ public: virtual LocalDataPoolManager* getHkManagerHandle() override; virtual dur_millis_t getPeriodicOperationFrequency() const override; virtual LocalPoolDataSetBase* getDataSetHandle(sid_t sid) override; - ProvidesDataPoolSubscriptionIF* getSubsciptionInterface() override; + ProvidesDataPoolSubscriptionIF* getSubscriptionInterface() override; virtual ReturnValue_t initialize() override; virtual ReturnValue_t initializeAfterTaskCreation() override;