KSat/fsfw
15
4
Fork 0
forked from fsfw/fsfw
Code Issues Pull Requests 1 Releases Wiki Activity

cleaning up

Browse Source
This commit is contained in:
Robin Müller 2021-01-11 22:25:39 +01:00
parent 065f79615a
commit a8873e608c
9 changed files with 8 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
controller/ExtendedControllerBase.cpp
View File

@ -114,7 +114,6 @@ LocalPoolDataSetBase* ExtendedControllerBase::getDataSetHandle(sid_t sid) {
return nullptr; return nullptr;
} }
ProvidesDataPoolSubscriptionIF* ExtendedControllerBase::getSubsciptionInterface( ProvidesDataPoolSubscriptionIF* ExtendedControllerBase::getSubscriptionInterface() {
) {
return &localPoolManager; return &localPoolManager;
} }

2
controller/ExtendedControllerBase.h
View File

@ -32,7 +32,7 @@ public:
virtual ReturnValue_t performOperation(uint8_t opCode) override; virtual ReturnValue_t performOperation(uint8_t opCode) override;
virtual ReturnValue_t initializeAfterTaskCreation() override; virtual ReturnValue_t initializeAfterTaskCreation() override;
ProvidesDataPoolSubscriptionIF* getSubsciptionInterface() override; ProvidesDataPoolSubscriptionIF* getSubscriptionInterface() override;
protected: protected:
LocalDataPoolManager localPoolManager; LocalDataPoolManager localPoolManager;

21
datapoollocal/AccessLocalDataPoolIF.h
View File

@ -1,21 +0,0 @@
#ifndef FSFW_DATAPOOLLOCAL_ACCESSLOCALDATAPOOLIF_H_
#define FSFW_DATAPOOLLOCAL_ACCESSLOCALDATAPOOLIF_H_
#include <fsfw/datapoollocal/LocalDataPoolManager.h>
//class AccessLocalDataPoolIF {
//public:
// virtual ~AccessLocalDataPoolIF() {};
//
//protected:
//
// template <class T> ReturnValue_t fetchPoolEntry(LocalDataPoolManager& manager,
// lp_id_t localPoolId, PoolEntry<T> **poolEntry) {
// return manager.fetchPoolEntry(localPoolId, poolEntry);
// }
//
//};
#endif /* FSFW_DATAPOOLLOCAL_ACCESSLOCALDATAPOOLIF_H_ */

2
datapoollocal/HasLocalDataPoolIF.h
View File

@ -123,7 +123,7 @@ public:
* which allows subscriptions to dataset and variable updates. * which allows subscriptions to dataset and variable updates.
* @return * @return
*/ */
virtual ProvidesDataPoolSubscriptionIF* getSubsciptionInterface() = 0; virtual ProvidesDataPoolSubscriptionIF* getSubscriptionInterface() = 0;
protected: protected:
/** /**

3
datapoollocal/LocalDataPoolManager.h
View File

@ -54,10 +54,7 @@ class LocalDataPoolManager: public ProvidesDataPoolSubscriptionIF {
template<typename T> friend class LocalPoolVariable; template<typename T> friend class LocalPoolVariable;
template<typename T, uint16_t vecSize> friend class LocalPoolVector; template<typename T, uint16_t vecSize> friend class LocalPoolVector;
friend class LocalPoolDataSetBase; friend class LocalPoolDataSetBase;
//friend class AccessLocalDataPoolIF;
friend void (Factory::setStaticFrameworkObjectIds)(); friend void (Factory::setStaticFrameworkObjectIds)();
public: public:
static constexpr uint8_t INTERFACE_ID = CLASS_ID::HOUSEKEEPING_MANAGER; static constexpr uint8_t INTERFACE_ID = CLASS_ID::HOUSEKEEPING_MANAGER;

2
devicehandlers/DeviceHandlerBase.cpp
View File

@ -1533,6 +1533,6 @@ void DeviceHandlerBase::printWarningOrError(fsfw::OutputTypes errorType,
} }
ProvidesDataPoolSubscriptionIF* DeviceHandlerBase::getSubsciptionInterface() { ProvidesDataPoolSubscriptionIF* DeviceHandlerBase::getSubscriptionInterface() {
return &hkManager; return &hkManager;
} }

2
devicehandlers/DeviceHandlerBase.h
View File

@ -520,7 +520,7 @@ protected:
/** Get the HK manager object handle */ /** Get the HK manager object handle */
LocalDataPoolManager* getHkManagerHandle() override; LocalDataPoolManager* getHkManagerHandle() override;
ProvidesDataPoolSubscriptionIF* getSubsciptionInterface() override; ProvidesDataPoolSubscriptionIF* getSubscriptionInterface() override;
/** /**
* @brief Hook function for child handlers which is called once per * @brief Hook function for child handlers which is called once per

5
internalError/InternalErrorReporter.cpp
View File

@ -2,7 +2,7 @@
#include "../ipc/QueueFactory.h" #include "../ipc/QueueFactory.h"
#include "../ipc/MutexFactory.h" #include "../ipc/MutexFactory.h"
#include "../serviceinterface/ServiceInterfaceStream.h" #include "../serviceinterface/ServiceInterface.h"
InternalErrorReporter::InternalErrorReporter(object_id_t setObjectId, InternalErrorReporter::InternalErrorReporter(object_id_t setObjectId,
uint32_t messageQueueDepth): SystemObject(setObjectId), uint32_t messageQueueDepth): SystemObject(setObjectId),
@ -196,7 +196,6 @@ void InternalErrorReporter::setMutexTimeout(MutexIF::TimeoutType timeoutType,
this->timeoutMs = timeoutMs; this->timeoutMs = timeoutMs;
} }
ProvidesDataPoolSubscriptionIF* InternalErrorReporter::getSubsciptionInterface( ProvidesDataPoolSubscriptionIF* InternalErrorReporter::getSubscriptionInterface() {
) {
return &poolManager; return &poolManager;
} }

2
internalError/InternalErrorReporter.h
View File

@ -46,7 +46,7 @@ public:
virtual LocalDataPoolManager* getHkManagerHandle() override; virtual LocalDataPoolManager* getHkManagerHandle() override;
virtual dur_millis_t getPeriodicOperationFrequency() const override; virtual dur_millis_t getPeriodicOperationFrequency() const override;
virtual LocalPoolDataSetBase* getDataSetHandle(sid_t sid) override; virtual LocalPoolDataSetBase* getDataSetHandle(sid_t sid) override;
ProvidesDataPoolSubscriptionIF* getSubsciptionInterface() override; ProvidesDataPoolSubscriptionIF* getSubscriptionInterface() override;
virtual ReturnValue_t initialize() override; virtual ReturnValue_t initialize() override;
virtual ReturnValue_t initializeAfterTaskCreation() override; virtual ReturnValue_t initializeAfterTaskCreation() override;