From 5df5c30e3037ca977bfae7c8a4da34ee0bc0979f Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Thu, 25 Jan 2024 11:02:39 +0100 Subject: [PATCH] skip param works --- linux/payload/PlocMpsocHandler.cpp | 18 ++++++++++-------- tmtc | 2 +- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/linux/payload/PlocMpsocHandler.cpp b/linux/payload/PlocMpsocHandler.cpp index 6601d957..9aa110e1 100644 --- a/linux/payload/PlocMpsocHandler.cpp +++ b/linux/payload/PlocMpsocHandler.cpp @@ -1398,15 +1398,16 @@ bool PlocMpsocHandler::handleHwStartup() { if (powerState == PowerState::IDLE) { if (skipSupvCommandingToOn) { powerState = PowerState::DONE; - } - if (supv::SUPV_ON) { - commandActionHelper.commandAction(supervisorHandler, supv::START_MPSOC); - 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 (supv::SUPV_ON) { + commandActionHelper.commandAction(supervisorHandler, supv::START_MPSOC); + 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) { @@ -1548,6 +1549,7 @@ ReturnValue_t PlocMpsocHandler::getParameter(uint8_t domainId, uint8_t uniqueId, return HasParametersIF::INVALID_VALUE; } parameterWrapper->set(skipSupvCommandingToOn); + return returnvalue::OK; } return DeviceHandlerBase::getParameter(domainId, uniqueId, parameterWrapper, newValues, startAtIndex); diff --git a/tmtc b/tmtc index 1831ea8b..bcdd12ca 160000 --- a/tmtc +++ b/tmtc @@ -1 +1 @@ -Subproject commit 1831ea8b7aa4b32d9fdc6b6598269a95b9f71a14 +Subproject commit bcdd12caf05b6a874b0d3ac2b9436c4061545312