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

updating and cleaning pool files

Browse Source
This commit is contained in:
Robin Müller 2020-09-05 21:51:17 +02:00
parent cb970b1883
commit c7606b7b1e
13 changed files with 48 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
datapool/PoolDataSetBase.h
View File

@ -1,7 +1,8 @@
#ifndef FRAMEWORK_DATAPOOL_DATASETBASE_H_ #ifndef FSFW_DATAPOOL_POOLDATASETBASE_H_
#define FRAMEWORK_DATAPOOL_DATASETBASE_H_ #define FSFW_DATAPOOL_POOLDATASETBASE_H_
#include "../datapool/PoolDataSetIF.h"
#include "../datapool/PoolVariableIF.h" #include "PoolDataSetIF.h"
#include "PoolVariableIF.h"
#include "../ipc/MutexIF.h" #include "../ipc/MutexIF.h"
/** /**
@ -148,4 +149,4 @@ private:
ReturnValue_t handleUnreadDatasetCommit(uint32_t lockTimeout); ReturnValue_t handleUnreadDatasetCommit(uint32_t lockTimeout);
}; };
#endif /* FRAMEWORK_DATAPOOL_POOLPOOLDATASETBASE_H_ */ #endif /* FSFW_DATAPOOL_POOLDATASETBASE_H_ */

7
datapool/PoolDataSetIF.h
View File

@ -1,5 +1,6 @@
#ifndef FRAMEWORK_DATAPOOL_POOLDATASETIF_H_ #ifndef FSFW_DATAPOOL_POOLDATASETIF_H_
#define FRAMEWORK_DATAPOOL_POOLDATASETIF_H_ #define FSFW_DATAPOOL_POOLDATASETIF_H_
#include "DataSetIF.h" #include "DataSetIF.h"
class PoolDataSetIF: public DataSetIF { class PoolDataSetIF: public DataSetIF {
@ -25,4 +26,4 @@ public:
virtual bool isValid() const = 0; virtual bool isValid() const = 0;
}; };
#endif /* FRAMEWORK_DATAPOOL_POOLDATASETIF_H_ */ #endif /* FSFW_DATAPOOL_POOLDATASETIF_H_ */

3
datapool/PoolEntry.cpp
View File

@ -1,4 +1,5 @@
#include "../datapool/PoolEntry.h" #include "PoolEntry.h"
#include "../serviceinterface/ServiceInterfaceStream.h" #include "../serviceinterface/ServiceInterfaceStream.h"
#include "../globalfunctions/arrayprinter.h" #include "../globalfunctions/arrayprinter.h"
#include <cstring> #include <cstring>

8
datapool/PoolEntry.h
View File

@ -1,7 +1,7 @@
#ifndef FRAMEWORK_DATAPOOL_POOLENTRY_H_ #ifndef FSFW_DATAPOOL_POOLENTRY_H_
#define FRAMEWORK_DATAPOOL_POOLENTRY_H_ #define FSFW_DATAPOOL_POOLENTRY_H_
#include "../datapool/PoolEntryIF.h" #include "PoolEntryIF.h"
#include <initializer_list> #include <initializer_list>
#include <type_traits> #include <type_traits>
@ -127,4 +127,4 @@ public:
Type getType(); Type getType();
}; };
#endif /* POOLENTRY_H_ */ #endif /* FSFW_DATAPOOL_POOLENTRY_H_ */

6
datapool/PoolEntryIF.h
View File

@ -1,5 +1,5 @@
#ifndef FRAMEWORK_DATAPOOL_POOLENTRYIF_H_ #ifndef FSFW_DATAPOOL_POOLENTRYIF_H_
#define FRAMEWORK_DATAPOOL_POOLENTRYIF_H_ #define FSFW_DATAPOOL_POOLENTRYIF_H_
#include "../globalfunctions/Type.h" #include "../globalfunctions/Type.h"
#include <cstdint> #include <cstdint>
@ -60,4 +60,4 @@ public:
virtual Type getType() = 0; virtual Type getType() = 0;
}; };
#endif /* POOLENTRYIF_H_ */ #endif /* FSFW_DATAPOOL_POOLENTRYIF_H_ */

