Merge remote-tracking branch 'origin/develop' into bugfix_sus_assy

mission/system/CMakeLists.txt

@@ -3,5 +3,6 @@ add_subdirectory(tree)
 add_subdirectory(acs)
 add_subdirectory(com)
 add_subdirectory(fdir)
+add_subdirectory(power)
 
 target_sources(${LIB_EIVE_MISSION} PRIVATE DualLanePowerStateMachine.cpp)

mission/system/acs/AcsBoardAssembly.cpp

@@ -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));

mission/system/acs/CMakeLists.txt

@@ -9,4 +9,5 @@ target_sources(
           SusAssembly.cpp
           AcsBoardFdir.cpp
           acsModeTree.cpp
-          SusFdir.cpp)
+          SusFdir.cpp
+          StrFdir.cpp)

mission/system/fdir/CMakeLists.txt

@@ -1,2 +1 @@
-target_sources(${LIB_EIVE_MISSION} PRIVATE RtdFdir.cpp StrFdir.cpp
-                                           GomspacePowerFdir.cpp)
+target_sources(${LIB_EIVE_MISSION} PRIVATE RtdFdir.cpp)

mission/system/power/CMakeLists.txt

@@ -0,0 +1 @@
+target_sources(${LIB_EIVE_MISSION} PRIVATE GomspacePowerFdir.cpp)