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

Merge remote-tracking branch 'upstream/master' into mueller_framework

Browse Source
This commit is contained in:
Robin Müller 2020-07-02 16:07:16 +02:00
commit 8011d49ebc
5 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
datapool/DataSetBase.cpp → datapool/StaticDataSetBase.cpp
View File

@ -1,4 +1,4 @@
#include <framework/datapool/DataSetBase.h> #include <framework/datapool/StaticDataSetBase.h>
#include <framework/serviceinterface/ServiceInterfaceStream.h> #include <framework/serviceinterface/ServiceInterfaceStream.h>
DataSetBase::DataSetBase() { DataSetBase::DataSetBase() {

6
datapool/DataSetBase.h → datapool/StaticDataSetBase.h
View File

@ -1,5 +1,5 @@
#ifndef FRAMEWORK_DATAPOOL_DATASETBASE_H_ #ifndef FRAMEWORK_DATAPOOL_STATICDATASETBASE_H_
#define FRAMEWORK_DATAPOOL_DATASETBASE_H_ #define FRAMEWORK_DATAPOOL_STATICDATASETBASE_H_
#include <framework/datapool/DataSetIF.h> #include <framework/datapool/DataSetIF.h>
#include <framework/datapool/PoolVariableIF.h> #include <framework/datapool/PoolVariableIF.h>
#include <framework/ipc/MutexIF.h> #include <framework/ipc/MutexIF.h>
@ -146,4 +146,4 @@ private:
ReturnValue_t handleUnreadDatasetCommit(uint32_t lockTimeout); ReturnValue_t handleUnreadDatasetCommit(uint32_t lockTimeout);
}; };
#endif /* FRAMEWORK_DATAPOOL_DATASETBASE_H_ */ #endif /* FRAMEWORK_DATAPOOL_STATICDATASETBASE_H_ */

2
datapoolglob/GlobalDataSet.h
View File

@ -1,7 +1,7 @@
#ifndef DATASET_H_ #ifndef DATASET_H_
#define DATASET_H_ #define DATASET_H_
#include <framework/datapool/DataSetBase.h> #include <framework/datapool/StaticDataSetBase.h>
/** /**
* @brief The DataSet class manages a set of locally checked out variables * @brief The DataSet class manages a set of locally checked out variables

2
datapoollocal/LocalDataSet.h
View File

@ -1,7 +1,7 @@
#ifndef FRAMEWORK_DATAPOOLLOCAL_LOCALDATASET_H_ #ifndef FRAMEWORK_DATAPOOLLOCAL_LOCALDATASET_H_
#define FRAMEWORK_DATAPOOLLOCAL_LOCALDATASET_H_ #define FRAMEWORK_DATAPOOLLOCAL_LOCALDATASET_H_
#include <framework/datapool/DataSetBase.h>
#include <framework/datapool/DataSetIF.h> #include <framework/datapool/DataSetIF.h>
#include <framework/datapool/StaticDataSetBase.h>
#include <framework/datapoollocal/OwnsLocalDataPoolIF.h> #include <framework/datapoollocal/OwnsLocalDataPoolIF.h>
#include <framework/serialize/SerializeIF.h> #include <framework/serialize/SerializeIF.h>

5
returnvalues/HasReturnvaluesIF.h
View File

@ -12,8 +12,7 @@ typedef uint16_t ReturnValue_t;
class HasReturnvaluesIF { class HasReturnvaluesIF {
public: public:
static const ReturnValue_t RETURN_OK = 0; static const ReturnValue_t RETURN_OK = 0;
//! This will be the all-ones value irrespective of used unsigned datatype. static const ReturnValue_t RETURN_FAILED = 1;
static const ReturnValue_t RETURN_FAILED = -1;
virtual ~HasReturnvaluesIF() {} virtual ~HasReturnvaluesIF() {}
static ReturnValue_t makeReturnCode(uint8_t interfaceId, uint8_t number) { static ReturnValue_t makeReturnCode(uint8_t interfaceId, uint8_t number) {
@ -21,4 +20,4 @@ public:
} }
}; };
#endif /* HASRETURNVALUESIF_H_ */ #endif /* FRAMEWORK_RETURNVALUES_HASRETURNVALUESIF_H_ */