From a2e1ed56c91d6b469494fbb3eca25b9cf6639bec Mon Sep 17 00:00:00 2001
From: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date: Wed, 12 Oct 2022 14:09:07 +0200
Subject: [PATCH] pass SDC man to SA DEPL handler

---
 bsp_q7s/core/ObjectFactory.cpp                |  2 +-
 .../devices/SolarArrayDeploymentHandler.cpp   | 18 ++++----------
 mission/devices/SolarArrayDeploymentHandler.h | 24 ++++++++++---------
 3 files changed, 19 insertions(+), 25 deletions(-)

diff --git a/bsp_q7s/core/ObjectFactory.cpp b/bsp_q7s/core/ObjectFactory.cpp
index d4fb01b5..74af9564 100644
--- a/bsp_q7s/core/ObjectFactory.cpp
+++ b/bsp_q7s/core/ObjectFactory.cpp
@@ -560,7 +560,7 @@ void ObjectFactory::createSolarArrayDeploymentComponents(PowerSwitchIF& pwrSwitc
 
   new SolarArrayDeploymentHandler(objects::SOLAR_ARRAY_DEPL_HANDLER, gpioIF, pwrSwitcher,
                                   pcdu::Switches::PDU2_CH5_DEPLOYMENT_MECHANISM_8V,
-                                  gpioIds::DEPLSA1, gpioIds::DEPLSA2);
+                                  gpioIds::DEPLSA1, gpioIds::DEPLSA2, *SdCardManager::instance());
 }
 
 void ObjectFactory::createSyrlinksComponents(PowerSwitchIF* pwrSwitcher) {
diff --git a/mission/devices/SolarArrayDeploymentHandler.cpp b/mission/devices/SolarArrayDeploymentHandler.cpp
index 9d2d94a3..e3357a53 100644
--- a/mission/devices/SolarArrayDeploymentHandler.cpp
+++ b/mission/devices/SolarArrayDeploymentHandler.cpp
@@ -9,7 +9,8 @@ SolarArrayDeploymentHandler::SolarArrayDeploymentHandler(object_id_t setObjectId
                                                          GpioIF& gpioInterface,
                                                          PowerSwitchIF& mainLineSwitcher_,
                                                          pcdu::Switches mainLineSwitch_,
-                                                         gpioId_t deplSA1, gpioId_t deplSA2)
+                                                         gpioId_t deplSA1, gpioId_t deplSA2,
+                                                         SdCardMountedIF& sdcMountedIF)
     : SystemObject(setObjectId_),
       gpioInterface(gpioInterface),
       deplSA1(deplSA1),
@@ -25,25 +26,16 @@ SolarArrayDeploymentHandler::SolarArrayDeploymentHandler(object_id_t setObjectId
 SolarArrayDeploymentHandler::~SolarArrayDeploymentHandler() {}
 
 ReturnValue_t SolarArrayDeploymentHandler::performOperation(uint8_t operationCode) {
-  if (operationCode == DeviceHandlerIF::PERFORM_OPERATION) {
-    handleStateMachine();
-    return returnvalue::OK;
-  }
+  handleStateMachine();
   return returnvalue::OK;
 }
 
 ReturnValue_t SolarArrayDeploymentHandler::initialize() {
-  ReturnValue_t result = SystemObject::initialize();
+  ReturnValue_t result = actionHelper.initialize(commandQueue);
   if (result != returnvalue::OK) {
     return ObjectManagerIF::CHILD_INIT_FAILED;
   }
-
-  result = actionHelper.initialize(commandQueue);
-  if (result != returnvalue::OK) {
-    return ObjectManagerIF::CHILD_INIT_FAILED;
-  }
-
-  return returnvalue::OK;
+  return SystemObject::initialize();
 }
 
 void SolarArrayDeploymentHandler::handleStateMachine() {
diff --git a/mission/devices/SolarArrayDeploymentHandler.h b/mission/devices/SolarArrayDeploymentHandler.h
index 0f85029f..74d207a9 100644
--- a/mission/devices/SolarArrayDeploymentHandler.h
+++ b/mission/devices/SolarArrayDeploymentHandler.h
@@ -1,16 +1,17 @@
 #ifndef MISSION_DEVICES_SOLARARRAYDEPLOYMENT_H_
 #define MISSION_DEVICES_SOLARARRAYDEPLOYMENT_H_
 
-#include <devices/powerSwitcherList.h>
-#include <fsfw/action/HasActionsIF.h>
-#include <fsfw/devicehandlers/CookieIF.h>
-#include <fsfw/devicehandlers/DeviceHandlerIF.h>
-#include <fsfw/objectmanager/SystemObject.h>
-#include <fsfw/power/PowerSwitchIF.h>
-#include <fsfw/returnvalues/returnvalue.h>
-#include <fsfw/tasks/ExecutableObjectIF.h>
-#include <fsfw/timemanager/Countdown.h>
-#include <fsfw_hal/common/gpio/GpioIF.h>
+#include "devices/powerSwitcherList.h"
+#include "fsfw/action/HasActionsIF.h"
+#include "fsfw/devicehandlers/CookieIF.h"
+#include "fsfw/devicehandlers/DeviceHandlerIF.h"
+#include "fsfw/objectmanager/SystemObject.h"
+#include "fsfw/power/PowerSwitchIF.h"
+#include "fsfw/returnvalues/returnvalue.h"
+#include "fsfw/tasks/ExecutableObjectIF.h"
+#include "fsfw/timemanager/Countdown.h"
+#include "fsfw_hal/common/gpio/GpioIF.h"
+#include "mission/memory/SdCardMountedIF.h"
 
 #include <unordered_map>
 
@@ -45,7 +46,8 @@ class SolarArrayDeploymentHandler : public ExecutableObjectIF,
    */
   SolarArrayDeploymentHandler(object_id_t setObjectId, GpioIF& gpio,
                               PowerSwitchIF& mainLineSwitcher, pcdu::Switches mainLineSwitch,
-                              gpioId_t deplSA1, gpioId_t deplSA2);
+                              gpioId_t deplSA1, gpioId_t deplSA2,
+                              SdCardMountedIF& sdcMountedIF);
 
   virtual ~SolarArrayDeploymentHandler();