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

WIP: somethings wrong.. #19

Closed
muellerr wants to merge 808 commits from source/master into master
pull from: source/master
merge into: KSat:master
Conversation 0 Commits 808 Files Changed 512 +3 -3
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 59b25bee86 - Show all commits

4
datapool/PoolRawAccessHelper.cpp
View File

@ -8,9 +8,9 @@
#include <framework/datapool/PoolRawAccessHelper.h> #include <framework/datapool/PoolRawAccessHelper.h>
#include <framework/datapool/DataSet.h> #include <framework/datapool/DataSet.h>
PoolRawAccessHelper::PoolRawAccessHelper(uint8_t * poolIdBuffer_, PoolRawAccessHelper::PoolRawAccessHelper(uint32_t * poolIdBuffer_,
uint8_t numberOfParameters_): uint8_t numberOfParameters_):
poolIdBuffer(poolIdBuffer_), poolIdBuffer(reinterpret_cast<uint8_t * >(poolIdBuffer_)),
numberOfParameters(numberOfParameters_), validBufferIndex(0), validBufferIndexBit(1){ numberOfParameters(numberOfParameters_), validBufferIndex(0), validBufferIndexBit(1){
} }

2
datapool/PoolRawAccessHelper.h
View File

@ -28,7 +28,7 @@ public:
* @param poolIdBuffer_ A buffer of uint32_t pool IDs * @param poolIdBuffer_ A buffer of uint32_t pool IDs
* @param numberOfParameters_ The number of parameters / pool IDs * @param numberOfParameters_ The number of parameters / pool IDs
*/ */
PoolRawAccessHelper(uint8_t * poolIdBuffer_, uint8_t numberOfParameters_); PoolRawAccessHelper(uint32_t * poolIdBuffer_, uint8_t numberOfParameters_);
virtual ~PoolRawAccessHelper(); virtual ~PoolRawAccessHelper();
/** /**