From 55ecb346659cb100362c5d7de4f9f0e37a116e43 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Thu, 22 Dec 2022 16:18:30 +0100 Subject: [PATCH] set swither set entries valid --- mission/devices/PCDUHandler.cpp | 5 +++++ mission/devices/PayloadPcduHandler.cpp | 6 +++--- mission/devices/RadiationSensorHandler.cpp | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/mission/devices/PCDUHandler.cpp b/mission/devices/PCDUHandler.cpp index cb75e2b3..1b47c7f1 100644 --- a/mission/devices/PCDUHandler.cpp +++ b/mission/devices/PCDUHandler.cpp @@ -33,6 +33,8 @@ ReturnValue_t PCDUHandler::performOperation(uint8_t counter) { PoolReadGuard pg(&p60CoreHk.outputEnables); if (pg.getReadResult() == returnvalue::OK) { switchState = p60CoreHk.outputEnables.value[10]; + } else { + return returnvalue::OK; } } { @@ -41,6 +43,7 @@ ReturnValue_t PCDUHandler::performOperation(uint8_t counter) { if (switcherSet.p60Dock5VStack.value != switchState) { triggerEvent(power::SWITCH_HAS_CHANGED, switchState, pcdu::Switches::P60_DOCK_5V_STACK); } + switcherSet.p60Dock5VStack.setValid(true); switcherSet.p60Dock5VStack.value = switchState; } } @@ -193,6 +196,7 @@ void PCDUHandler::updatePdu2SwitchStates() { if (firstSwitchInfoPdu2) { firstSwitchInfoPdu2 = false; } + switcherSet.pduSwitches.setValid(true); } else { sif::debug << "PCDUHandler::updatePdu2SwitchStates: Failed to read PDU2 Hk Dataset" << std::endl; @@ -229,6 +233,7 @@ void PCDUHandler::updatePdu1SwitchStates() { if (firstSwitchInfoPdu1) { firstSwitchInfoPdu1 = false; } + switcherSet.pdu2Switches.setValid(true); } else { sif::debug << "PCDUHandler::updatePdu1SwitchStates: Failed to read dataset" << std::endl; } diff --git a/mission/devices/PayloadPcduHandler.cpp b/mission/devices/PayloadPcduHandler.cpp index e873e3e1..6d4888f1 100644 --- a/mission/devices/PayloadPcduHandler.cpp +++ b/mission/devices/PayloadPcduHandler.cpp @@ -38,7 +38,7 @@ void PayloadPcduHandler::doStartUp() { if (retval == BUSY) { return; } - state == States::STACK_5V_PENDING; + state = States::STACK_5V_PENDING; } if (state == States::STACK_5V_PENDING) { if (stackHandler.isSwitchOn()) { @@ -66,11 +66,11 @@ void PayloadPcduHandler::doShutDown() { if (retval == BUSY) { return; } - state == States::STACK_5V_PENDING; + state = States::STACK_5V_PENDING; } if (state == States::STACK_5V_PENDING) { if (not stackHandler.isSwitchOn()) { - state == States::STACK_5V_CORRECT; + state = States::STACK_5V_CORRECT; } } if (state == States::STACK_5V_CORRECT) { diff --git a/mission/devices/RadiationSensorHandler.cpp b/mission/devices/RadiationSensorHandler.cpp index 61704c91..9e24b771 100644 --- a/mission/devices/RadiationSensorHandler.cpp +++ b/mission/devices/RadiationSensorHandler.cpp @@ -29,7 +29,7 @@ void RadiationSensorHandler::doStartUp() { } if (internalState == InternalState::POWER_SWITCHING) { if (stackHandler.isSwitchOn()) { - internalState == InternalState::SETUP; + internalState = InternalState::SETUP; } } if (internalState == InternalState::CONFIGURED) {