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

Merge branch 'v4.0.0-dev' into more-info-on-reboot
All checks were successful
EIVE/eive-obsw/pipeline/pr-v4.0.0-dev This commit looks good
Details

Browse Source
This commit is contained in:
Robin Müller 2023-06-22 16:17:17 +02:00
commit d1086bc9aa
4 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@ -24,6 +24,8 @@ will consitute of a breaking change warranting a new major release:
## Fixed ## Fixed
- Important bugfixes for PTME. See `q7s-package` CHANGELOG. - 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.
- Fixed H parameter in SUS converter from 1 mm to 2.5 mm. - Fixed H parameter in SUS converter from 1 mm to 2.5 mm.
## Changed ## Changed

1
mission/acs/SusHandler.cpp
View File

@ -30,6 +30,7 @@ void SusHandler::doStartUp() {
void SusHandler::doShutDown() { void SusHandler::doShutDown() {
if (internalState != InternalState::SHUTDOWN) { if (internalState != InternalState::SHUTDOWN) {
PoolReadGuard pg(&dataset); PoolReadGuard pg(&dataset);
dataset.tempC = thermal::INVALID_TEMPERATURE;
dataset.setValidity(false, true); dataset.setValidity(false, true);
internalState = InternalState::SHUTDOWN; internalState = InternalState::SHUTDOWN;
commandExecuted = false; commandExecuted = false;

4
mission/acs/str/StarTrackerHandler.cpp
View File

@ -18,6 +18,7 @@ extern "C" {
#include "OBSWConfig.h" #include "OBSWConfig.h"
#include "eive/definitions.h" #include "eive/definitions.h"
#include "fsfw/thermal/tcsDefinitions.h"
std::atomic_bool JCFG_DONE(false); std::atomic_bool JCFG_DONE(false);
@ -111,6 +112,9 @@ void StarTrackerHandler::doShutDown() {
} }
{ {
PoolReadGuard pg(&temperatureSet); PoolReadGuard pg(&temperatureSet);
temperatureSet.fpgaTemperature = thermal::INVALID_TEMPERATURE;
temperatureSet.cmosTemperature = thermal::INVALID_TEMPERATURE;
temperatureSet.mcuTemperature = thermal::INVALID_TEMPERATURE;
temperatureSet.setValidity(false, true); temperatureSet.setValidity(false, true);
} }
reinitNextSetParam = false; reinitNextSetParam = false;

2
mission/tcs/Max31865EiveHandler.cpp
View File

@ -37,6 +37,8 @@ void Max31865EiveHandler::doShutDown() {
transitionOk = false; transitionOk = false;
} }
if (state == InternalState::INACTIVE and transitionOk) { if (state == InternalState::INACTIVE and transitionOk) {
sensorDataset.temperatureCelcius = thermal::INVALID_TEMPERATURE;
sensorDataset.setValidity(false, true);
updatePeriodicReply(false, EiveMax31855::RtdCommands::EXCHANGE_SET_ID); updatePeriodicReply(false, EiveMax31855::RtdCommands::EXCHANGE_SET_ID);
setMode(MODE_OFF); setMode(MODE_OFF);
} }