From 462da5228a0974fa9836453586425b5cdcd730af Mon Sep 17 00:00:00 2001
From: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date: Thu, 13 Jul 2023 17:23:46 +0200
Subject: [PATCH] back to default FDIR

---
 bsp_q7s/em/emObjectFactory.cpp | 4 +---
 bsp_q7s/fmObjectFactory.cpp    | 2 +-
 bsp_q7s/objectFactory.cpp      | 5 ++---
 bsp_q7s/objectFactory.h        | 2 +-
 mission/system/acs/StrFdir.cpp | 6 ++----
 mission/system/acs/StrFdir.h   | 2 +-
 6 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/bsp_q7s/em/emObjectFactory.cpp b/bsp_q7s/em/emObjectFactory.cpp
index 0bafa52f..e5d6abc2 100644
--- a/bsp_q7s/em/emObjectFactory.cpp
+++ b/bsp_q7s/em/emObjectFactory.cpp
@@ -138,9 +138,7 @@ void ObjectFactory::produce(void* args) {
 #endif
 
 #if OBSW_ADD_STAR_TRACKER == 1
-  // Missed reply threshold is higher on EM than default value because the ground STR received
-  // from the Swedes is going weird things.
-  createStrComponents(pwrSwitcher, 30);
+  createStrComponents(pwrSwitcher);
 #endif /* OBSW_ADD_STAR_TRACKER == 1 */
 
   createPayloadComponents(gpioComIF, *pwrSwitcher);
diff --git a/bsp_q7s/fmObjectFactory.cpp b/bsp_q7s/fmObjectFactory.cpp
index 6eca9a9d..e43e3551 100644
--- a/bsp_q7s/fmObjectFactory.cpp
+++ b/bsp_q7s/fmObjectFactory.cpp
@@ -102,7 +102,7 @@ void ObjectFactory::produce(void* args) {
 #endif
 
 #if OBSW_ADD_STAR_TRACKER == 1
-  createStrComponents(pwrSwitcher, 5);
+  createStrComponents(pwrSwitcher);
 #endif /* OBSW_ADD_STAR_TRACKER == 1 */
 
 #if OBSW_ADD_CCSDS_IP_CORES == 1
diff --git a/bsp_q7s/objectFactory.cpp b/bsp_q7s/objectFactory.cpp
index a27fa94e..326ba8ef 100644
--- a/bsp_q7s/objectFactory.cpp
+++ b/bsp_q7s/objectFactory.cpp
@@ -928,8 +928,7 @@ void ObjectFactory::createTestComponents(LinuxLibgpioIF* gpioComIF) {
 #endif
 }
 
-void ObjectFactory::createStrComponents(PowerSwitchIF* pwrSwitcher,
-                                        uint32_t missedReplyCountThreshold) {
+void ObjectFactory::createStrComponents(PowerSwitchIF* pwrSwitcher) {
   auto* strAssy = new StrAssembly(objects::STR_ASSY);
   strAssy->connectModeTreeParent(satsystem::acs::ACS_SUBSYSTEM);
   auto* starTrackerCookie =
@@ -942,7 +941,7 @@ void ObjectFactory::createStrComponents(PowerSwitchIF* pwrSwitcher,
   if (paramJsonFile == nullptr) {
     sif::error << "No valid Star Tracker parameter JSON file" << std::endl;
   }
-  auto strFdir = new StrFdir(objects::STAR_TRACKER, missedReplyCountThreshold);
+  auto strFdir = new StrFdir(objects::STAR_TRACKER);
   auto starTracker =
       new StarTrackerHandler(objects::STAR_TRACKER, objects::STR_COM_IF, starTrackerCookie,
                              paramJsonFile, strComIF, power::PDU1_CH2_STAR_TRACKER_5V);
diff --git a/bsp_q7s/objectFactory.h b/bsp_q7s/objectFactory.h
index 1e6e5461..491720ac 100644
--- a/bsp_q7s/objectFactory.h
+++ b/bsp_q7s/objectFactory.h
@@ -69,7 +69,7 @@ void createHeaterComponents(GpioIF* gpioIF, PowerSwitchIF* pwrSwitcher, HealthTa
                             HeaterHandler*& heaterHandler);
 void createImtqComponents(PowerSwitchIF* pwrSwitcher, bool enableHkSets, const char* i2cDev);
 void createBpxBatteryComponent(bool enableHkSets, const char* i2cDev);
-void createStrComponents(PowerSwitchIF* pwrSwitcher, uint32_t missedReplyCountThreshold);
+void createStrComponents(PowerSwitchIF* pwrSwitcher);
 void createSolarArrayDeploymentComponents(PowerSwitchIF& pwrSwitcher, GpioIF& gpioIF);
 void createSyrlinksComponents(PowerSwitchIF* pwrSwitcher);
 void createPayloadComponents(LinuxLibgpioIF* gpioComIF, PowerSwitchIF& pwrSwitcher);
diff --git a/mission/system/acs/StrFdir.cpp b/mission/system/acs/StrFdir.cpp
index 5d53586b..97a4162a 100644
--- a/mission/system/acs/StrFdir.cpp
+++ b/mission/system/acs/StrFdir.cpp
@@ -2,10 +2,8 @@
 
 #include "mission/acs/defs.h"
 
-StrFdir::StrFdir(object_id_t strObject, uint32_t missedReplyThreshold)
-    : DeviceHandlerFailureIsolation(strObject, objects::NO_OBJECT) {
-  missedReplyCount.setFailureThreshold(missedReplyThreshold);
-}
+StrFdir::StrFdir(object_id_t strObject)
+    : DeviceHandlerFailureIsolation(strObject, objects::NO_OBJECT) {}
 
 ReturnValue_t StrFdir::eventReceived(EventMessage* event) {
   if (event->getEvent() == acs::MEKF_INVALID_MODE_VIOLATION) {
diff --git a/mission/system/acs/StrFdir.h b/mission/system/acs/StrFdir.h
index 2a33afc3..20476e1a 100644
--- a/mission/system/acs/StrFdir.h
+++ b/mission/system/acs/StrFdir.h
@@ -5,7 +5,7 @@
 
 class StrFdir : public DeviceHandlerFailureIsolation {
  public:
-  StrFdir(object_id_t strObject, uint32_t missedReplyThreshold);
+  StrFdir(object_id_t strObject);
   ReturnValue_t eventReceived(EventMessage* event) override;
 };