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

deleted comments fromm ThermalController
Some checks failed
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
Details

Browse Source
This commit is contained in:
Irini Kosmidou 2023-01-28 22:51:51 +01:00
parent d432443545
commit fa7281794a
3 changed files with 16 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
linux/ObjectFactory.cpp
View File

@ -24,6 +24,7 @@
#include "devices/addresses.h" #include "devices/addresses.h"
#include "devices/gpioIds.h" #include "devices/gpioIds.h"
#include "eive/definitions.h" #include "eive/definitions.h"
#include "mission/controller/ThermalController.h"
#include "mission/system/tree/acsModeTree.h" #include "mission/system/tree/acsModeTree.h"
#include "mission/system/tree/payloadModeTree.h" #include "mission/system/tree/payloadModeTree.h"
#include "mission/system/tree/tcsModeTree.h" #include "mission/system/tree/tcsModeTree.h"
@ -348,8 +349,8 @@ void ObjectFactory::createScexComponents(std::string uartDev, PowerSwitchIF* pwr
scexHandler->connectModeTreeParent(satsystem::pl::SUBSYSTEM); scexHandler->connectModeTreeParent(satsystem::pl::SUBSYSTEM);
} }
void ObjectFactory::createThermalController() { void ObjectFactory::createThermalController(HeaterHandler& heaterHandler) {
auto* tcsCtrl = new ThermalController(objects::THERMAL_CONTROLLER); auto* tcsCtrl = new ThermalController(objects::THERMAL_CONTROLLER, heaterHandler);
tcsCtrl->connectModeTreeParent(satsystem::tcs::SUBSYSTEM); tcsCtrl->connectModeTreeParent(satsystem::tcs::SUBSYSTEM);
} }

1
linux/ObjectFactory.h
View File

@ -36,4 +36,5 @@ AcsController* createAcsController(bool connectSubsystem);
void addTmtcIpCoresToFunnels(CcsdsIpCoreHandler& ipCoreHandler, PusTmFunnel& pusFunnel, void addTmtcIpCoresToFunnels(CcsdsIpCoreHandler& ipCoreHandler, PusTmFunnel& pusFunnel,
CfdpTmFunnel& cfdpFunnel); CfdpTmFunnel& cfdpFunnel);
void createThermalController(HeaterHandler& heaterHandler);
} // namespace ObjectFactory } // namespace ObjectFactory

31
mission/controller/ThermalController.cpp
View File

