fsfw/fsfw
fsfw/fsfw
10
3
Fork 6
Code Issues 31 Pull Requests 4 Releases 10 Wiki Activity

WIP: develop_update #706

Draft
muellerr wants to merge 710 commits from eive/fsfw:develop_update into development
pull from: eive/fsfw:develop_update
merge into: fsfw:development
Conversation 0 Commits 710 Files Changed 187 -4
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 141dcb1f14 - Show all commits

4
src/fsfw/util/dataWrapper.h
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;