From 0c394ad34d6d256e6f4fcdd6e49891ad06bee005 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Thu, 22 Jun 2023 11:29:30 +0200 Subject: [PATCH 1/3] set temperature invalid properly --- mission/acs/str/StarTrackerHandler.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/mission/acs/str/StarTrackerHandler.cpp b/mission/acs/str/StarTrackerHandler.cpp index 1ba73181..23223bfc 100644 --- a/mission/acs/str/StarTrackerHandler.cpp +++ b/mission/acs/str/StarTrackerHandler.cpp @@ -12,6 +12,8 @@ extern "C" { #include } +#include "fsfw/thermal/tcsDefinitions.h" + #include #include #include @@ -111,6 +113,9 @@ void StarTrackerHandler::doShutDown() { } { PoolReadGuard pg(&temperatureSet); + temperatureSet.fpgaTemperature = thermal::INVALID_TEMPERATURE; + temperatureSet.cmosTemperature = thermal::INVALID_TEMPERATURE; + temperatureSet.mcuTemperature = thermal::INVALID_TEMPERATURE; temperatureSet.setValidity(false, true); } reinitNextSetParam = false; From 3ae7dab8c766e6ae820c0abe214237cf3d3411a0 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Thu, 22 Jun 2023 11:33:54 +0200 Subject: [PATCH 2/3] those are the most important cases --- mission/acs/SusHandler.cpp | 1 + mission/tcs/Max31865EiveHandler.cpp | 2 ++ 2 files changed, 3 insertions(+) diff --git a/mission/acs/SusHandler.cpp b/mission/acs/SusHandler.cpp index c347020f..6fa4d231 100644 --- a/mission/acs/SusHandler.cpp +++ b/mission/acs/SusHandler.cpp @@ -30,6 +30,7 @@ void SusHandler::doStartUp() { void SusHandler::doShutDown() { if (internalState != InternalState::SHUTDOWN) { PoolReadGuard pg(&dataset); + dataset.tempC = thermal::INVALID_TEMPERATURE; dataset.setValidity(false, true); internalState = InternalState::SHUTDOWN; commandExecuted = false; diff --git a/mission/tcs/Max31865EiveHandler.cpp b/mission/tcs/Max31865EiveHandler.cpp index 599071ef..a3c1dce1 100644 --- a/mission/tcs/Max31865EiveHandler.cpp +++ b/mission/tcs/Max31865EiveHandler.cpp @@ -37,6 +37,8 @@ void Max31865EiveHandler::doShutDown() { transitionOk = false; } if (state == InternalState::INACTIVE and transitionOk) { + sensorDataset.temperatureCelcius = thermal::INVALID_TEMPERATURE; + sensorDataset.setValidity(false, true); updatePeriodicReply(false, EiveMax31855::RtdCommands::EXCHANGE_SET_ID); setMode(MODE_OFF); } From add083135ee6930046772886bd4ac9657182679a Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Thu, 22 Jun 2023 11:35:46 +0200 Subject: [PATCH 3/3] changelog --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5f65ab7e..6cb1a9fa 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -25,6 +25,8 @@ will consitute of a breaking change warranting a new major release: - CFDP low level protocol bugfix. Requires fsfw update and tmtc update. - Important bugfixes for PTME. See `q7s-package` CHANGELOG. +- TCS fixes: Set temperature values to invalid value for MAX31865 RTD handler, SUS handler + and STR handler. Also set dataset to invakid for RTD handler. ## Changed