@ -108,7 +108,6 @@ void ThermalController::performControlOperation() {
deviceTemperatures.commit(); deviceTemperatures.commit();
} }
// TODO: Heater control
ctrlCameraBody(); ctrlCameraBody();
ctrlAcsBoard(); ctrlAcsBoard();
ctrlMgt(); ctrlMgt();
@ -984,7 +983,6 @@ void ThermalController::copyDevices() {
} }
void ThermalController::ctrlAcsBoard() { void ThermalController::ctrlAcsBoard() {
// TODO: check sensor 4; A:MGM1(int); B: MGM3(int)
heater::Switchers switchNr = heater::HEATER_2_ACS_BRD; heater::Switchers switchNr = heater::HEATER_2_ACS_BRD;
heater::Switchers redSwitchNr = heater::HEATER_0_OBC_BRD; heater::Switchers redSwitchNr = heater::HEATER_0_OBC_BRD;
chooseHeater(switchNr, redSwitchNr); chooseHeater(switchNr, redSwitchNr);
@ -1008,9 +1006,8 @@ void ThermalController::ctrlAcsBoard() {
} }
void ThermalController::ctrlMgt() { void ThermalController::ctrlMgt() {
// TODO: use heaterReq
PoolReadGuard pg(&imtqThermalSet); PoolReadGuard pg(&imtqThermalSet);
ThermalComponentIF::StateRequest heaterReq = auto heaterReq =
static_cast<ThermalComponentIF::StateRequest>(imtqThermalSet.heaterRequest.value); static_cast<ThermalComponentIF::StateRequest>(imtqThermalSet.heaterRequest.value);
if (heaterReq == ThermalComponentIF::STATE_REQUEST_OPERATIONAL) { if (heaterReq == ThermalComponentIF::STATE_REQUEST_OPERATIONAL) {
@ -1034,7 +1031,6 @@ void ThermalController::ctrlMgt() {
} }
triggerEvent(NO_VALID_SENSOR_TEMPERATURE, switchNr); triggerEvent(NO_VALID_SENSOR_TEMPERATURE, switchNr);
sensorTempAvailable = false; sensorTempAvailable = false;
} }
if (sensorTempAvailable) { if (sensorTempAvailable) {
ctrlHeater(switchNr, redSwitchNr, &mgtLimits); ctrlHeater(switchNr, redSwitchNr, &mgtLimits);
@ -1055,9 +1051,9 @@ void ThermalController::ctrlRw() {
if (sensorTemperatures.sensor_rw1.isValid()) { if (sensorTemperatures.sensor_rw1.isValid()) {
sensorTemp = sensorTemperatures.sensor_rw1.value; sensorTemp = sensorTemperatures.sensor_rw1.value;
} else if (deviceTemperatures.rw1.isValid()) { } else if (deviceTemperatures.rw1.isValid()) {
sensorTemp = deviceTemperatures.rw1.value; sensorTemp = static_cast<float>(deviceTemperatures.rw1.value);
} else if (deviceTemperatures.rw4.isValid()) { } else if (deviceTemperatures.rw4.isValid()) {
sensorTemp = deviceTemperatures.rw4.value; sensorTemp = static_cast<float>(deviceTemperatures.rw4.value);
} else if (sensorTemperatures.sensor_dro.isValid()) { } else if (sensorTemperatures.sensor_dro.isValid()) {
sensorTemp = sensorTemperatures.sensor_dro.value; sensorTemp = sensorTemperatures.sensor_dro.value;
} else { } else {
@ -1073,9 +1069,9 @@ void ThermalController::ctrlRw() {
// RW2 // RW2
sensorTempAvailable = true; sensorTempAvailable = true;
if (deviceTemperatures.rw2.isValid()) { if (deviceTemperatures.rw2.isValid()) {
sensorTemp = deviceTemperatures.rw2.value; sensorTemp = static_cast<float>(deviceTemperatures.rw2.value);
} else if (deviceTemperatures.rw3.isValid()) { } else if (deviceTemperatures.rw3.isValid()) {
sensorTemp = deviceTemperatures.rw3.value; sensorTemp = static_cast<float>(deviceTemperatures.rw3.value);
} else if (sensorTemperatures.sensor_rw1.isValid()) { } else if (sensorTemperatures.sensor_rw1.isValid()) {
sensorTemp = sensorTemperatures.sensor_rw1.value; sensorTemp = sensorTemperatures.sensor_rw1.value;
} else if (sensorTemperatures.sensor_dro.isValid()) { } else if (sensorTemperatures.sensor_dro.isValid()) {
@ -1093,9 +1089,9 @@ void ThermalController::ctrlRw() {
// RW3 // RW3
sensorTempAvailable = true; sensorTempAvailable = true;
if (deviceTemperatures.rw3.isValid()) { if (deviceTemperatures.rw3.isValid()) {
sensorTemp = deviceTemperatures.rw3.value; sensorTemp = static_cast<float>(deviceTemperatures.rw3.value);
} else if (deviceTemperatures.rw4.isValid()) { } else if (deviceTemperatures.rw4.isValid()) {
sensorTemp = deviceTemperatures.rw4.value; sensorTemp = static_cast<float>(deviceTemperatures.rw4.value);
} else if (sensorTemperatures.sensor_rw1.isValid()) { } else if (sensorTemperatures.sensor_rw1.isValid()) {
sensorTemp = sensorTemperatures.sensor_rw1.value; sensorTemp = sensorTemperatures.sensor_rw1.value;
} else if (sensorTemperatures.sensor_dro.isValid()) { } else if (sensorTemperatures.sensor_dro.isValid()) {
@ -1113,9 +1109,9 @@ void ThermalController::ctrlRw() {
// RW4 // RW4
sensorTempAvailable = true; sensorTempAvailable = true;
if (deviceTemperatures.rw4.isValid()) { if (deviceTemperatures.rw4.isValid()) {
sensorTemp = deviceTemperatures.rw4.value; sensorTemp = static_cast<float>(deviceTemperatures.rw4.value);
} else if (deviceTemperatures.rw1.isValid()) { } else if (deviceTemperatures.rw1.isValid()) {
sensorTemp = deviceTemperatures.rw1.value; sensorTemp = static_cast<float>(deviceTemperatures.rw1.value);
} else if (sensorTemperatures.sensor_rw1.isValid()) { } else if (sensorTemperatures.sensor_rw1.isValid()) {
sensorTemp = sensorTemperatures.sensor_rw1.value; sensorTemp = sensorTemperatures.sensor_rw1.value;
} else if (sensorTemperatures.sensor_dro.isValid()) { } else if (sensorTemperatures.sensor_dro.isValid()) {
@ -1170,7 +1166,6 @@ void ThermalController::ctrlSBandTransceiver() {
sensorTemperatures.sensor_4k_camera, &sBandTransceiverLimits); 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,
deviceTemperatures.temp1P60dock, deviceTemperatures.temp2P60dock, deviceTemperatures.temp1P60dock, deviceTemperatures.temp2P60dock,
deviceTemperatures.temp2P60dock, &pcduP60BoardLimits); deviceTemperatures.temp2P60dock, &pcduP60BoardLimits);
@ -1185,8 +1180,8 @@ void ThermalController::ctrlPcduAcu() {
if (heaterAvailable) { if (heaterAvailable) {
sensorTempAvailable = true; sensorTempAvailable = true;
if (deviceTemperatures.acu.isValid()) { // TODO: how to check the different values if (deviceTemperatures.acu.isValid()) {
sensorTemp = deviceTemperatures.acu.value[0]; // TODO: check if right sensorTemp = deviceTemperatures.acu.value[0];
} else if (deviceTemperatures.acu.isValid()) { } else if (deviceTemperatures.acu.isValid()) {
sensorTemp = deviceTemperatures.acu.value[1]; sensorTemp = deviceTemperatures.acu.value[1];
} else if (sensorTemperatures.sensor_acu.isValid()) { } else if (sensorTemperatures.sensor_acu.isValid()) {
@ -1197,7 +1192,6 @@ void ThermalController::ctrlPcduAcu() {
} }
triggerEvent(NO_VALID_SENSOR_TEMPERATURE, switchNr); triggerEvent(NO_VALID_SENSOR_TEMPERATURE, switchNr);
sensorTempAvailable = false; sensorTempAvailable = false;
} }
if (sensorTempAvailable) { if (sensorTempAvailable) {
ctrlHeater(switchNr, redSwitchNr, &pcduAcuLimits); ctrlHeater(switchNr, redSwitchNr, &pcduAcuLimits);
@ -1206,7 +1200,6 @@ void ThermalController::ctrlPcduAcu() {
} }
void ThermalController::ctrlPcduPdu() { void ThermalController::ctrlPcduPdu() {
// 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,
deviceTemperatures.pdu1, deviceTemperatures.pdu2, deviceTemperatures.pdu1, deviceTemperatures.pdu2,
deviceTemperatures.pdu2, &pcduPduLimits); deviceTemperatures.pdu2, &pcduPduLimits);
@ -1295,7 +1288,6 @@ void ThermalController::ctrlHeater(heater::Switchers switchNr, heater::Switchers
struct TempLimits* tempLimit) { struct TempLimits* tempLimit) {
// Heater off // Heater off
if (not heaterHandler.checkSwitchState(switchNr)) { if (not heaterHandler.checkSwitchState(switchNr)) {
// TODO: check if OP
if (sensorTemp < (*tempLimit).opLowerLimit) { if (sensorTemp < (*tempLimit).opLowerLimit) {
heaterHandler.switchHeater(switchNr, HeaterHandler::SwitchState::ON); heaterHandler.switchHeater(switchNr, HeaterHandler::SwitchState::ON);
} }
@ -1363,6 +1355,7 @@ void ThermalController::ctrlComponentTemperature(heater::Switchers switchNr,
} }
} }
} }
void ThermalController::chooseOf4Sensors(heater::Switchers switchNr, const lp_float_t& sensor1, void ThermalController::chooseOf4Sensors(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& sensor4) {