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

this seems to work
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
Details

Browse Source
This commit is contained in:
Robin Müller 2023-03-15 16:24:01 +01:00
parent f546df50a1
commit 9b8092fb09
No known key found for this signature in database
GPG Key ID: 71B58F8A3CDFA9AC
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
mission/controller/ThermalController.cpp
View File

@ -66,7 +66,6 @@ ThermalController::ThermalController(object_id_t objectId, HeaterHandler& heater
susSet10(objects::SUS_10_N_LOC_XMYBZF_PT_ZF), susSet10(objects::SUS_10_N_LOC_XMYBZF_PT_ZF),
susSet11(objects::SUS_11_R_LOC_XBYMZB_PT_ZB) { susSet11(objects::SUS_11_R_LOC_XBYMZB_PT_ZB) {
resetSensorsArray(); resetSensorsArray();
} }
ReturnValue_t ThermalController::initialize() { ReturnValue_t ThermalController::initialize() {
@ -107,11 +106,11 @@ void ThermalController::performControlOperation() {
break; break;
} }
if(cycles == 50) { if (cycles == 50) {
#if LOWER_SYRLINKS_UPPER_LIMITS == 1 #if LOWER_SYRLINKS_UPPER_LIMITS == 1
sBandTransceiverLimits.cutOffLimit = 0; sBandTransceiverLimits.cutOffLimit = 0;
sBandTransceiverLimits.opUpperLimit = 0; sBandTransceiverLimits.opUpperLimit = 0;
sBandTransceiverLimits.nopUpperLimit = 0; sBandTransceiverLimits.nopUpperLimit = 0;
#endif #endif
} }
@ -1547,8 +1546,10 @@ void ThermalController::checkLimitsAndCtrlHeater(heater::Switchers switchNr,
componentAboveUpperLimit = false; componentAboveUpperLimit = false;
auto tempTooHighHandler = [&](const char* whatLimit, bool heaterIsOn) { auto tempTooHighHandler = [&](const char* whatLimit, bool heaterIsOn) {
heaterHandler.switchHeater(switchNr, HeaterHandler::SwitchState::OFF); heaterHandler.switchHeater(switchNr, HeaterHandler::SwitchState::OFF);
sif::info << "ThermalController::checkLimitsAndCtrlHeater: Exceeded " << whatLimit << ": " sif::info << "ThermalController::checkLimitsAndCtrlHeater: Exceeded " << whatLimit
"Heater for component " << static_cast<int>(thermalComponent) << std::endl; << ": "
"Heater for component "
<< static_cast<int>(thermalComponent) << std::endl;
heaterStates[switchNr].switchTransition = true; heaterStates[switchNr].switchTransition = true;
if (heaterIsOn) { if (heaterIsOn) {
heaterHandler.switchHeater(redSwitchNr, HeaterHandler::SwitchState::OFF); heaterHandler.switchHeater(redSwitchNr, HeaterHandler::SwitchState::OFF);

3
mission/system/objects/EiveSystem.cpp
View File

@ -86,7 +86,8 @@ void EiveSystem::handleEventMessages() {
switch (event.getEvent()) { switch (event.getEvent()) {
case tcsCtrl::SYRLINKS_OVERHEATING: { case tcsCtrl::SYRLINKS_OVERHEATING: {
CommandMessage msg; CommandMessage msg;
ModeMessage::setModeMessage(&msg, ModeMessage::CMD_MODE_COMMAND_FORCED, com::RX_ONLY, 0); ModeMessage::setModeMessage(&msg, ModeMessage::CMD_MODE_COMMAND_FORCED, com::RX_ONLY,
0);
ReturnValue_t result = ReturnValue_t result =
commandQueue->sendMessage(childrenMap[objects::COM_SUBSYSTEM].commandQueue, &msg); commandQueue->sendMessage(childrenMap[objects::COM_SUBSYSTEM].commandQueue, &msg);
if (result != returnvalue::OK) { if (result != returnvalue::OK) {