skip param works
All checks were successful
EIVE/eive-obsw/pipeline/pr-main This commit looks good

This commit is contained in:
Robin Müller 2024-01-25 11:02:39 +01:00
parent 928dd9e2e0
commit 5df5c30e30
Signed by: muellerr
GPG Key ID: A649FB78196E3849
2 changed files with 11 additions and 9 deletions

View File

@ -1398,15 +1398,16 @@ bool PlocMpsocHandler::handleHwStartup() {
if (powerState == PowerState::IDLE) { if (powerState == PowerState::IDLE) {
if (skipSupvCommandingToOn) { if (skipSupvCommandingToOn) {
powerState = PowerState::DONE; powerState = PowerState::DONE;
}
if (supv::SUPV_ON) {
commandActionHelper.commandAction(supervisorHandler, supv::START_MPSOC);
supvTransitionCd.resetTimer();
powerState = PowerState::PENDING_STARTUP;
} else { } else {
triggerEvent(SUPV_NOT_ON, 1); if (supv::SUPV_ON) {
// Set back to OFF for now, failing the transition. commandActionHelper.commandAction(supervisorHandler, supv::START_MPSOC);
setMode(MODE_OFF); supvTransitionCd.resetTimer();
powerState = PowerState::PENDING_STARTUP;
} else {
triggerEvent(SUPV_NOT_ON, 1);
// Set back to OFF for now, failing the transition.
setMode(MODE_OFF);
}
} }
} }
if (powerState == PowerState::SUPV_FAILED) { if (powerState == PowerState::SUPV_FAILED) {
@ -1548,6 +1549,7 @@ ReturnValue_t PlocMpsocHandler::getParameter(uint8_t domainId, uint8_t uniqueId,
return HasParametersIF::INVALID_VALUE; return HasParametersIF::INVALID_VALUE;
} }
parameterWrapper->set(skipSupvCommandingToOn); parameterWrapper->set(skipSupvCommandingToOn);
return returnvalue::OK;
} }
return DeviceHandlerBase::getParameter(domainId, uniqueId, parameterWrapper, newValues, return DeviceHandlerBase::getParameter(domainId, uniqueId, parameterWrapper, newValues,
startAtIndex); startAtIndex);

2
tmtc

@ -1 +1 @@
Subproject commit 1831ea8b7aa4b32d9fdc6b6598269a95b9f71a14 Subproject commit bcdd12caf05b6a874b0d3ac2b9436c4061545312