eive/eive-obsw
eive/eive-obsw
13
4
Fork 0
Code Issues 4 Pull Requests 1 Releases 120 Wiki Activity

set swither set entries valid
Some checks failed
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
Details

Browse Source
This commit is contained in:
Robin Müller 2022-12-22 16:18:30 +01:00
parent c1b95e8bbd
commit 55ecb34665
3 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
mission/devices/PCDUHandler.cpp
View File

@ -33,6 +33,8 @@ ReturnValue_t PCDUHandler::performOperation(uint8_t counter) {
PoolReadGuard pg(&p60CoreHk.outputEnables); PoolReadGuard pg(&p60CoreHk.outputEnables);
if (pg.getReadResult() == returnvalue::OK) { if (pg.getReadResult() == returnvalue::OK) {
switchState = p60CoreHk.outputEnables.value[10]; 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) { if (switcherSet.p60Dock5VStack.value != switchState) {
triggerEvent(power::SWITCH_HAS_CHANGED, switchState, pcdu::Switches::P60_DOCK_5V_STACK); triggerEvent(power::SWITCH_HAS_CHANGED, switchState, pcdu::Switches::P60_DOCK_5V_STACK);
} }
switcherSet.p60Dock5VStack.setValid(true);
switcherSet.p60Dock5VStack.value = switchState; switcherSet.p60Dock5VStack.value = switchState;
} }
} }
@ -193,6 +196,7 @@ void PCDUHandler::updatePdu2SwitchStates() {
if (firstSwitchInfoPdu2) { if (firstSwitchInfoPdu2) {
firstSwitchInfoPdu2 = false; firstSwitchInfoPdu2 = false;
} }
switcherSet.pduSwitches.setValid(true);
} else { } else {
sif::debug << "PCDUHandler::updatePdu2SwitchStates: Failed to read PDU2 Hk Dataset" sif::debug << "PCDUHandler::updatePdu2SwitchStates: Failed to read PDU2 Hk Dataset"
<< std::endl; << std::endl;
@ -229,6 +233,7 @@ void PCDUHandler::updatePdu1SwitchStates() {
if (firstSwitchInfoPdu1) { if (firstSwitchInfoPdu1) {
firstSwitchInfoPdu1 = false; firstSwitchInfoPdu1 = false;
} }
switcherSet.pdu2Switches.setValid(true);
} else { } else {
sif::debug << "PCDUHandler::updatePdu1SwitchStates: Failed to read dataset" << std::endl; sif::debug << "PCDUHandler::updatePdu1SwitchStates: Failed to read dataset" << std::endl;
} }

6
mission/devices/PayloadPcduHandler.cpp
View File

@ -38,7 +38,7 @@ void PayloadPcduHandler::doStartUp() {
if (retval == BUSY) { if (retval == BUSY) {
return; return;
} }
state == States::STACK_5V_PENDING; state = States::STACK_5V_PENDING;
} }
if (state == States::STACK_5V_PENDING) { if (state == States::STACK_5V_PENDING) {
if (stackHandler.isSwitchOn()) { if (stackHandler.isSwitchOn()) {
@ -66,11 +66,11 @@ void PayloadPcduHandler::doShutDown() {
if (retval == BUSY) { if (retval == BUSY) {
return; return;
} }
state == States::STACK_5V_PENDING; state = States::STACK_5V_PENDING;
} }
if (state == States::STACK_5V_PENDING) { if (state == States::STACK_5V_PENDING) {
if (not stackHandler.isSwitchOn()) { if (not stackHandler.isSwitchOn()) {
state == States::STACK_5V_CORRECT; state = States::STACK_5V_CORRECT;
} }
} }
if (state == States::STACK_5V_CORRECT) { if (state == States::STACK_5V_CORRECT) {

2
mission/devices/RadiationSensorHandler.cpp
View File

@ -29,7 +29,7 @@ void RadiationSensorHandler::doStartUp() {
} }
if (internalState == InternalState::POWER_SWITCHING) { if (internalState == InternalState::POWER_SWITCHING) {
if (stackHandler.isSwitchOn()) { if (stackHandler.isSwitchOn()) {
internalState == InternalState::SETUP; internalState = InternalState::SETUP;
} }
} }
if (internalState == InternalState::CONFIGURED) { if (internalState == InternalState::CONFIGURED) {