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

Heater Info Set #351

Merged
muellerr merged 27 commits from add_heater_info_set into develop 2023-02-21 11:18:49 +01:00
Conversation 0 Commits 27 Files Changed 11 +2389 -3061
51 changed files with 2389 additions and 3061 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit ec8c5b7a5c - Show all commits

8
mission/controller/ThermalController.cpp
View File

@@ -115,15 +115,11 @@ void ThermalController::performControlOperation() {
{ {
PoolReadGuard pg(&heaterInfo); PoolReadGuard pg(&heaterInfo);
if (pg.getReadResult() == returnvalue::OK) { PoolReadGuard pg2(&currentVecPdu2);
{ if (pg.getReadResult() == returnvalue::OK and pg2.getReadResult() == returnvalue::OK) {
PoolReadGuard pg(&currentVecPdu2);
if (pg.getReadResult() == returnvalue::OK) {
heaterInfo.heaterCurrent.value = currentVecPdu2.value[PDU2::Channels::TCS_HEATER_IN]; heaterInfo.heaterCurrent.value = currentVecPdu2.value[PDU2::Channels::TCS_HEATER_IN];
} }
} }
}
}
// performThermalModuleCtrl(); // performThermalModuleCtrl();
} }