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

Merge remote-tracking branch 'origin/develop' into bugfix_sus_assy
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-04-05 10:29:38 +02:00
parent 845548ed25 858c6c301e
commit 0cabe3a9ea
32 changed files with 205 additions and 175 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
mission/system/acs/AcsBoardAssembly.cpp
View File

@ -291,8 +291,7 @@ ReturnValue_t AcsBoardAssembly::checkAndHandleHealthStates(Mode_t deviceMode,
} else if (healthHelper.healthTable->getHealth(helper.healthDevGps1) == PERMANENT_FAULTY and
healthHelper.healthTable->getHealth(helper.healthDevGps0) == FAULTY) {
overwriteDeviceHealth(helper.healthDevGps0, FAULTY);
healthNeedsToBeOverwritten = true;
} else if (healthHelper.healthTable->isFaulty(helper.healthDevGps0) or
} else if (healthHelper.healthTable->isFaulty(helper.healthDevGps0) and
healthHelper.healthTable->isFaulty(helper.healthDevGps1)) {
overwriteDeviceHealth(helper.healthDevGps0,
healthHelper.healthTable->getHealth(helper.healthDevGps0));