position heaterTransitionControl()
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good

This commit is contained in:
2023-03-09 09:37:10 +01:00
parent 7a62624687
commit 131c508cae
2 changed files with 30 additions and 33 deletions

View File

@ -1168,7 +1168,7 @@ void ThermalController::ctrlPcduAcu() {
bool sensorTempAvailable = true;
if (deviceTemperatures.acu.value[0] !=
INVALID_TEMPERATURE) { // TODO: war invalid aber Wert 0 stat 999
INVALID_TEMPERATURE) {
sensorTemp = deviceTemperatures.acu.value[0];
} else if (deviceTemperatures.acu.value[1] != INVALID_TEMPERATURE) {
sensorTemp = deviceTemperatures.acu.value[1];
@ -1344,30 +1344,30 @@ void ThermalController::ctrlScexBoard() {
}
void ThermalController::performThermalModuleCtrl() {
// ctrlAcsBoard();
// ctrlMgt();
// ctrlRw();
// ctrlStr();
// ctrlIfBoard();
// ctrlTcsBoard();
// ctrlObc();
// ctrlObcIfBoard();
// ctrlSBandTransceiver();
// ctrlPcduP60Board();
// ctrlPcduAcu();
// ctrlPcduPdu();
// ctrlPlPcduBoard();
// ctrlPlocMissionBoard();
// ctrlPlocProcessingBoard();
// ctrlDac();
ctrlCameraBody();
// ctrlDro();
// ctrlX8();
ctrlHpa();
// ctrlTx();
ctrlMpa();
// ctrlScexBoard();
// heaterTransitionControl();
ctrlAcsBoard();
ctrlMgt();
ctrlRw();
ctrlStr();
ctrlIfBoard();
ctrlTcsBoard();
ctrlObc();
ctrlObcIfBoard();
// ctrlSBandTransceiver();
ctrlPcduP60Board();
// ctrlPcduAcu();
ctrlPcduPdu();
ctrlPlPcduBoard();
ctrlPlocMissionBoard();
ctrlPlocProcessingBoard();
ctrlDac();
ctrlCameraBody();
ctrlDro();
ctrlX8();
ctrlHpa();
ctrlTx();
ctrlMpa();
ctrlScexBoard();
heaterTransitionControl();
}
void ThermalController::ctrlComponentTemperature(heater::Switchers switchNr,
heater::Switchers redSwitchNr,
@ -1385,7 +1385,6 @@ void ThermalController::ctrlComponentTemperature(heater::Switchers switchNr,
}
}
}
heaterTransitionControl();
resetSensorsArray();
}
bool ThermalController::selectAndReadSensorTemp() {
@ -1439,7 +1438,7 @@ void ThermalController::ctrlHeater(heater::Switchers switchNr, heater::Switchers
heaterStates[switchNr].switchTransition = true;
thermalStates[thermalComponent].heating = true;
// TODO: EVENT; aber heaterHandler erstellt schon event
}else{
} else {
thermalStates[thermalComponent].heating = false;
}
@ -1479,6 +1478,7 @@ void ThermalController::resetSensorsArray() {
thermalComponent = NONE;
}
void ThermalController::heaterTransitionControl() {
// TODO: Test
for (unsigned i = 0; i < 7; i++) {
if (heaterStates[i].switchTransition) {
if (heaterStates[i].heaterSwitchControlErrorCounter > 3) {