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 +15 -11
1 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 096328aadc - Show all commits

26
mission/controller/ThermalController.cpp
View File

@ -1641,21 +1641,25 @@ bool ThermalController::chooseHeater(heater::Switch& switchNr, heater::Switch re
bool heaterAvailable = true; bool heaterAvailable = true;
HasHealthIF::HealthState mainHealth = heaterHandler.getHealth(switchNr); HasHealthIF::HealthState mainHealth = heaterHandler.getHealth(switchNr);
heater::SwitchState mainState = heaterHandler.getSwitchState(switchNr);
HasHealthIF::HealthState redHealth = heaterHandler.getHealth(redSwitchNr); HasHealthIF::HealthState redHealth = heaterHandler.getHealth(redSwitchNr);
if (mainHealth != HasHealthIF::HEALTHY) { if (not(mainHealth == HasHealthIF::EXTERNAL_CONTROL and mainState == heater::SwitchState::ON)) {
if (redHealth == HasHealthIF::HEALTHY) { if (mainHealth != HasHealthIF::HEALTHY) {
switchNr = redSwitchNr; if (redHealth == HasHealthIF::HEALTHY) {
ctrlCtx.redSwitchNrInUse = true; switchNr = redSwitchNr;
} else { ctrlCtx.redSwitchNrInUse = true;
heaterAvailable = false; } else {
// Special case: Ground might command/do something with the heaters, so prevent spam. heaterAvailable = false;
if (not(mainHealth == EXTERNAL_CONTROL and redHealth == EXTERNAL_CONTROL)) { // Special case: Ground might command/do something with the heaters, so prevent spam.
triggerEvent(tcsCtrl::NO_HEALTHY_HEATER_AVAILABLE, switchNr, redSwitchNr); if (not(mainHealth == EXTERNAL_CONTROL and redHealth == EXTERNAL_CONTROL)) {
triggerEvent(tcsCtrl::NO_HEALTHY_HEATER_AVAILABLE, switchNr, redSwitchNr);
}
} }
} else {
ctrlCtx.redSwitchNrInUse = false;
} }
} else {
ctrlCtx.redSwitchNrInUse = false;
} }
return heaterAvailable; return heaterAvailable;
} }