9
datapool/PoolRawAccessHelper.cpp
View File

@ -1,11 +1,4 @@
/** #include "PoolRawAccessHelper.h"
* @file PoolRawAccessHelper.cpp
*
* @date 22.12.2019
* @author R. Mueller
*/
#include "../datapool/PoolRawAccessHelper.h"
#include "../datapoolglob/GlobalDataSet.h" #include "../datapoolglob/GlobalDataSet.h"
#include "../serialize/SerializeAdapter.h" #include "../serialize/SerializeAdapter.h"
#include "../serviceinterface/ServiceInterfaceStream.h" #include "../serviceinterface/ServiceInterfaceStream.h"

10
datapool/PoolRawAccessHelper.h
View File

@ -1,11 +1,5 @@
/** #ifndef FSFW_DATAPOOL_POOLRAWACCESSHELPER_H_
* @file PoolRawAccessHelper.h #define FSFW_DATAPOOL_POOLRAWACCESSHELPER_H_
*
* @date 22.12.2019
*/
#ifndef FRAMEWORK_DATAPOOL_POOLRAWACCESSHELPER_H_
#define FRAMEWORK_DATAPOOL_POOLRAWACCESSHELPER_H_
#include "../returnvalues/HasReturnvaluesIF.h" #include "../returnvalues/HasReturnvaluesIF.h"
#include "../datapoolglob/GlobalDataSet.h" #include "../datapoolglob/GlobalDataSet.h"

9
datapoolglob/DataPoolAdmin.cpp
View File

@ -1,7 +1,8 @@
#include "../datapoolglob/DataPoolAdmin.h" #include "DataPoolAdmin.h"
#include "../datapoolglob/GlobalDataSet.h" #include "GlobalDataSet.h"
#include "../datapoolglob/GlobalDataPool.h" #include "GlobalDataPool.h"
#include "../datapoolglob/PoolRawAccess.h" #include "PoolRawAccess.h"
#include "../ipc/CommandMessage.h" #include "../ipc/CommandMessage.h"
#include "../ipc/QueueFactory.h" #include "../ipc/QueueFactory.h"
#include "../parameters/ParameterMessage.h" #include "../parameters/ParameterMessage.h"

13
datapoolglob/DataPoolAdmin.h
View File

@ -1,5 +1,7 @@
#ifndef DATAPOOLADMIN_H_ #ifndef FSFW_DATAPOOLGLOB_DATAPOOLADMIN_H_
#define DATAPOOLADMIN_H_ #define FSFW_DATAPOOLGLOB_DATAPOOLADMIN_H_
#include "DataPoolParameterWrapper.h"
#include "../objectmanager/SystemObject.h" #include "../objectmanager/SystemObject.h"
#include "../returnvalues/HasReturnvaluesIF.h" #include "../returnvalues/HasReturnvaluesIF.h"
@ -7,10 +9,9 @@
#include "../action/HasActionsIF.h" #include "../action/HasActionsIF.h"
#include "../ipc/MessageQueueIF.h" #include "../ipc/MessageQueueIF.h"
#include "../parameters/ReceivesParameterMessagesIF.h" #include "../parameters/ReceivesParameterMessagesIF.h"
#include "../memory/MemoryHelper.h"
#include "../action/SimpleActionHelper.h" #include "../action/SimpleActionHelper.h"
#include "../datapoolglob/DataPoolParameterWrapper.h" #include "../memory/MemoryHelper.h"
class DataPoolAdmin: public HasActionsIF, class DataPoolAdmin: public HasActionsIF,
public ExecutableObjectIF, public ExecutableObjectIF,
@ -56,4 +57,4 @@ private:
Command_t initialCommand); Command_t initialCommand);
}; };
#endif /* DATAPOOLADMIN_H_ */ #endif /* FSFW_DATAPOOLGLOB_DATAPOOLADMIN_H_ */

