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

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

Browse Source
This commit is contained in:
Irini Kosmidou 2023-01-16 17:53:02 +01:00
parent bc169d50b9
commit 42b570a274
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fsfw

@ -1 +1 @@
Subproject commit accaf855ee53d3dc429d7bcdf1b7b89768c166b6 Subproject commit 05cad893a2b713827cf4cdc9afe49675f18afcc7

2
mission/controller/ThermalController.cpp
View File

@ -1130,7 +1130,7 @@ void ThermalController::ctrlHeater(heater::Switchers switchNr, heater::Switchers
struct TempLimits* tempLimit) { struct TempLimits* tempLimit) {
// Heater off // Heater off
if (not heaterHandler.checkSwitchState(switchNr)) { if (not heaterHandler.checkSwitchState(switchNr)) {
// TODO: check if OP or NOP // TODO: check if OP
if (sensorTemp < (*tempLimit).opLowerLimit) { if (sensorTemp < (*tempLimit).opLowerLimit) {
heaterHandler.switchHeater(switchNr, HeaterHandler::SwitchState::ON); heaterHandler.switchHeater(switchNr, HeaterHandler::SwitchState::ON);
} }

2
mission/controller/ThermalController.h
View File

@ -160,7 +160,7 @@ class ThermalController : public ExtendedControllerBase {
void ctrlComponentTemperature(heater::Switchers switchNr, heater::Switchers redSwitchNr, void ctrlComponentTemperature(heater::Switchers switchNr, heater::Switchers redSwitchNr,
const lp_float_t& sensor1, const lp_float_t& sensor2, const lp_float_t& sensor1, const lp_float_t& sensor2,
const lp_float_t& sensor3, TempLimits* tempLimit, const lp_float_t& sensor3, TempLimits* tempLimit,
bool moreThan3Sensors = false); bool moreThan3Sensors = false); //TODO sensor 4, 5 = default argument, if not available
void ctrlHeater(heater::Switchers switchNr, heater::Switchers redSwitchNr, TempLimits* tempLimit); void ctrlHeater(heater::Switchers switchNr, heater::Switchers redSwitchNr, TempLimits* tempLimit);
void chooseHeater(heater::Switchers& switchNr, heater::Switchers redSwitchNr); void chooseHeater(heater::Switchers& switchNr, heater::Switchers redSwitchNr);
void chooseSensor(heater::Switchers switchNr, const lp_float_t& sensor1, void chooseSensor(heater::Switchers switchNr, const lp_float_t& sensor1,

2
tmtc

@ -1 +1 @@
Subproject commit d652c4663b6e738345799026a16d6d2f00d7e65d Subproject commit 56d0f26cbffbfbf4e790d3a19858162291104934