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

SoC Calculator #754

Merged
muellerr merged 74 commits from soc-calculator into main 2023-10-11 10:50:48 +02:00
Conversation 2 Commits 74 Files Changed 52 +1136 -37
49 changed files with 1136 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 000077f327 - Show all commits

6
linux/payload/PlocMpsocHandler.cpp
View File

@@ -1511,10 +1511,12 @@ ReturnValue_t PlocMpsocHandler::checkModeCommand(Mode_t commandedMode, Submode_t
if (commandedMode != MODE_OFF) { if (commandedMode != MODE_OFF) {
PoolReadGuard pg(&enablePl); PoolReadGuard pg(&enablePl);
if (pg.getReadResult() == returnvalue::OK) { if (pg.getReadResult() == returnvalue::OK) {
if (enablePl.plUseAllowed.isValid() and not enablePl.plUseAllowed.value) { if (enablePl.plUseAllowed.isValid() and enablePl.plUseAllowed.value) {
return NON_OP_STATE_OF_CHARGE; return DeviceHandlerBase::checkModeCommand(commandedMode, commandedSubmode,
msToReachTheMode);
} }
} }
return NON_OP_STATE_OF_CHARGE;
} }
return DeviceHandlerBase::checkModeCommand(commandedMode, commandedSubmode, msToReachTheMode); return DeviceHandlerBase::checkModeCommand(commandedMode, commandedSubmode, msToReachTheMode);
} }

6
linux/payload/PlocSupervisorHandler.cpp
View File

@@ -1999,10 +1999,12 @@ ReturnValue_t PlocSupervisorHandler::checkModeCommand(Mode_t commandedMode,
if (commandedMode != MODE_OFF) { if (commandedMode != MODE_OFF) {
PoolReadGuard pg(&enablePl); PoolReadGuard pg(&enablePl);
if (pg.getReadResult() == returnvalue::OK) { if (pg.getReadResult() == returnvalue::OK) {
if (enablePl.plUseAllowed.isValid() and not enablePl.plUseAllowed.value) { if (enablePl.plUseAllowed.isValid() and enablePl.plUseAllowed.value) {
return NON_OP_STATE_OF_CHARGE; return DeviceHandlerBase::checkModeCommand(commandedMode, commandedSubmode,
msToReachTheMode);
} }
} }
return NON_OP_STATE_OF_CHARGE;
} }
return DeviceHandlerBase::checkModeCommand(commandedMode, commandedSubmode, msToReachTheMode); return DeviceHandlerBase::checkModeCommand(commandedMode, commandedSubmode, msToReachTheMode);
} }

6
mission/payload/PayloadPcduHandler.cpp
View File

@@ -569,10 +569,12 @@ ReturnValue_t PayloadPcduHandler::checkModeCommand(Mode_t commandedMode, Submode
if (commandedMode != MODE_OFF) { if (commandedMode != MODE_OFF) {
PoolReadGuard pg(&enablePl); PoolReadGuard pg(&enablePl);
if (pg.getReadResult() == returnvalue::OK) { if (pg.getReadResult() == returnvalue::OK) {
if (enablePl.plUseAllowed.isValid() and not enablePl.plUseAllowed.value) { if (enablePl.plUseAllowed.isValid() and enablePl.plUseAllowed.value) {
return NON_OP_STATE_OF_CHARGE; return DeviceHandlerBase::checkModeCommand(commandedMode, commandedSubmode,
msToReachTheMode);
} }
} }
return NON_OP_STATE_OF_CHARGE;
} }
return DeviceHandlerBase::checkModeCommand(commandedMode, commandedSubmode, msToReachTheMode); return DeviceHandlerBase::checkModeCommand(commandedMode, commandedSubmode, msToReachTheMode);
} }

6
mission/system/objects/CamSwitcher.cpp
View File

@@ -14,10 +14,12 @@ ReturnValue_t CamSwitcher::checkModeCommand(Mode_t commandedMode, Submode_t comm
if (commandedMode != MODE_OFF) { if (commandedMode != MODE_OFF) {
PoolReadGuard pg(&enablePl); PoolReadGuard pg(&enablePl);
if (pg.getReadResult() == returnvalue::OK) { if (pg.getReadResult() == returnvalue::OK) {
if (enablePl.plUseAllowed.isValid() and not enablePl.plUseAllowed.value) { if (enablePl.plUseAllowed.isValid() and enablePl.plUseAllowed.value) {
return TRANS_NOT_ALLOWED; return PowerSwitcherComponent::checkModeCommand(commandedMode, commandedSubmode,
msToReachTheMode);
} }
} }
return TRANS_NOT_ALLOWED;
} }
return PowerSwitcherComponent::checkModeCommand(commandedMode, commandedSubmode, return PowerSwitcherComponent::checkModeCommand(commandedMode, commandedSubmode,
msToReachTheMode); msToReachTheMode);