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

Heater Handling #325

Merged
muellerr merged 78 commits from heater_handling into develop 2023-02-08 21:35:05 +01:00
Conversation 0 Commits 78 Files Changed 49 +4 -3
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 617507b3d4 - Show all commits

6
mission/controller/ThermalController.cpp
View File

@ -1180,10 +1180,12 @@ void ThermalController::ctrlPcduAcu() {
if (heaterAvailable) {
sensorTempAvailable = true;
if (deviceTemperatures.acu.isValid()) {
if (deviceTemperatures.acu.value[0] != INVALID_TEMPERATURE) {
sensorTemp = deviceTemperatures.acu.value[0];
} else if (deviceTemperatures.acu.isValid()) {
} else if (deviceTemperatures.acu.value[1] != INVALID_TEMPERATURE) {
sensorTemp = deviceTemperatures.acu.value[1];
} else if (deviceTemperatures.acu.value[2] != INVALID_TEMPERATURE) {
sensorTemp = deviceTemperatures.acu.value[2];
} else if (sensorTemperatures.sensor_acu.isValid()) {
sensorTemp = sensorTemperatures.sensor_acu.value;
} else {

1
mission/controller/ThermalController.h
View File

@ -61,7 +61,6 @@ class ThermalController : public ExtendedControllerBase {
static const uint32_t DELAY = 500;
// TODO to be changed
static const uint32_t TEMP_OFFSET = 5;
enum class InternalState { STARTUP, INITIAL_DELAY, READY };