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

reverted some stuff

Browse Source
This commit is contained in:
Robin Müller 2021-01-11 22:18:42 +01:00
parent 037bd83af9
commit 5bc46bae02
6 changed files with 21 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
datapool/PoolDataSetBase.h
View File

@ -3,6 +3,7 @@
#include "PoolDataSetIF.h" #include "PoolDataSetIF.h"
#include "PoolVariableIF.h" #include "PoolVariableIF.h"
#include "../serialize/SerializeIF.h"
#include "../ipc/MutexIF.h" #include "../ipc/MutexIF.h"
/** /**

20
datapoollocal/AccessLocalDataPoolIF.h
View File

@ -4,14 +4,18 @@
#include <fsfw/datapoollocal/LocalDataPoolManager.h> #include <fsfw/datapoollocal/LocalDataPoolManager.h>
class AccessLocalDataPoolIF { //class AccessLocalDataPoolIF {
public: //public:
virtual ~AccessLocalDataPoolIF() {}; // virtual ~AccessLocalDataPoolIF() {};
//
protected: //protected:
virtual LocalDataPoolManager* getHkManagerHandle() = 0; //
// 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_ */ #endif /* FSFW_DATAPOOLLOCAL_ACCESSLOCALDATAPOOLIF_H_ */

4
datapoollocal/HasLocalDataPoolIF.h
View File

@ -42,8 +42,8 @@ using LocalDataPoolMapIter = LocalDataPool::iterator;
*/ */
class HasLocalDataPoolIF { class HasLocalDataPoolIF {
friend class LocalDataPoolManager; friend class LocalDataPoolManager;
//friend class LocalPoolDataSetBase; friend class LocalPoolDataSetBase;
//friend class LocalPoolObjectBase; friend class LocalPoolObjectBase;
public: public:
virtual~ HasLocalDataPoolIF() {}; virtual~ HasLocalDataPoolIF() {};

2
datapoollocal/LocalDataPoolManager.h
View File

@ -17,6 +17,7 @@
#include "../ipc/MutexHelper.h" #include "../ipc/MutexHelper.h"
#include <map> #include <map>
#include <vector>
namespace Factory { namespace Factory {
void setStaticFrameworkObjectIds(); void setStaticFrameworkObjectIds();
@ -53,6 +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)();

2
datapoollocal/LocalPoolDataSetBase.cpp
View File

@ -8,7 +8,7 @@
#include <cmath> #include <cmath>
#include <cstring> #include <cstring>
LocalPoolDataSetBase::LocalPoolDataSetBase(AccessLocalDataPoolIF *hkOwner, LocalPoolDataSetBase::LocalPoolDataSetBase(HasLocalDataPoolIF *hkOwner,
uint32_t setId, PoolVariableIF** registeredVariablesArray, uint32_t setId, PoolVariableIF** registeredVariablesArray,
const size_t maxNumberOfVariables, bool periodicHandling): const size_t maxNumberOfVariables, bool periodicHandling):
PoolDataSetBase(registeredVariablesArray, maxNumberOfVariables) { PoolDataSetBase(registeredVariablesArray, maxNumberOfVariables) {

7
datapoollocal/LocalPoolDataSetBase.h
View File

@ -43,8 +43,7 @@ class PeriodicHousekeepingHelper;
* @ingroup data_pool * @ingroup data_pool
*/ */
class LocalPoolDataSetBase: public PoolDataSetBase, class LocalPoolDataSetBase: public PoolDataSetBase,
public MarkChangedIF, public MarkChangedIF {
public AccessLocalDataPoolIF {
friend class LocalDataPoolManager; friend class LocalDataPoolManager;
friend class PeriodicHousekeepingHelper; friend class PeriodicHousekeepingHelper;
public: public:
@ -54,7 +53,7 @@ public:
* This constructor also initializes the components required for * This constructor also initializes the components required for
* periodic handling. * periodic handling.
*/ */
LocalPoolDataSetBase(AccessLocalDataPoolIF *hkOwner, LocalPoolDataSetBase(HasLocalDataPoolIF *hkOwner,
uint32_t setId, PoolVariableIF** registeredVariablesArray, uint32_t setId, PoolVariableIF** registeredVariablesArray,
const size_t maxNumberOfVariables, bool periodicHandling = true); const size_t maxNumberOfVariables, bool periodicHandling = true);
@ -220,7 +219,7 @@ protected:
bool bitGetter(const uint8_t* byte, uint8_t position) const; bool bitGetter(const uint8_t* byte, uint8_t position) const;
PeriodicHousekeepingHelper* periodicHelper = nullptr; PeriodicHousekeepingHelper* periodicHelper = nullptr;
AccessLocalDataPoolIF* hkManager = nullptr; LocalDataPoolManager* hkManager = nullptr;
}; };