eive/eive-obsw
13
4
Fork 0
Code Issues 4 Pull Requests 1 Releases 121 Wiki Activity

str assembly mode checks #571

Merged
muellerr merged 6 commits from syrlinks_assy_mode_checks into develop 2023-04-05 16:08:17 +02:00
Conversation 2 Commits 6 Files Changed 9 +41 -12
9 changed files with 41 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 56c5838d15 - Show all commits

2
mission/system/acs/StrAssembly.cpp
View File

@ -33,7 +33,7 @@ ReturnValue_t StrAssembly::checkChildrenStateOn(Mode_t wantedMode, Submode_t wan
} }
ReturnValue_t StrAssembly::isModeCombinationValid(Mode_t mode, Submode_t submode) { ReturnValue_t StrAssembly::isModeCombinationValid(Mode_t mode, Submode_t submode) {
if (mode == DeviceHandlerIF::MODE_NORMAL and submode != SUBMODE_NONE) { if ((mode == DeviceHandlerIF::MODE_NORMAL or mode == MODE_OFF) and submode != SUBMODE_NONE) {
meggert commented 2023-04-05 15:42:36 +02:00
Outdated
Review
Copy Link

shouldn't this include MODE_OFF?

shouldn't this include MODE_OFF?
muellerr commented 2023-04-05 16:07:07 +02:00
Outdated
Review
Copy Link

done

done
return HasModesIF::INVALID_SUBMODE; return HasModesIF::INVALID_SUBMODE;
} }
if (mode == MODE_ON and if (mode == MODE_ON and