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

resolve more merge conflicts
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
Details

Browse Source
This commit is contained in:
Robin Müller 2023-02-08 21:41:19 +01:00
parent fa62f07dce
commit 3159574cfa
No known key found for this signature in database
GPG Key ID: 11D4952C8CCEF814
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mission/controller/ThermalController.cpp
View File

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