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

Thermal Controller Update #399

Merged
muellerr merged 84 commits from thermal_controller into develop 2023-04-03 15:12:49 +02:00
Conversation 0 Commits 84 Files Changed 58 +11112 -22174
479 changed files with 11112 additions and 22174 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 9b849d10e9 - Show all commits

12
mission/controller/ThermalController.cpp
View File

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