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

Merge pull request 'wrong logic' (#566) from bugfix_gps_fdir into develop
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
Details

Browse Source 
Reviewed-on: #566
This commit is contained in:
Robin Müller 2023-04-04 18:51:50 +02:00
commit 08d83c158a
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fsfw

@ -1 +1 @@
Subproject commit 9fca7581dd75d074df343802c922e48f95b677eb
Subproject commit 6650c293da09d8851c2bd6c4d6e6c5a8390d003e

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

@ -288,7 +288,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);
} 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));

2
tmtc

@ -1 +1 @@
Subproject commit 6975fae511ca7b2fdef70858f8715908f300f434
Subproject commit 50668ca7a74edd4219456e393cd10f7858591130