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

ThermalController: added sensors to components
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-05 19:39:51 +01:00
parent a81e7c5057
commit 94c178941d
2 changed files with 72 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

116
mission/controller/ThermalController.cpp
View File

@ -105,9 +105,9 @@ void ThermalController::performControlOperation() {
} }
// TODO: Heater control // TODO: Heater control
//ctrlCameraBody(); // ctrlCameraBody();
/*ctrlAcsBoard(); // ctrlAcsBoard();
ctrlMgt(); /*ctrlMgt();
ctrlRw(); ctrlRw();
ctrlStr(); ctrlStr();
ctrlIfBoard(); ctrlIfBoard();
@ -976,31 +976,19 @@ void ThermalController::copyDevices() {
} }
} }
/*
void ThermalController::ctrlAcsBoard() { void ThermalController::ctrlAcsBoard() {
ctrlComponentTemperature(heater::HEATER_2_ACS_BRD, heater::HEATER_0_OBC_BRD, ctrlComponentTemperature(heater::HEATER_2_ACS_BRD, heater::HEATER_0_OBC_BRD,
deviceTemperatures.gyro0SideA, deviceTemperatures.mgm0SideA, deviceTemperatures.gyro0SideA, deviceTemperatures.mgm0SideA,
deviceTemperatures.gyro1SideA, deviceTemperatures.gyro1SideA, // mgm1(int),
// sensorTemperatures.sensor_tcs_board,
&acsBoardLimits); // TODO: add red sensors &acsBoardLimits); // TODO: add red sensors
} }
void ThermalController::ctrlMgt() { void ThermalController::ctrlMgt() {
heater::Switchers switchNr = heater::HEATER_2_ACS_BRD; // TODO: cast deviceTemperatures.mgt
heater::Switchers redSwitchNr = heater::HEATER_3_PCDU_PDU; // ctrlComponentTemperature(heater::HEATER_2_ACS_BRD, heater::HEATER_3_PCDU_PDU,
// sensorTemperatures.sensor_magnettorquer, deviceTemperatures.mgt,
chooseHeater(switchNr, redSwitchNr); // sensorTemperatures.sensor_plpcdu_heatspreader, &mgtLimits);
if (heaterAvailable) {
chooseSensorOldVersion(
switchNr, sensorTemperatures.sensor_magnettorquer.value, deviceTemperatures.mgt.value,
sensorTemperatures.sensor_plpcdu_heatspreader.value,
sensorTemperatures.sensor_magnettorquer.isValid(), deviceTemperatures.mgt.isValid(),
sensorTemperatures.sensor_plpcdu_heatspreader.isValid());
if (sensorTempAvailable) {
ctrlHeater(switchNr, redSwitchNr, &mgtLimits);
}
}
} }
void ThermalController::ctrlRw() { void ThermalController::ctrlRw() {
@ -1021,41 +1009,61 @@ void ThermalController::ctrlIfBoard() {
} }
void ThermalController::ctrlTcsBoard() { void ThermalController::ctrlTcsBoard() {
ctrlComponentTemperature(heater::HEATER_0_OBC_BRD, heater::HEATER_2_ACS_BRD, &tcsBoardLimits); ctrlComponentTemperature(heater::HEATER_0_OBC_BRD, heater::HEATER_2_ACS_BRD,
sensorTemperatures.sensor_tcs_board, sensorTemperatures.tmp1075Tcs0,
sensorTemperatures.tmp1075Tcs1, &tcsBoardLimits);
} }
void ThermalController::ctrlObc() { void ThermalController::ctrlObc() {
ctrlComponentTemperature(heater::HEATER_0_OBC_BRD, heater::HEATER_2_ACS_BRD, &obcLimits); ctrlComponentTemperature(heater::HEATER_0_OBC_BRD, heater::HEATER_2_ACS_BRD,
deviceTemperatures.q7s, sensorTemperatures.tmp1075Tcs1,
sensorTemperatures.tmp1075Tcs0, &obcLimits);
} }
void ThermalController::ctrlObcIfBoard() { void ThermalController::ctrlObcIfBoard() {
ctrlComponentTemperature(heater::HEATER_0_OBC_BRD, heater::HEATER_2_ACS_BRD, &obcIfBoardLimits); ctrlComponentTemperature(heater::HEATER_0_OBC_BRD, heater::HEATER_2_ACS_BRD,
deviceTemperatures.q7s, sensorTemperatures.tmp1075Tcs0,
sensorTemperatures.tmp1075Tcs1, &obcIfBoardLimits);
} }
void ThermalController::ctrlSBandTransceiver() { void ThermalController::ctrlSBandTransceiver() {
ctrlComponentTemperature(heater::HEATER_7_S_BAND, heater::HEATER_4_CAMERA, ctrlComponentTemperature(heater::HEATER_7_S_BAND, heater::HEATER_4_CAMERA,
&sBandTransceiverLimits); deviceTemperatures.syrlinksPowerAmplifier,
deviceTemperatures.syrlinksBasebandBoard,
sensorTemperatures.sensor_4k_camera, &sBandTransceiverLimits);
} }
void ThermalController::ctrlPcduP60Board() { void ThermalController::ctrlPcduP60Board() {
// TODO: remove sensor3
ctrlComponentTemperature(heater::HEATER_3_PCDU_PDU, heater::HEATER_2_ACS_BRD, ctrlComponentTemperature(heater::HEATER_3_PCDU_PDU, heater::HEATER_2_ACS_BRD,
&pcduP60BoardLimits); deviceTemperatures.temp1P60dock, deviceTemperatures.temp2P60dock,
deviceTemperatures.temp2P60dock, &pcduP60BoardLimits);
} }
void ThermalController::ctrlPcduAcu() { void ThermalController::ctrlPcduAcu() {
ctrlComponentTemperature(heater::HEATER_3_PCDU_PDU, heater::HEATER_2_ACS_BRD, &pcduAcuLimits); // TODO: check sensors (float,3)
// ctrlComponentTemperature(heater::HEATER_3_PCDU_PDU, heater::HEATER_2_ACS_BRD,
// deviceTemperatures.acu, deviceTemperatures.acu, sensorTemperatures.sensor_acu, &pcduAcuLimits);
} }
void ThermalController::ctrlPcduPdu() { void ThermalController::ctrlPcduPdu() {
ctrlComponentTemperature(heater::HEATER_3_PCDU_PDU, heater::HEATER_2_ACS_BRD, &pcduPduLimits); // TODO: remove sensor3
ctrlComponentTemperature(heater::HEATER_3_PCDU_PDU, heater::HEATER_2_ACS_BRD,
deviceTemperatures.pdu1, deviceTemperatures.pdu2,
deviceTemperatures.pdu2, &pcduPduLimits);
} }
void ThermalController::ctrlPlPcduBoard() { void ThermalController::ctrlPlPcduBoard() {
ctrlComponentTemperature(heater::HEATER_3_PCDU_PDU, heater::HEATER_2_ACS_BRD, &plPcduBoardLimits); // TODO: add sensor 4: sensorTemperatures.sensor_plpcdu_heatspreader
ctrlComponentTemperature(heater::HEATER_3_PCDU_PDU, heater::HEATER_2_ACS_BRD,
sensorTemperatures.tmp1075PlPcdu0, sensorTemperatures.tmp1075PlPcdu1,
deviceTemperatures.adcPayloadPcdu, &plPcduBoardLimits);
} }
void ThermalController::ctrlPlocMissionBoard() { void ThermalController::ctrlPlocMissionBoard() {
ctrlComponentTemperature(heater::HEATER_1_PLOC_PROC_BRD, heater::HEATER_0_OBC_BRD, ctrlComponentTemperature(heater::HEATER_1_PLOC_PROC_BRD, heater::HEATER_0_OBC_BRD,
&plocMissionBoardLimits); sensorTemperatures.sensor_ploc_heatspreader,
sensorTemperatures.sensor_ploc_missionboard,
sensorTemperatures.sensor_dac_heatspreader, &plocMissionBoardLimits);
} }
void ThermalController::ctrlPlocProcessingBoard() { void ThermalController::ctrlPlocProcessingBoard() {
@ -1079,29 +1087,41 @@ void ThermalController::ctrlCameraBody() {
} }
void ThermalController::ctrlDro() { void ThermalController::ctrlDro() {
ctrlComponentTemperature(heater::HEATER_6_DRO, heater::HEATER_4_CAMERA, &droLimits); ctrlComponentTemperature(heater::HEATER_6_DRO, heater::HEATER_4_CAMERA,
sensorTemperatures.sensor_dro, sensorTemperatures.sensor_4k_camera,
sensorTemperatures.sensor_mpa, &droLimits);
} }
void ThermalController::ctrlX8() { void ThermalController::ctrlX8() {
ctrlComponentTemperature(heater::HEATER_6_DRO, heater::HEATER_4_CAMERA, &x8Limits); ctrlComponentTemperature(heater::HEATER_6_DRO, heater::HEATER_4_CAMERA,
sensorTemperatures.sensor_x8, sensorTemperatures.sensor_hpa,
sensorTemperatures.sensor_tx_modul, &x8Limits);
} }
void ThermalController::ctrlTx() { void ThermalController::ctrlTx() {
ctrlComponentTemperature(heater::HEATER_6_DRO, heater::HEATER_4_CAMERA, &txLimits); ctrlComponentTemperature(heater::HEATER_6_DRO, heater::HEATER_4_CAMERA,
sensorTemperatures.sensor_tx_modul, sensorTemperatures.sensor_x8,
sensorTemperatures.sensor_mpa, &txLimits);
} }
void ThermalController::ctrlMpa() { void ThermalController::ctrlMpa() {
ctrlComponentTemperature(heater::HEATER_6_DRO, heater::HEATER_4_CAMERA, &mpaLimits); ctrlComponentTemperature(heater::HEATER_6_DRO, heater::HEATER_4_CAMERA,
sensorTemperatures.sensor_mpa, sensorTemperatures.sensor_hpa,
sensorTemperatures.sensor_tx_modul, &mpaLimits);
} }
void ThermalController::ctrlHpa() { void ThermalController::ctrlHpa() {
ctrlComponentTemperature(heater::HEATER_6_DRO, heater::HEATER_4_CAMERA, &hpaLimits); ctrlComponentTemperature(heater::HEATER_6_DRO, heater::HEATER_4_CAMERA,
sensorTemperatures.sensor_hpa, sensorTemperatures.sensor_x8,
sensorTemperatures.sensor_mpa, &hpaLimits);
} }
void ThermalController::ctrlScexBoard() { void ThermalController::ctrlScexBoard() {
ctrlComponentTemperature(heater::HEATER_6_DRO, heater::HEATER_5_STR, &scexBoardLimits); ctrlComponentTemperature(heater::HEATER_6_DRO, heater::HEATER_5_STR,
sensorTemperatures.sensor_scex, sensorTemperatures.sensor_x8,
sensorTemperatures.sensor_hpa, &scexBoardLimits);
} }
*/
void ThermalController::ctrlHeater(heater::Switchers switchNr, heater::Switchers redSwitchNr, void ThermalController::ctrlHeater(heater::Switchers switchNr, heater::Switchers redSwitchNr,
struct TempLimits* tempLimit) { struct TempLimits* tempLimit) {
// Heater off // Heater off
@ -1144,7 +1164,6 @@ void ThermalController::chooseHeater(heater::Switchers& switchNr, heater::Switch
void ThermalController::chooseSensor(heater::Switchers switchNr, const lp_float_t& sensor1, void ThermalController::chooseSensor(heater::Switchers switchNr, const lp_float_t& sensor1,
const lp_float_t& sensor2, const lp_float_t& sensor3, const lp_float_t& sensor2, const lp_float_t& sensor3,
const lp_float_t& sensor4, const lp_float_t& sensor5,
bool moreThan3Sensors) { bool moreThan3Sensors) {
sensorTempAvailable = true; sensorTempAvailable = true;
@ -1154,10 +1173,10 @@ void ThermalController::chooseSensor(heater::Switchers switchNr, const lp_float_
sensorTemp = sensor2.value; sensorTemp = sensor2.value;
} else if (sensor3.isValid()) { } else if (sensor3.isValid()) {
sensorTemp = sensor3.value; sensorTemp = sensor3.value;
} else if (moreThan3Sensors and sensor4.isValid()) { /*} else if (moreThan3Sensors and sensor4.isValid()) {
sensorTemp = sensor4.value; sensorTemp = sensor4.value;
} else if (moreThan3Sensors and sensor5.isValid()) { } else if (moreThan3Sensors and sensor5.isValid()) {
sensorTemp = sensor5.value; sensorTemp = sensor5.value; */
} else { } else {
if (heaterHandler.checkSwitchState(switchNr)) { if (heaterHandler.checkSwitchState(switchNr)) {
heaterHandler.switchHeater(switchNr, HeaterHandler::SwitchState::OFF); heaterHandler.switchHeater(switchNr, HeaterHandler::SwitchState::OFF);
@ -1168,15 +1187,16 @@ void ThermalController::chooseSensor(heater::Switchers switchNr, const lp_float_
} }
} }
void ThermalController::ctrlComponentTemperature(heater::Switchers switchNr,
void ThermalController::ctrlComponentTemperature( heater::Switchers redSwitchNr,
heater::Switchers switchNr, heater::Switchers redSwitchNr, const lp_float_t& sensor1, const lp_float_t& sensor1,
const lp_float_t& sensor2, const lp_float_t& sensor3, const lp_float_t& sensor4, const lp_float_t& sensor2,
const lp_float_t& sensor5, TempLimits* tempLimit, bool moreThan3Sensors) { const lp_float_t& sensor3, TempLimits* tempLimit,
bool moreThan3Sensors) {
chooseHeater(switchNr, redSwitchNr); chooseHeater(switchNr, redSwitchNr);
if (heaterAvailable) { if (heaterAvailable) {
chooseSensor(switchNr, sensor1, sensor2, sensor3, sensor4, sensor5, moreThan3Sensors); chooseSensor(switchNr, sensor1, sensor2, sensor3, moreThan3Sensors);
if (sensorTempAvailable) { if (sensorTempAvailable) {
ctrlHeater(switchNr, redSwitchNr, tempLimit); ctrlHeater(switchNr, redSwitchNr, tempLimit);

11
mission/controller/ThermalController.h
View File

@ -135,7 +135,7 @@ class ThermalController : public ExtendedControllerBase {
TempLimits mpaLimits = TempLimits(-40.0, -30.0, -75.0, 80.0, 90.0); TempLimits mpaLimits = TempLimits(-40.0, -30.0, -75.0, 80.0, 90.0);
TempLimits scexBoardLimits = TempLimits(-60.0, -40.0, 80.0, 85.0, 150.0); TempLimits scexBoardLimits = TempLimits(-60.0, -40.0, 80.0, 85.0, 150.0);
float sensorTemp; static float sensorTemp;
bool sensorTempAvailable = true; bool sensorTempAvailable = true;
bool heaterAvailable = true; bool heaterAvailable = true;
bool redSwitchNrInUse = false; bool redSwitchNrInUse = false;
@ -157,15 +157,12 @@ 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, const lp_float_t& sensor4, const lp_float_t& sensor3, TempLimits* tempLimit,
const lp_float_t& sensor5, TempLimits* tempLimit,
bool moreThan3Sensors = false); bool moreThan3Sensors = false);
void ctrlHeater(heater::Switchers switchNr, heater::Switchers redSwitchNr, void ctrlHeater(heater::Switchers switchNr, heater::Switchers redSwitchNr, TempLimits* tempLimit);
struct 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,
const lp_float_t& sensor2, const lp_float_t& sensor3, const lp_float_t& sensor4, const lp_float_t& sensor2, const lp_float_t& sensor3, bool moreThan3Sensors);
const lp_float_t& sensor5, bool moreThan3Sensors);
void ctrlAcsBoard(); void ctrlAcsBoard();
void ctrlMgt(); void ctrlMgt();