From d2736214190961e535aa4c1a6a32bc7e7e08712e Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Wed, 15 Mar 2023 14:36:18 +0100 Subject: [PATCH] some tweaks --- mission/controller/ThermalController.cpp | 15 ++++++++++----- mission/controller/ThermalController.h | 4 ++-- tmtc | 2 +- 3 files changed, 13 insertions(+), 8 deletions(-) diff --git a/mission/controller/ThermalController.cpp b/mission/controller/ThermalController.cpp index 8427acd6..e0630309 100644 --- a/mission/controller/ThermalController.cpp +++ b/mission/controller/ThermalController.cpp @@ -1448,22 +1448,27 @@ void ThermalController::performThermalModuleCtrl() { ctrlPcduP60Board(); ctrlPcduAcu(); ctrlPcduPdu(); - ctrlPlPcduBoard(); + + // Payload components ctrlPlocMissionBoard(); ctrlPlocProcessingBoard(); - ctrlDac(); ctrlCameraBody(); + ctrlScexBoard(); + + // E-Band + ctrlPlPcduBoard(); + ctrlDac(); ctrlDro(); ctrlX8(); ctrlHpa(); ctrlTx(); ctrlMpa(); - ctrlScexBoard(); + heaterTransitionControl(); } void ThermalController::ctrlComponentTemperature(heater::Switchers switchNr, heater::Switchers redSwitchNr, - TempLimits& tempLimit) { + const TempLimits& tempLimit) { if (selectAndReadSensorTemp()) { if (chooseHeater(switchNr, redSwitchNr)) { checkLimitsAndCtrlHeater(switchNr, redSwitchNr, tempLimit); @@ -1521,7 +1526,7 @@ bool ThermalController::chooseHeater(heater::Switchers& switchNr, heater::Switch } void ThermalController::checkLimitsAndCtrlHeater(heater::Switchers switchNr, heater::Switchers redSwitchNr, - struct TempLimits& tempLimit) { + const TempLimits& tempLimit) { componentAboveCutOffLimit = false; componentAboveUpperLimit = false; // if Heater off diff --git a/mission/controller/ThermalController.h b/mission/controller/ThermalController.h index accfecbb..fc3c9e4b 100644 --- a/mission/controller/ThermalController.h +++ b/mission/controller/ThermalController.h @@ -227,9 +227,9 @@ class ThermalController : public ExtendedControllerBase { void copyDevices(); void ctrlComponentTemperature(heater::Switchers switchNr, heater::Switchers redSwitchNr, - TempLimits& tempLimit); + const TempLimits& tempLimit); void checkLimitsAndCtrlHeater(heater::Switchers switchNr, heater::Switchers redSwitchNr, - TempLimits& tempLimit); + const TempLimits& tempLimit); bool chooseHeater(heater::Switchers& switchNr, heater::Switchers redSwitchNr); bool selectAndReadSensorTemp(); diff --git a/tmtc b/tmtc index a54e5a8e..4f48c25b 160000 --- a/tmtc +++ b/tmtc @@ -1 +1 @@ -Subproject commit a54e5a8e143380131bcb66fd6ff8b8ad48390e05 +Subproject commit 4f48c25bf757b6c056072049fe5965da890b4f5b