Merge remote-tracking branch 'origin/develop' into heater_handling

CHANGELOG.md

@@ -10,6 +10,13 @@ list yields a list of all related PRs for each release.
 
 # [unreleased]
 
+## Added
+
+- The Q7S SW now checks for a file named `boot_delay_secs.stxt` in the home directory.
+  If it exists and the file is empty, it will delay for 6 seconds before continuing
+  with the regular boot. It can also try to read delay seconds from the file.
+  PR: https://egit.irs.uni-stuttgart.de/eive/eive-obsw/pulls/340.
+
 ## Changed
 
 - Bumped FSFW for Service 11 improvement which includes size and CRC check for contained TC

bsp_q7s/obsw.cpp

@@ -1,8 +1,13 @@
 #include "obsw.h"
 
 #include <filesystem>
+#include <fstream>
 #include <iostream>
 
+#include <unistd.h>
+#include <sys/types.h>
+#include <pwd.h>
+
 #include "OBSWConfig.h"
 #include "commonConfig.h"
 #include "core/scheduling.h"
@@ -36,6 +41,35 @@ int obsw::obsw() {
     return OBSW_ALREADY_RUNNING;
   }
 #endif
+
+  const char* homedir = nullptr;
+  homedir = getenv("HOME");
+  if(homedir == nullptr) {
+	  homedir = getpwuid(getuid())->pw_dir;
+  }
+  std::filesystem::path bootDelayFile = std::filesystem::path(homedir) / "boot_delay_secs.txt";
+  // Init delay handling.
+  if (std::filesystem::exists(bootDelayFile)) {
+    std::ifstream ifile(bootDelayFile);
+    std::string lineStr;
+    unsigned int bootDelaySecs = 0;
+    unsigned int line = 0;
+    // Try to reas delay seconds from file.
+    while (std::getline(ifile, lineStr)) {
+      std::istringstream iss(lineStr);
+      if (!(iss >> bootDelaySecs)) {
+        break;
+      }
+      line++;
+    }
+    if (line == 0) {
+      // If the file is empty, assume default of 6 seconds
+      bootDelaySecs = 6;
+    }
+    std::cout << "Delaying OBSW start for " << bootDelaySecs << " seconds" << std::endl;
+    TaskFactory::delayTask(bootDelaySecs * 1000);
+  }
+
   scheduling::initMission();
 
   for (;;) {

fsfw

@@ -1 +1 @@
-Subproject commit 05cad893a2b713827cf4cdc9afe49675f18afcc7
+Subproject commit accaf855ee53d3dc429d7bcdf1b7b89768c166b6

mission/controller/controllerdefinitions/AcsCtrlDefinitions.h

@@ -182,9 +182,9 @@ class SusDataProcessed : public StaticLocalDataSet<SUS_SET_PROCESSED_ENTRIES> {
   lp_vec_t<float, 3> sus6vec = lp_vec_t<float, 3>(sid.objectId, SUS_6_VEC, this);
   lp_vec_t<float, 3> sus7vec = lp_vec_t<float, 3>(sid.objectId, SUS_7_VEC, this);
   lp_vec_t<float, 3> sus8vec = lp_vec_t<float, 3>(sid.objectId, SUS_8_VEC, this);
-  lp_vec_t<float, 3> sus9vec = lp_vec_t<float, 3>(sid.objectId, SUS_8_VEC, this);
-  lp_vec_t<float, 3> sus10vec = lp_vec_t<float, 3>(sid.objectId, SUS_8_VEC, this);
-  lp_vec_t<float, 3> sus11vec = lp_vec_t<float, 3>(sid.objectId, SUS_8_VEC, this);
+  lp_vec_t<float, 3> sus9vec = lp_vec_t<float, 3>(sid.objectId, SUS_9_VEC, this);
+  lp_vec_t<float, 3> sus10vec = lp_vec_t<float, 3>(sid.objectId, SUS_10_VEC, this);
+  lp_vec_t<float, 3> sus11vec = lp_vec_t<float, 3>(sid.objectId, SUS_11_VEC, this);
   lp_vec_t<double, 3> susVecTot = lp_vec_t<double, 3>(sid.objectId, SUS_VEC_TOT, this);
   lp_vec_t<double, 3> susVecTotDerivative =
       lp_vec_t<double, 3>(sid.objectId, SUS_VEC_TOT_DERIVATIVE, this);

tmtc

@@ -1 +1 @@
-Subproject commit 56d0f26cbffbfbf4e790d3a19858162291104934
+Subproject commit f14bb81c9ba902695c64bda1254eb26b732cb9ce