KSat/fsfw
17
6 Fork 3
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:
muellerr committed 2022-08-30 16:05:25 +02:00
2 parents 6ebd6a965b 20f0707813
commit 141dcb1f14
1 file changed
-4
Download Patch File Download Diff File Expand all files Collapse all files
src/fsfw/util/dataWrapper.h
-4
View File
@@ -59,12 +59,8 @@ struct DataWrapper {
}
return false;
}
<<<<<<< HEAD
void setRawData(BufPairT bufPair) {
=======
void setRawData(BufPair bufPair) {
>>>>>>> upstream/mueller/data-wrapper
type = DataTypes::RAW;
dataUnion.raw.data = bufPair.first;
dataUnion.raw.len = bufPair.second;