create and add syrlinks fdir

bsp_q7s/core/ObjectFactory.cpp

@@ -1,5 +1,7 @@
 #include "ObjectFactory.h"
 
+#include <mission/system/fdir/SyrlinksFdir.h>
+
 #include "OBSWConfig.h"
 #include "bsp_q7s/boardtest/Q7STestTask.h"
 #include "bsp_q7s/callbacks/gnssCallback.h"
@@ -37,11 +39,11 @@
 #include "linux/obc/PdecHandler.h"
 #include "linux/obc/Ptme.h"
 #include "linux/obc/PtmeConfig.h"
-#include "mission/system/AcsBoardFdir.h"
-#include "mission/system/RtdFdir.h"
 #include "mission/system/SusAssembly.h"
-#include "mission/system/SusFdir.h"
 #include "mission/system/TcsBoardAssembly.h"
+#include "mission/system/fdir/AcsBoardFdir.h"
+#include "mission/system/fdir/RtdFdir.h"
+#include "mission/system/fdir/SusFdir.h"
 #include "tmtc/apid.h"
 #include "tmtc/pusIds.h"
 
@@ -629,8 +631,10 @@ void ObjectFactory::createSyrlinksComponents(PowerSwitchIF* pwrSwitcher) {
                      syrlinks::MAX_REPLY_SIZE, UartModes::NON_CANONICAL);
   syrlinksUartCookie->setParityEven();
 
-  auto syrlinksHandler = new SyrlinksHkHandler(objects::SYRLINKS_HK_HANDLER, objects::UART_COM_IF,
+  auto syrlinksFdir = new SyrlinksFdir(objects::SYRLINKS_HK_HANDLER);
-                                               syrlinksUartCookie, pcdu::PDU1_CH1_SYRLINKS_12V);
+  auto syrlinksHandler =
+      new SyrlinksHkHandler(objects::SYRLINKS_HK_HANDLER, objects::UART_COM_IF, syrlinksUartCookie,
+                            pcdu::PDU1_CH1_SYRLINKS_12V, syrlinksFdir);
   syrlinksHandler->setPowerSwitcher(pwrSwitcher);
 }
 

linux/ObjectFactory.cpp

@@ -9,10 +9,10 @@
 #include <linux/callbacks/gpioCallbacks.h>
 #include <mission/devices/Max31865PT1000Handler.h>
 #include <mission/devices/SusHandler.h>
-#include <mission/system/RtdFdir.h>
 #include <mission/system/SusAssembly.h>
-#include <mission/system/SusFdir.h>
 #include <mission/system/TcsBoardAssembly.h>
+#include <mission/system/fdir/RtdFdir.h>
+#include <mission/system/fdir/SusFdir.h>
 
 #include "OBSWConfig.h"
 #include "devConf.h"

mission/devices/SyrlinksHkHandler.cpp

@@ -5,8 +5,8 @@
 #include "OBSWConfig.h"
 
 SyrlinksHkHandler::SyrlinksHkHandler(object_id_t objectId, object_id_t comIF, CookieIF* comCookie,
-                                     power::Switch_t powerSwitch)
+                                     power::Switch_t powerSwitch, FailureIsolationBase* customFdir)
-    : DeviceHandlerBase(objectId, comIF, comCookie),
+    : DeviceHandlerBase(objectId, comIF, comCookie, customFdir),
       rxDataset(this),
       txDataset(this),
       temperatureSet(this),

mission/devices/SyrlinksHkHandler.h

@@ -20,7 +20,7 @@
 class SyrlinksHkHandler : public DeviceHandlerBase {
  public:
   SyrlinksHkHandler(object_id_t objectId, object_id_t comIF, CookieIF* comCookie,
-                    power::Switch_t powerSwitch);
+                    power::Switch_t powerSwitch, FailureIsolationBase* customFdir);
   virtual ~SyrlinksHkHandler();
 
   /**

mission/system/CMakeLists.txt

@@ -10,10 +10,6 @@ target_sources(${LIB_EIVE_MISSION} PRIVATE
     PowerStateMachineBase.cpp
     DualLaneAssemblyBase.cpp
     TcsBoardAssembly.cpp
-
-    AcsBoardFdir.cpp
-    SusFdir.cpp
-    RtdFdir.cpp
 )
 
 add_subdirectory(fdir)

mission/system/fdir/CMakeLists.txt

@@ -0,0 +1,6 @@
+target_sources(${LIB_EIVE_MISSION} PRIVATE
+    AcsBoardFdir.cpp
+    RtdFdir.cpp
+    SusFdir.cpp
+    SyrlinksFdir.cpp
+)

mission/system/fdir/SyrlinksFdir.cpp

@@ -9,7 +9,8 @@
 #include "fsfw/thermal/ThermalComponentIF.h"
 #include "mission/devices/devicedefinitions/SyrlinksDefinitions.h"
 
-SyrlinksFdir::SyrlinksFdir(object_id_t syrlinksId) {}
+SyrlinksFdir::SyrlinksFdir(object_id_t syrlinksId)
+    : DeviceHandlerFailureIsolation(syrlinksId, objects::NO_OBJECT) {}
 
 ReturnValue_t SyrlinksFdir::eventReceived(EventMessage* event) {
   if (isFdirInActionOrAreWeFaulty(event)) {

mission/system/fdir/SyrlinksFdir.h

@@ -6,9 +6,9 @@
 class SyrlinksFdir : public DeviceHandlerFailureIsolation {
  public:
   SyrlinksFdir(object_id_t syrlinksId);
+
  private:
   ReturnValue_t eventReceived(EventMessage* event);
 };
 
-
 #endif /* MISSION_DEVICES_SYRLINKSFDIR_H_ */