From 19c73167c9e028b8778d6107f2189c2c67539bd3 Mon Sep 17 00:00:00 2001
From: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date: Fri, 14 Oct 2022 13:13:23 +0200
Subject: [PATCH] bugfixes for alternation

---
 mission/devices/SolarArrayDeploymentHandler.cpp | 9 +++++----
 mission/devices/SolarArrayDeploymentHandler.h   | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/mission/devices/SolarArrayDeploymentHandler.cpp b/mission/devices/SolarArrayDeploymentHandler.cpp
index cd64fd7b..513ddbff 100644
--- a/mission/devices/SolarArrayDeploymentHandler.cpp
+++ b/mission/devices/SolarArrayDeploymentHandler.cpp
@@ -371,14 +371,15 @@ ReturnValue_t SolarArrayDeploymentHandler::saGpioAlternation() {
         status = result;
       }
     } else {
+	  result = sa2Off();
+	  if (result != returnvalue::OK) {
+	    status = result;
+	  }
       result = sa1On();
       if (result != returnvalue::OK) {
         status = result;
       }
-      result = sa2Off();
-      if (result != returnvalue::OK) {
-        status = result;
-      }
+
     }
     fsmInfo.alternationDummy = not fsmInfo.alternationDummy;
     channelAlternationCd.resetTimer();
diff --git a/mission/devices/SolarArrayDeploymentHandler.h b/mission/devices/SolarArrayDeploymentHandler.h
index c7494b8a..32892688 100644
--- a/mission/devices/SolarArrayDeploymentHandler.h
+++ b/mission/devices/SolarArrayDeploymentHandler.h
@@ -174,7 +174,7 @@ class SolarArrayDeploymentHandler : public ExecutableObjectIF,
    */
   Countdown burnCountdown;
 
-  Countdown channelAlternationCd = Countdown(config::SA_DEPL_CHANNEL_ALTERNATION_INTERVAL_SECS);
+  Countdown channelAlternationCd = Countdown(config::SA_DEPL_CHANNEL_ALTERNATION_INTERVAL_SECS * 1000);
 
   /**
    * The message queue id of the component commanding an action will be stored in this variable.