Heater Handling #325

Merged
muellerr merged 78 commits from heater_handling into develop 2023-02-08 21:35:05 +01:00
164 changed files with 3655 additions and 5774 deletions
Showing only changes of commit 42b570a274 - Show all commits

2
fsfw

Submodule fsfw updated: accaf855ee...05cad893a2

View File

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

View File

@@ -160,7 +160,7 @@ class ThermalController : public ExtendedControllerBase {
void ctrlComponentTemperature(heater::Switchers switchNr, heater::Switchers redSwitchNr,
const lp_float_t& sensor1, const lp_float_t& sensor2,
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 chooseHeater(heater::Switchers& switchNr, heater::Switchers redSwitchNr);
void chooseSensor(heater::Switchers switchNr, const lp_float_t& sensor1,

2
tmtc

Submodule tmtc updated: d652c4663b...56d0f26cbf