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

TCS Ctrl Time Limit not for Heaters in External Control #878

Merged
meggert merged 8 commits from tcs-ctrl-ignores-ext-ctrl into main 2024-03-18 11:36:33 +01:00
Conversation 0 Commits 8 Files Changed 3 +16 -14
1 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 950e86ce4b - Show all commits

8
mission/controller/ThermalController.cpp
View File

@ -1643,7 +1643,9 @@ bool ThermalController::chooseHeater(heater::Switch& switchNr, heater::Switch re
HasHealthIF::HealthState mainHealth = heaterHandler.getHealth(switchNr); HasHealthIF::HealthState mainHealth = heaterHandler.getHealth(switchNr);
heater::SwitchState mainState = heaterHandler.getSwitchState(switchNr); heater::SwitchState mainState = heaterHandler.getSwitchState(switchNr);
HasHealthIF::HealthState redHealth = heaterHandler.getHealth(redSwitchNr); HasHealthIF::HealthState redHealth = heaterHandler.getHealth(redSwitchNr);
if (not(mainHealth == HasHealthIF::EXTERNAL_CONTROL and mainState == heater::SwitchState::ON)) { if (mainHealth == HasHealthIF::EXTERNAL_CONTROL and mainState == heater::SwitchState::ON) {
return false;
}
if (mainHealth != HasHealthIF::HEALTHY) { if (mainHealth != HasHealthIF::HEALTHY) {
if (redHealth == HasHealthIF::HEALTHY) { if (redHealth == HasHealthIF::HEALTHY) {
switchNr = redSwitchNr; switchNr = redSwitchNr;
@ -1658,7 +1660,6 @@ bool ThermalController::chooseHeater(heater::Switch& switchNr, heater::Switch re
} else { } else {
ctrlCtx.redSwitchNrInUse = false; ctrlCtx.redSwitchNrInUse = false;
} }
}
return heaterAvailable; return heaterAvailable;
} }
@ -1714,7 +1715,8 @@ void ThermalController::checkLimitsAndCtrlHeater(HeaterContext& htrCtx) {
if (thermalStates[ctrlCtx.thermalComponent].heating) { if (thermalStates[ctrlCtx.thermalComponent].heating) {
// We are already in a heating cycle, so need to check whether heating task is complete. // We are already in a heating cycle, so need to check whether heating task is complete.
if (ctrlCtx.sensorTemp >= htrCtx.tempLimit.opLowerLimit + TEMP_OFFSET and if (ctrlCtx.sensorTemp >= htrCtx.tempLimit.opLowerLimit + TEMP_OFFSET and
heaterCtrlAllowed()) { heaterCtrlAllowed() /*and
heaterHandler.getHealth(htrCtx.switchNr) != HasHealthIF::EXTERNAL_CONTROL*/) {
sif::info << "TCS: Heater " << static_cast<int>(ctrlCtx.thermalComponent) << " OFF" sif::info << "TCS: Heater " << static_cast<int>(ctrlCtx.thermalComponent) << " OFF"
<< std::endl; << std::endl;
heaterSwitchHelper(htrCtx.switchNr, heater::SwitchState::OFF, ctrlCtx.thermalComponent); heaterSwitchHelper(htrCtx.switchNr, heater::SwitchState::OFF, ctrlCtx.thermalComponent);