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

small changes
EIVE/eive-obsw/pipeline/head This commit looks good Details

This commit is contained in:
Irini Kosmidou 2023-02-21 17:49:55 +01:00
parent 77b7433caf
commit 9b849d10e9
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
mission/controller/ThermalController.cpp
View File

@ -109,7 +109,7 @@ void ThermalController::performControlOperation() {
deviceTemperatures.commit();
}
// performThermalModuleCtrl();
performThermalModuleCtrl();
}
ReturnValue_t ThermalController::initializeLocalDataPool(localpool::DataPool& localDataPoolMap,
@ -993,6 +993,7 @@ void ThermalController::ctrlAcsBoard() {
sensors[2].second = deviceTemperatures.gyro3SideB.value;
sensors[3].first = sensorTemperatures.sensor_tcs_board.isValid();
sensors[3].second = sensorTemperatures.sensor_tcs_board.value;
numSensors = 4;
if (selectAndReadSensorTemp()) {
if (chooseHeater(switchNr, redSwitchNr)) {
ctrlHeater(switchNr, redSwitchNr, acsBoardLimits);
@ -1177,7 +1178,7 @@ void ThermalController::ctrlPcduAcu() {
if (chooseHeater(switchNr, redSwitchNr)) {
bool sensorTempAvailable = true;
if (deviceTemperatures.acu.value[0] != INVALID_TEMPERATURE) {
if (deviceTemperatures.acu.value[0] != INVALID_TEMPERATURE) { //TODO: war invalid aber Wert 0 stat 999
sensorTemp = deviceTemperatures.acu.value[0];
} else if (deviceTemperatures.acu.value[1] != INVALID_TEMPERATURE) {
sensorTemp = deviceTemperatures.acu.value[1];
@ -1203,7 +1204,7 @@ void ThermalController::ctrlPcduPdu() {
sensors[1].second = deviceTemperatures.pdu2.value;
sensors[2].first = sensorTemperatures.tmp1075Tcs0.isValid();
sensors[2].second = sensorTemperatures.tmp1075Tcs0.value;
numSensors = 2;
numSensors = 3;
ctrlComponentTemperature(heater::HEATER_3_PCDU_PDU, heater::HEATER_2_ACS_BRD, pcduPduLimits);
}
@ -1353,16 +1354,14 @@ void ThermalController::ctrlScexBoard() {
}
void ThermalController::performThermalModuleCtrl() {
ctrlCameraBody();
ctrlAcsBoard();
ctrlMgt();
ctrlRw();
ctrlStr();
ctrlIfBoard();
ctrlAcsBoard();
ctrlTcsBoard();
ctrlObc();
ctrlObcIfBoard();
ctrlTcsBoard(); // Todo: warum wurde das weggelassen?
ctrlSBandTransceiver();
ctrlPcduP60Board();
ctrlPcduAcu();
@ -1371,6 +1370,7 @@ void ThermalController::performThermalModuleCtrl() {
ctrlPlocMissionBoard();
ctrlPlocProcessingBoard();
ctrlDac();
ctrlCameraBody();
ctrlDro();
ctrlX8();
ctrlHpa();