eive/eive-obsw
eive/eive-obsw
12
3
Fork 0
Code Issues 3 Pull Requests Releases 118 Wiki Activity

some tweaks
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
Details

Browse Source
This commit is contained in:
Robin Müller 2023-03-15 14:36:18 +01:00
parent 64ec76bfb7
commit d273621419
No known key found for this signature in database
GPG Key ID: 71B58F8A3CDFA9AC
3 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
mission/controller/ThermalController.cpp
View File

@ -1448,22 +1448,27 @@ void ThermalController::performThermalModuleCtrl() {
ctrlPcduP60Board(); ctrlPcduP60Board();
ctrlPcduAcu(); ctrlPcduAcu();
ctrlPcduPdu(); ctrlPcduPdu();
ctrlPlPcduBoard();
// Payload components
ctrlPlocMissionBoard(); ctrlPlocMissionBoard();
ctrlPlocProcessingBoard(); ctrlPlocProcessingBoard();
ctrlDac();
ctrlCameraBody(); ctrlCameraBody();
ctrlScexBoard();
// E-Band
ctrlPlPcduBoard();
ctrlDac();
ctrlDro(); ctrlDro();
ctrlX8(); ctrlX8();
ctrlHpa(); ctrlHpa();
ctrlTx(); ctrlTx();
ctrlMpa(); ctrlMpa();
ctrlScexBoard();
heaterTransitionControl(); heaterTransitionControl();
} }
void ThermalController::ctrlComponentTemperature(heater::Switchers switchNr, void ThermalController::ctrlComponentTemperature(heater::Switchers switchNr,
heater::Switchers redSwitchNr, heater::Switchers redSwitchNr,
TempLimits& tempLimit) { const TempLimits& tempLimit) {
if (selectAndReadSensorTemp()) { if (selectAndReadSensorTemp()) {
if (chooseHeater(switchNr, redSwitchNr)) { if (chooseHeater(switchNr, redSwitchNr)) {
checkLimitsAndCtrlHeater(switchNr, redSwitchNr, tempLimit); checkLimitsAndCtrlHeater(switchNr, redSwitchNr, tempLimit);
@ -1521,7 +1526,7 @@ bool ThermalController::chooseHeater(heater::Switchers& switchNr, heater::Switch
} }
void ThermalController::checkLimitsAndCtrlHeater(heater::Switchers switchNr, void ThermalController::checkLimitsAndCtrlHeater(heater::Switchers switchNr,
heater::Switchers redSwitchNr, heater::Switchers redSwitchNr,
struct TempLimits& tempLimit) { const TempLimits& tempLimit) {
componentAboveCutOffLimit = false; componentAboveCutOffLimit = false;
componentAboveUpperLimit = false; componentAboveUpperLimit = false;
// if Heater off // if Heater off

4
mission/controller/ThermalController.h
View File

@ -227,9 +227,9 @@ class ThermalController : public ExtendedControllerBase {
void copyDevices(); void copyDevices();
void ctrlComponentTemperature(heater::Switchers switchNr, heater::Switchers redSwitchNr, void ctrlComponentTemperature(heater::Switchers switchNr, heater::Switchers redSwitchNr,
TempLimits& tempLimit); const TempLimits& tempLimit);
void checkLimitsAndCtrlHeater(heater::Switchers switchNr, heater::Switchers redSwitchNr, void checkLimitsAndCtrlHeater(heater::Switchers switchNr, heater::Switchers redSwitchNr,
TempLimits& tempLimit); const TempLimits& tempLimit);
bool chooseHeater(heater::Switchers& switchNr, heater::Switchers redSwitchNr); bool chooseHeater(heater::Switchers& switchNr, heater::Switchers redSwitchNr);
bool selectAndReadSensorTemp(); bool selectAndReadSensorTemp();

2
tmtc

@ -1 +1 @@
Subproject commit a54e5a8e143380131bcb66fd6ff8b8ad48390e05 Subproject commit 4f48c25bf757b6c056072049fe5965da890b4f5b