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

Dual Lane Assembly bug #569

Merged
muellerr merged 8 commits from bugfix_sus_assy into develop 2023-04-05 15:30:12 +02:00
Conversation 0 Commits 8 Files Changed 6 +48 -52
6 changed files with 48 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 2e0a685507 - Show all commits

6
mission/system/acs/SusAssembly.cpp
View File

@ -131,14 +131,14 @@ ReturnValue_t SusAssembly::checkAndHandleHealthStates(Mode_t commandedMode,
auto checkSusGroup = [&](object_id_t devNom, object_id_t devRed) { auto checkSusGroup = [&](object_id_t devNom, object_id_t devRed) {
HealthState healthNom = healthHelper.healthTable->getHealth(devNom); HealthState healthNom = healthHelper.healthTable->getHealth(devNom);
HealthState healthRed = healthHelper.healthTable->getHealth(devRed); HealthState healthRed = healthHelper.healthTable->getHealth(devRed);
if(healthNom == PERMANENT_FAULTY and healthRed == FAULTY) { if (healthNom == PERMANENT_FAULTY and healthRed == FAULTY) {
overwriteDeviceHealth(devRed, healthRed); overwriteDeviceHealth(devRed, healthRed);
needsHealthOverwritten = true; needsHealthOverwritten = true;
} else if(healthNom == FAULTY and healthRed == PERMANENT_FAULTY) { } else if (healthNom == FAULTY and healthRed == PERMANENT_FAULTY) {
overwriteDeviceHealth(devNom, healthNom); overwriteDeviceHealth(devNom, healthNom);
needsHealthOverwritten = true; needsHealthOverwritten = true;
} else if ((healthNom == FAULTY or healthNom == PERMANENT_FAULTY) and } else if ((healthNom == FAULTY or healthNom == PERMANENT_FAULTY) and
(healthRed == FAULTY or healthRed == PERMANENT_FAULTY)) { (healthRed == FAULTY or healthRed == PERMANENT_FAULTY)) {
overwriteDeviceHealth(devNom, healthNom); overwriteDeviceHealth(devNom, healthNom);
overwriteDeviceHealth(devRed, healthRed); overwriteDeviceHealth(devRed, healthRed);
needsHealthOverwritten = true; needsHealthOverwritten = true;