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

fix shadowing warning
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-17 16:32:33 +01:00
parent b3cdb05214
commit ec8c5b7a5c
No known key found for this signature in database
GPG Key ID: 71B58F8A3CDFA9AC
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
mission/controller/ThermalController.cpp
View File

@ -115,13 +115,9 @@ 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); heaterInfo.heaterCurrent.value = currentVecPdu2.value[PDU2::Channels::TCS_HEATER_IN];
if (pg.getReadResult() == returnvalue::OK) {
heaterInfo.heaterCurrent.value = currentVecPdu2.value[PDU2::Channels::TCS_HEATER_IN];
}
}
} }
} }