eive/eive-obsw
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 +1 -3
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 3159574cfa - Show all commits

4
mission/controller/ThermalController.cpp
View File

@ -110,7 +110,6 @@ void ThermalController::performControlOperation() {
deviceTemperatures.commit();
}
<<<<<<< HEAD
{
PoolReadGuard pg(&heaterInfo);
if (pg.getReadResult() == returnvalue::OK) {
@ -122,7 +121,7 @@ void ThermalController::performControlOperation() {
}
}
}
=======
ctrlCameraBody();
ctrlAcsBoard();
ctrlMgt();
@ -147,7 +146,6 @@ void ThermalController::performControlOperation() {
ctrlTx();
ctrlMpa();
ctrlScexBoard();
>>>>>>> origin/develop
}
ReturnValue_t ThermalController::initializeLocalDataPool(localpool::DataPool& localDataPoolMap,