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

added 5v stack status read in PCDU handler
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
Details

Browse Source
This commit is contained in:
Robin Müller
2022-12-21 17:30:21 +01:00
parent dcf6367314
commit 7aae4efd69
5 changed files with 44 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
mission/system/objects/Stack5VHandler.cpp
View File

@ -6,13 +6,16 @@ Stack5VHandler::Stack5VHandler(PowerSwitchIF& switcher) : switcher(switcher) {
ReturnValue_t Stack5VHandler::deviceToOn(StackCommander commander) {
MutexGuard mg(stackLock);
if (switchIsOn or handlerState == HandlerState::SWITCH_PENDING) {
if (switchIsOn) {
if (commander == StackCommander::PL_PCDU) {
plPcduIsOn = true;
} else {
radSensorIsOn = true;
}
return returnvalue::OK;
}
if (commander == StackCommander::PL_PCDU) {
plPcduCommandedOn = true;
} else if (commander == StackCommander::RAD_SENSOR) {
radSensorCommandedOn = true;
if (handlerState == HandlerState::SWITCH_PENDING) {
return BUSY;
}
return switcher.sendSwitchCommand(stackSwitch, PowerSwitchIF::SWITCH_ON);
}
@ -20,13 +23,21 @@ ReturnValue_t Stack5VHandler::deviceToOn(StackCommander commander) {
ReturnValue_t Stack5VHandler::deviceToOff(StackCommander commander) {
MutexGuard mg(stackLock);
if (not switchIsOn) {
if (commander == StackCommander::PL_PCDU) {
plPcduIsOn = false;
} else {
radSensorIsOn = false;
}
return returnvalue::OK;
}
if (commander == StackCommander::PL_PCDU) {
plPcduCommandedOn = true;
} else if (commander == StackCommander::RAD_SENSOR) {
radSensorCommandedOn = true;
if (handlerState == HandlerState::SWITCH_PENDING) {
return BUSY;
}
if ((commander == StackCommander::PL_PCDU and radSensorIsOn) or
(commander == StackCommander::RAD_SENSOR and plPcduIsOn)) {
return returnvalue::OK;
}
return switcher.sendSwitchCommand(stackSwitch, PowerSwitchIF::SWITCH_OFF);
}
@ -39,12 +50,6 @@ bool Stack5VHandler::isSwitchOn() {
}
switchIsOn = true;
}
if (plPcduCommandedOn) {
plPcduIsOn = true;
}
if (radSensorCommandedOn) {
radSensorIsOn = true;
}
return true;
} else {
if (switchIsOn) {
@ -55,8 +60,6 @@ bool Stack5VHandler::isSwitchOn() {
}
radSensorIsOn = false;
plPcduIsOn = false;
radSensorCommandedOn = false;
plPcduCommandedOn = false;
}
return false;
}