From 9b8092fb09de253762b0fd6fc14a278c72f5726b Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Wed, 15 Mar 2023 16:24:01 +0100 Subject: [PATCH] this seems to work --- mission/controller/ThermalController.cpp | 15 ++++++++------- mission/system/objects/EiveSystem.cpp | 3 ++- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/mission/controller/ThermalController.cpp b/mission/controller/ThermalController.cpp index c31ff3f8..55e7be1b 100644 --- a/mission/controller/ThermalController.cpp +++ b/mission/controller/ThermalController.cpp @@ -66,7 +66,6 @@ ThermalController::ThermalController(object_id_t objectId, HeaterHandler& heater susSet10(objects::SUS_10_N_LOC_XMYBZF_PT_ZF), susSet11(objects::SUS_11_R_LOC_XBYMZB_PT_ZB) { resetSensorsArray(); - } ReturnValue_t ThermalController::initialize() { @@ -107,11 +106,11 @@ void ThermalController::performControlOperation() { break; } - if(cycles == 50) { + if (cycles == 50) { #if LOWER_SYRLINKS_UPPER_LIMITS == 1 - sBandTransceiverLimits.cutOffLimit = 0; - sBandTransceiverLimits.opUpperLimit = 0; - sBandTransceiverLimits.nopUpperLimit = 0; + sBandTransceiverLimits.cutOffLimit = 0; + sBandTransceiverLimits.opUpperLimit = 0; + sBandTransceiverLimits.nopUpperLimit = 0; #endif } @@ -1547,8 +1546,10 @@ void ThermalController::checkLimitsAndCtrlHeater(heater::Switchers switchNr, componentAboveUpperLimit = false; auto tempTooHighHandler = [&](const char* whatLimit, bool heaterIsOn) { heaterHandler.switchHeater(switchNr, HeaterHandler::SwitchState::OFF); - sif::info << "ThermalController::checkLimitsAndCtrlHeater: Exceeded " << whatLimit << ": " - "Heater for component " << static_cast(thermalComponent) << std::endl; + sif::info << "ThermalController::checkLimitsAndCtrlHeater: Exceeded " << whatLimit + << ": " + "Heater for component " + << static_cast(thermalComponent) << std::endl; heaterStates[switchNr].switchTransition = true; if (heaterIsOn) { heaterHandler.switchHeater(redSwitchNr, HeaterHandler::SwitchState::OFF); diff --git a/mission/system/objects/EiveSystem.cpp b/mission/system/objects/EiveSystem.cpp index 1c4fce19..67b79615 100644 --- a/mission/system/objects/EiveSystem.cpp +++ b/mission/system/objects/EiveSystem.cpp @@ -86,7 +86,8 @@ void EiveSystem::handleEventMessages() { switch (event.getEvent()) { case tcsCtrl::SYRLINKS_OVERHEATING: { 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 = commandQueue->sendMessage(childrenMap[objects::COM_SUBSYSTEM].commandQueue, &msg); if (result != returnvalue::OK) {