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

some fixes
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
Details
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
Details

Browse Source
This commit is contained in:
Robin Müller 2023-04-04 15:09:51 +02:00
parent 4a287344f4
commit 908927ed9f
No known key found for this signature in database
GPG Key ID: 11D4952C8CCEF814
2 changed files with 26 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
mission/controller/ThermalController.cpp
View File

@ -988,13 +988,15 @@ void ThermalController::ctrlAcsBoard() {
sensors[4].first = sensorTemperatures.tcsBoard.isValid(); sensors[4].first = sensorTemperatures.tcsBoard.isValid();
sensors[4].second = sensorTemperatures.tcsBoard.value; sensors[4].second = sensorTemperatures.tcsBoard.value;
numSensors = 5; numSensors = 5;
if (selectAndReadSensorTemp()) { {
if (chooseHeater(switchNr, redSwitchNr)) { HeaterContext htrCtx(switchNr, redSwitchNr, acsBoardLimits);
HeaterContext htrCtx(switchNr, redSwitchNr, acsBoardLimits); if (selectAndReadSensorTemp(htrCtx)) {
checkLimitsAndCtrlHeater(htrCtx); if (chooseHeater(switchNr, redSwitchNr)) {
checkLimitsAndCtrlHeater(htrCtx);
}
resetSensorsArray();
return;
} }
resetSensorsArray();
return;
} }
resetSensorsArray(); resetSensorsArray();
// B side // B side
@ -1007,15 +1009,18 @@ void ThermalController::ctrlAcsBoard() {
sensors[3].first = sensorTemperatures.tcsBoard.isValid(); sensors[3].first = sensorTemperatures.tcsBoard.isValid();
sensors[3].second = sensorTemperatures.tcsBoard.value; sensors[3].second = sensorTemperatures.tcsBoard.value;
numSensors = 4; numSensors = 4;
if (selectAndReadSensorTemp()) {
if (chooseHeater(switchNr, redSwitchNr)) { {
HeaterContext htrCtx(switchNr, redSwitchNr, acsBoardLimits); HeaterContext htrCtx(switchNr, redSwitchNr, acsBoardLimits);
checkLimitsAndCtrlHeater(htrCtx); if (selectAndReadSensorTemp(htrCtx)) {
} if (chooseHeater(switchNr, redSwitchNr)) {
} else { checkLimitsAndCtrlHeater(htrCtx);
if (chooseHeater(switchNr, redSwitchNr)) { }
if (heaterHandler.getSwitchState(switchNr)) { } else {
heaterHandler.switchHeater(switchNr, HeaterHandler::SwitchState::OFF); if (chooseHeater(switchNr, redSwitchNr)) {
if (heaterHandler.getSwitchState(switchNr)) {
heaterHandler.switchHeater(switchNr, HeaterHandler::SwitchState::OFF);
}
} }
} }
} }
@ -1546,7 +1551,7 @@ void ThermalController::performThermalModuleCtrl(const HeaterSwitchStates& heate
heaterTransitionControl(heaterSwitchStates); heaterTransitionControl(heaterSwitchStates);
} }
void ThermalController::ctrlComponentTemperature(HeaterContext& htrCtx) { void ThermalController::ctrlComponentTemperature(HeaterContext& htrCtx) {
if (selectAndReadSensorTemp()) { if (selectAndReadSensorTemp(htrCtx)) {
if (chooseHeater(htrCtx.switchNr, htrCtx.redSwitchNr)) { if (chooseHeater(htrCtx.switchNr, htrCtx.redSwitchNr)) {
checkLimitsAndCtrlHeater(htrCtx); checkLimitsAndCtrlHeater(htrCtx);
} }

10
mission/controller/ThermalController.h
View File

@ -31,8 +31,8 @@
* limit is exceeded to avoid reaching NOP limit * limit is exceeded to avoid reaching NOP limit
*/ */
struct TempLimits { struct TempLimits {
TempLimits(float opLowerLimit, float cutOffLimit, float opUpperLimit, TempLimits(float nopLowerLimit, float opLowerLimit, float cutOffLimit, float opUpperLimit,
float nopUpperLimit, float sanityUpperLimit) float nopUpperLimit)
: opLowerLimit(opLowerLimit), : opLowerLimit(opLowerLimit),
opUpperLimit(opUpperLimit), opUpperLimit(opUpperLimit),
cutOffLimit(cutOffLimit), cutOffLimit(cutOffLimit),
@ -91,8 +91,8 @@ class ThermalController : public ExtendedControllerBase {
public: public:
static const uint16_t INVALID_TEMPERATURE = 999; static const uint16_t INVALID_TEMPERATURE = 999;
static const uint8_t NUMBER_OF_SENSORS = 16; static const uint8_t NUMBER_OF_SENSORS = 16;
static constexpr uint16_t SANITY_LIMIT_LOWER_TEMP = -80; static constexpr int16_t SANITY_LIMIT_LOWER_TEMP = -80;
static constexpr uint16_t SANITY_LIMIT_UPPER_TEMP = 160; static constexpr int16_t SANITY_LIMIT_UPPER_TEMP = 160;
ThermalController(object_id_t objectId, HeaterHandler& heater); ThermalController(object_id_t objectId, HeaterHandler& heater);
@ -220,7 +220,7 @@ class ThermalController : public ExtendedControllerBase {
lp_var_t<float> tempAdcPayloadPcdu = lp_var_t<float>(objects::PLPCDU_HANDLER, plpcdu::TEMP); lp_var_t<float> tempAdcPayloadPcdu = lp_var_t<float>(objects::PLPCDU_HANDLER, plpcdu::TEMP);
// TempLimits // TempLimits
TempLimits acsBoardLimits = TempLimits(5-40.0, -40.0, 80.0, 85.0, 85.0); TempLimits acsBoardLimits = TempLimits(-40.0, -40.0, 80.0, 85.0, 85.0);
TempLimits mgtLimits = TempLimits(-40.0, -40.0, 65.0, 70.0, 70.0); TempLimits mgtLimits = TempLimits(-40.0, -40.0, 65.0, 70.0, 70.0);
TempLimits rwLimits = TempLimits(-40.0, -40.0, 80.0, 85.0, 85.0); TempLimits rwLimits = TempLimits(-40.0, -40.0, 80.0, 85.0, 85.0);
TempLimits strLimits = TempLimits(-30.0, -20.0, 65.0, 70.0, 80.0); TempLimits strLimits = TempLimits(-30.0, -20.0, 65.0, 70.0, 80.0);