From f8196de0891351c2aa2f32d22bb7539b43fe1231 Mon Sep 17 00:00:00 2001
From: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date: Fri, 20 Jan 2023 12:24:19 +0100
Subject: [PATCH] update changelog

---
 CHANGELOG.md                                  |  5 +++++
 .../devices/SolarArrayDeploymentHandler.cpp   | 21 +++++++++++++------
 mission/devices/SolarArrayDeploymentHandler.h | 10 +++++++--
 tmtc                                          |  2 +-
 4 files changed, 29 insertions(+), 9 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 152bbead..6a857d28 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -22,6 +22,11 @@ list yields a list of all related PRs for each release.
 - The ACS Controller Gyro Sets (raw and processed) and the MEKF dataset are diagnostics now.
 - Bumped FSFW for Service 11 improvement which includes size and CRC check for contained TC
 - Syrlinks module now always included for both EM and FM
+- SA Deployment: Allow specifying the switch interval and the initial channel. This allows testing
+  the new deployment procedure where each channel is burned for half of the whole burn duration.
+  It also allows burning only one channel for the whole burn duration. The autonomous mechanism
+  was adapted to burn each channel for half of the burn time by default.
+  PR: 
 
 ## Fixed
 
diff --git a/mission/devices/SolarArrayDeploymentHandler.cpp b/mission/devices/SolarArrayDeploymentHandler.cpp
index 26ae987f..2b4e22ac 100644
--- a/mission/devices/SolarArrayDeploymentHandler.cpp
+++ b/mission/devices/SolarArrayDeploymentHandler.cpp
@@ -97,9 +97,15 @@ void SolarArrayDeploymentHandler::handleStateMachine() {
     // This should never fail
     channelAlternationCd.resetTimer();
     if (not fsmInfo.dryRun) {
-      sa2Off();
-      sa1On();
-      fsmInfo.alternationDummy = true;
+      if (fsmInfo.initChannel == 0) {
+        sa2Off();
+        sa1On();
+        fsmInfo.alternationDummy = true;
+      } else {
+        sa1Off();
+        sa2On();
+        fsmInfo.alternationDummy = false;
+      }
     }
     sif::info << "S/A Deployment: Burning" << std::endl;
     triggerEvent(BURN_PHASE_START, fsmInfo.burnCountdownMs, fsmInfo.dryRun);
@@ -220,7 +226,7 @@ bool SolarArrayDeploymentHandler::autonomousDeplForFile(sd::SdCard sdCard, const
   if (stateSwitch or firstAutonomousCycle) {
     if (deplState == AutonomousDeplState::FIRST_BURN or
         deplState == AutonomousDeplState::SECOND_BURN) {
-      startFsmOn(config::SA_DEPL_BURN_TIME_SECS, (config::SA_DEPL_BURN_TIME_SECS / 2) * 1000,
+      startFsmOn(config::SA_DEPL_BURN_TIME_SECS, (config::SA_DEPL_BURN_TIME_SECS / 2) * 1000, 0,
                  dryRun);
     } else if (deplState == AutonomousDeplState::WAIT or deplState == AutonomousDeplState::DONE or
                deplState == AutonomousDeplState::INIT) {
@@ -286,7 +292,8 @@ bool SolarArrayDeploymentHandler::checkMainPower(bool onOff) {
 }
 
 bool SolarArrayDeploymentHandler::startFsmOn(uint32_t burnCountdownSecs,
-                                             uint32_t channelAlternationIntervalMs, bool dryRun) {
+                                             uint32_t channelAlternationIntervalMs,
+                                             uint8_t initChannel, bool dryRun) {
   if (stateMachine != StateMachine::IDLE) {
     return false;
   }
@@ -296,6 +303,7 @@ bool SolarArrayDeploymentHandler::startFsmOn(uint32_t burnCountdownSecs,
   }
   fsmInfo.dryRun = dryRun;
   fsmInfo.burnCountdownMs = burnCountdownSecs * 1000;
+  fsmInfo.initChannel = initChannel;
   stateMachine = StateMachine::MAIN_POWER_ON;
   retryCounter = 0;
   return true;
@@ -359,7 +367,8 @@ ReturnValue_t SolarArrayDeploymentHandler::executeAction(ActionId_t actionId,
       return result;
     }
     uint32_t burnCountdown = cmd.getBurnTimeSecs();
-    if (not startFsmOn(burnCountdown, cmd.getSwitchIntervalMs(), cmd.isDryRun())) {
+    if (not startFsmOn(burnCountdown, cmd.getSwitchIntervalMs(), cmd.getInitChannel(),
+                       cmd.isDryRun())) {
       return HasActionsIF::IS_BUSY;
     }
     actionActive = true;
diff --git a/mission/devices/SolarArrayDeploymentHandler.h b/mission/devices/SolarArrayDeploymentHandler.h
index ddb91ab9..8e5c32ad 100644
--- a/mission/devices/SolarArrayDeploymentHandler.h
+++ b/mission/devices/SolarArrayDeploymentHandler.h
@@ -30,18 +30,22 @@ class ManualDeploymentCommand : public SerialLinkedListAdapter<SerializeIF> {
   void setLinks() {
     setStart(&burnTimeSecs);
     burnTimeSecs.setNext(&switchIntervalMs);
-    burnTimeSecs.setNext(&dryRun);
+    switchIntervalMs.setNext(&initChannel);
+    initChannel.setNext(&dryRun);
   }
 
   uint32_t getBurnTimeSecs() const { return burnTimeSecs.entry; }
 
   uint32_t getSwitchIntervalMs() const { return switchIntervalMs.entry; };
 
+  uint8_t getInitChannel() const { return initChannel.entry; };
+
   bool isDryRun() const { return dryRun.entry; }
 
  private:
   SerializeElement<uint32_t> burnTimeSecs;
   SerializeElement<uint32_t> switchIntervalMs;
+  SerializeElement<uint8_t> initChannel;
   SerializeElement<uint8_t> dryRun;
 };
 
@@ -130,6 +134,7 @@ class SolarArrayDeploymentHandler : public ExecutableObjectIF,
     // DeploymentChannels channel;
     bool dryRun;
     bool alternationDummy = false;
+    uint8_t initChannel = 0;
     uint32_t burnCountdownMs = config::SA_DEPL_MAX_BURN_TIME;
   };
 
@@ -168,7 +173,8 @@ class SolarArrayDeploymentHandler : public ExecutableObjectIF,
   PeriodicOperationDivider opDivider = PeriodicOperationDivider(5);
   uint8_t retryCounter = 3;
 
-  bool startFsmOn(uint32_t burnCountdownSecs, uint32_t channelAlternationIntervalMs, bool dryRun);
+  bool startFsmOn(uint32_t burnCountdownSecs, uint32_t channelAlternationIntervalMs,
+                  uint8_t initChannel, bool dryRun);
   void startFsmOff();
 
   void finishFsm(ReturnValue_t resultForActionHelper);
diff --git a/tmtc b/tmtc
index 2b5ad32f..91272847 160000
--- a/tmtc
+++ b/tmtc
@@ -1 +1 @@
-Subproject commit 2b5ad32fdd56d38e8318027b67d091d9e0ea3aba
+Subproject commit 912728474a11b6ccb86ce61c3aa802d931caac68