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

Merge remote-tracking branch 'upstream/mueller/data-wrapper' into develop

Browse Source
This commit is contained in:
Robin Müller 2022-08-30 16:05:25 +02:00
commit 141dcb1f14
No known key found for this signature in database
GPG Key ID: 11D4952C8CCEF814
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/fsfw/util/dataWrapper.h
View File

@ -59,12 +59,8 @@ struct DataWrapper {
} }
return false; return false;
} }
<<<<<<< HEAD
void setRawData(BufPairT bufPair) {
=======
void setRawData(BufPair bufPair) { void setRawData(BufPair bufPair) {
>>>>>>> upstream/mueller/data-wrapper
type = DataTypes::RAW; type = DataTypes::RAW;
dataUnion.raw.data = bufPair.first; dataUnion.raw.data = bufPair.first;
dataUnion.raw.len = bufPair.second; dataUnion.raw.len = bufPair.second;