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

Thermal Controller Update #399

Merged
muellerr merged 84 commits from thermal_controller into develop 2023-04-03 15:12:49 +02:00
Conversation 0 Commits 84 Files Changed 58 +1987 -2379
145 changed files with 1987 additions and 2379 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 36d7852c1d - Show all commits

15
mission/controller/ThermalController.cpp
View File

@@ -137,8 +137,8 @@ void ThermalController::performControlOperation() {
} }
} }
std::array<HeaterHandler::SwitchState, 8> heaterStates; std::array<HeaterHandler::SwitchState, 8> heaterSwitchStateArray{};
heaterHandler.getAllSwitchStates(heaterStates); heaterHandler.getAllSwitchStates(heaterSwitchStateArray);
{ {
PoolReadGuard pg(&heaterInfo); PoolReadGuard pg(&heaterInfo);
std::memcpy(heaterInfo.heaterSwitchState.value, heaterStates.data(), 8); std::memcpy(heaterInfo.heaterSwitchState.value, heaterStates.data(), 8);
@@ -150,7 +150,9 @@ void ThermalController::performControlOperation() {
} }
} }
performThermalModuleCtrl(); if(mode != MODE_OFF) {
performThermalModuleCtrl();
}
cycles++; cycles++;
} }
@@ -983,11 +985,6 @@ void ThermalController::ctrlAcsBoard() {
void ThermalController::ctrlMgt() { void ThermalController::ctrlMgt() {
thermalComponent = MGT; thermalComponent = MGT;
PoolReadGuard pg(&imtqThermalSet);
auto heaterReq =
static_cast<ThermalComponentIF::StateRequest>(imtqThermalSet.heaterRequest.value);
// TODO: remove heaterReq?
if (heaterReq == ThermalComponentIF::STATE_REQUEST_OPERATIONAL) {
sensors[0].first = sensorTemperatures.mgt.isValid(); sensors[0].first = sensorTemperatures.mgt.isValid();
sensors[0].second = sensorTemperatures.mgt.value; sensors[0].second = sensorTemperatures.mgt.value;
sensors[1].first = deviceTemperatures.mgt.isValid(); sensors[1].first = deviceTemperatures.mgt.isValid();
@@ -996,7 +993,7 @@ void ThermalController::ctrlMgt() {
sensors[2].second = sensorTemperatures.plpcduHeatspreader.value; sensors[2].second = sensorTemperatures.plpcduHeatspreader.value;
numSensors = 3; numSensors = 3;
ctrlComponentTemperature(heater::HEATER_2_ACS_BRD, heater::HEATER_3_PCDU_PDU, mgtLimits); ctrlComponentTemperature(heater::HEATER_2_ACS_BRD, heater::HEATER_3_PCDU_PDU, mgtLimits);
}
} }
void ThermalController::ctrlRw() { void ThermalController::ctrlRw() {