From dc44af5b2980887355a4caafdee3ceec77a56db0 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Wed, 15 Mar 2023 15:20:47 +0100 Subject: [PATCH] copy and paste error --- mission/controller/ThermalController.cpp | 5 +++-- mission/controller/ThermalController.h | 2 -- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/mission/controller/ThermalController.cpp b/mission/controller/ThermalController.cpp index 4a4c3469..e22d2b8a 100644 --- a/mission/controller/ThermalController.cpp +++ b/mission/controller/ThermalController.cpp @@ -16,7 +16,8 @@ #include #include -#define LOWER_SYRLINKS_UPPER_LIMITS 0 +// Enabling this should trigger a special event which in turn should trigger a system reaction. +#define LOWER_SYRLINKS_UPPER_LIMITS 1 ThermalController::ThermalController(object_id_t objectId, HeaterHandler& heater) : ExtendedControllerBase(objectId), @@ -1216,7 +1217,7 @@ void ThermalController::ctrlSBandTransceiver() { triggerEvent(tcsCtrl::SYRLINKS_OVERHEATING, tempFloatToU32()); syrlinksTooHotFlag = true; } else if (not componentAboveUpperLimit) { - pcduSystemTooHotFlag = false; + syrlinksTooHotFlag = true; } } void ThermalController::ctrlPcduP60Board() { diff --git a/mission/controller/ThermalController.h b/mission/controller/ThermalController.h index c844091b..1102f033 100644 --- a/mission/controller/ThermalController.h +++ b/mission/controller/ThermalController.h @@ -164,8 +164,6 @@ class ThermalController : public ExtendedControllerBase { TempLimits tcsBoardLimits = TempLimits(-60.0, -40.0, 80.0, 85.0, 130.0); TempLimits obcLimits = TempLimits(-40.0, -40.0, 80.0, 85.0, 85.0); TempLimits obcIfBoardLimits = TempLimits(-65.0, -40.0, 80.0, 85.0, 125.0); - // Limits to test commading to RX Only - // TempLimits sBandTransceiverLimits = TempLimits(-40.0, -25.0, 0.0, 0.0, 5.0); TempLimits sBandTransceiverLimits = TempLimits(-40.0, -25.0, 35.0, 40.0, 65.0); TempLimits pcduP60BoardLimits = TempLimits(-35.0, -35.0, 80.0, 85.0, 85.0); TempLimits pcduAcuLimits = TempLimits(-35.0, -35.0, 80.0, 85.0, 85.0);