KSat/fsfw
17
6
Fork 2
forked from fsfw/fsfw
Code Issues Pull Requests Releases Wiki Activity

Merge pull request 'temperaturesensor-bugfix' (#47) from temperaturesensor-bugfix into main

Browse Source 
Reviewed-on: #47
This commit was merged in pull request #47.
This commit is contained in:
Robin Müller
2025-01-21 14:33:29 +01:00
parent 5b1651e1a6 921bfb1e99
commit 735e341aab
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/fsfw/thermal/TemperatureSensor.h
+3 -3
View File
@@ -142,7 +142,7 @@ class TemperatureSensor : public AbstractTemperatureSensor {
deltaTime = (uptime.tv_sec + uptime.tv_usec / 1000000.) -
(uptimeOfOldTemperature.tv_sec + uptimeOfOldTemperature.tv_usec / 1000000.);
deltaTemp = oldTemperature - outputTemperature;
deltaTemp = oldTemperature - outputTemperature.value;
if (deltaTemp < 0) {
deltaTemp = -deltaTemp;
}
@@ -160,13 +160,13 @@ class TemperatureSensor : public AbstractTemperatureSensor {
outputTemperature.setValid(PoolVariableIF::INVALID);
outputTemperature = thermal::INVALID_TEMPERATURE;
} else {
oldTemperature = outputTemperature;
oldTemperature = outputTemperature.value;
uptimeOfOldTemperature = uptime;
}
}
public:
float getTemperature() { return outputTemperature; }
float getTemperature() { return outputTemperature.value; }
bool isValid() { return outputTemperature.isValid(); }