6
datapoolglob/GlobalPoolVector.h
View File

@ -1,5 +1,5 @@
#ifndef GLOBALPOOLVECTOR_H_ #ifndef FSFW_DATAPOOLGLOB_GLOBALPOOLVECTOR_H_
#define GLOBALPOOLVECTOR_H_ #define FSFW_DATAPOOLGLOB_GLOBALPOOLVECTOR_H_
#include "../datapool/DataSetIF.h" #include "../datapool/DataSetIF.h"
#include "../datapool/PoolEntry.h" #include "../datapool/PoolEntry.h"
@ -182,4 +182,4 @@ private:
template<typename T, uint16_t vectorSize> template<typename T, uint16_t vectorSize>
using gp_vec_t = GlobPoolVector<T, vectorSize>; using gp_vec_t = GlobPoolVector<T, vectorSize>;
#endif /* POOLVECTOR_H_ */ #endif /* FSFW_DATAPOOLGLOB_GLOBALPOOLVECTOR_H_ */

4
datapoolglob/GlobalPoolVector.tpp
View File

@ -1,5 +1,5 @@
#ifndef GLOBALPOOLVECTOR_TPP_ #ifndef FSFW_DATAPOOLGLOB_GLOBALPOOLVECTOR_TPP_
#define GLOBALPOOLVECTOR_TPP_ #define FSFW_DATAPOOLGLOB_GLOBALPOOLVECTOR_TPP_
template<typename T, uint16_t vectorSize> template<typename T, uint16_t vectorSize>

7
datapoollocal/HasLocalDataPoolIF.h
View File

@ -1,5 +1,6 @@
#ifndef FRAMEWORK_DATAPOOL_HASHKPOOLPARAMETERSIF_H_ #ifndef FSFW_DATAPOOLLOCAL_HASLOCALDATAPOOLIF_H_
#define FRAMEWORK_DATAPOOL_HASHKPOOLPARAMETERSIF_H_ #define FSFW_DATAPOOLLOCAL_HASLOCALDATAPOOLIF_H_
#include "../datapool/PoolEntryIF.h" #include "../datapool/PoolEntryIF.h"
#include "../ipc/MessageQueueSenderIF.h" #include "../ipc/MessageQueueSenderIF.h"
#include "../housekeeping/HousekeepingMessage.h" #include "../housekeeping/HousekeepingMessage.h"
@ -89,4 +90,4 @@ public:
}; };
}; };
#endif /* FRAMEWORK_DATAPOOL_HASHKPOOLPARAMETERSIF_H_ */ #endif /* FSFW_DATAPOOLLOCAL_HASLOCALDATAPOOLIF_H_ */

9
datapoollocal/LocalDataSet.h
View File

@ -1,6 +1,7 @@
#ifndef FRAMEWORK_DATAPOOLLOCAL_LOCALDATASET_H_ #ifndef FSFW_DATAPOOLLOCAL_LOCALDATASET_H_
#define FRAMEWORK_DATAPOOLLOCAL_LOCALDATASET_H_ #define FSFW_DATAPOOLLOCAL_LOCALDATASET_H_
#include "../datapoollocal/LocalPoolDataSetBase.h"
#include "LocalPoolDataSetBase.h"
#include <vector> #include <vector>
class LocalDataSet: public LocalPoolDataSetBase { class LocalDataSet: public LocalPoolDataSetBase {
@ -17,4 +18,4 @@ private:
std::vector<PoolVariableIF*> poolVarList; std::vector<PoolVariableIF*> poolVarList;
}; };
#endif /* FRAMEWORK_DATAPOOLLOCAL_LOCALDATASET_H_ */ #endif /* FSFW_DATAPOOLLOCAL_LOCALDATASET_H_ */