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 +1 -1
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 227524a21d - Show all commits

2
src/fsfw/devicehandlers/DeviceHandlerBase.cpp
View File

@ -567,7 +567,7 @@ void DeviceHandlerBase::setMode(Mode_t newMode, uint8_t newSubmode) {
continueToNormal = false; continueToNormal = false;
// TODO: Check whether the following two lines are okay to do so. // TODO: Check whether the following two lines are okay to do so.
transitionSourceMode = MODE_ON; transitionSourceMode = MODE_ON;
transitionSourceSubMode = submode; transitionSourceSubMode = newSubmode;
mode = _MODE_TO_NORMAL; mode = _MODE_TO_NORMAL;
return; return;
} }