From d52ee5ff38cdad38e827dcb16d500ace4b8618e1 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Tue, 10 Jan 2023 15:16:52 +0100 Subject: [PATCH] finally appears to work --- mission/devices/PayloadPcduHandler.cpp | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/mission/devices/PayloadPcduHandler.cpp b/mission/devices/PayloadPcduHandler.cpp index 908a4c3e..0f691c75 100644 --- a/mission/devices/PayloadPcduHandler.cpp +++ b/mission/devices/PayloadPcduHandler.cpp @@ -25,7 +25,7 @@ PayloadPcduHandler::PayloadPcduHandler(object_id_t objectId, object_id_t comIF, sdcMan(sdcMan) {} void PayloadPcduHandler::doStartUp() { - if ((state != States::PL_PCDU_OFF) and (state != States::ON_TRANS_SSR)) { + if (state > States::STACK_5V_CORRECT) { // Config error sif::error << "PayloadPcduHandler::doStartUp: Invalid state" << std::endl; } @@ -60,16 +60,13 @@ void PayloadPcduHandler::doShutDown() { std::memset(adcSet.processed.value, 0, adcSet.processed.getSerializedSize()); clearSetOnOffFlag = false; } - - if (state == States::STACK_5V_SWITCHING) { - ReturnValue_t retval = stackHandler.deviceToOff(StackCommander::PL_PCDU, true); - if (retval == BUSY) { - return; - } - state = States::PL_PCDU_OFF; - // No need to set mode _MODE_POWER_DOWN, power switching was already handled - setMode(MODE_OFF); + ReturnValue_t retval = stackHandler.deviceToOff(StackCommander::PL_PCDU, true); + if (retval == BUSY) { + return; } + state = States::PL_PCDU_OFF; + // No need to set mode _MODE_POWER_DOWN, power switching was already handled + setMode(MODE_OFF); } void PayloadPcduHandler::doTransition(Mode_t modeFrom, Submode_t subModeFrom) {