str assembly mode checks #571
@ -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) {
|
||||||
|
|||||||
return HasModesIF::INVALID_SUBMODE;
|
return HasModesIF::INVALID_SUBMODE;
|
||||||
}
|
}
|
||||||
if (mode == MODE_ON and
|
if (mode == MODE_ON and
|
||||||
|
Reference in New Issue
Block a user
shouldn't this include MODE_OFF?
done