Merge remote-tracking branch 'origin/develop' into mueller/acs-ss-init

CHANGELOG.md

@@ -10,6 +10,13 @@ list yields a list of all related PRs for each release.
 
 # [unreleased]
 
+# [v1.14.1]
+
+- Various bugfixes and regression fixes
+- General file handling at program initialization now works properly again
+- Scratch buffer preferred SD card handling works again
+- Use scoped locks in TCS controller to avoid deadlocks
+
 # [v1.14.0]
 
 - Provide full SW update capability for the OBSW.

CMakeLists.txt

@@ -11,7 +11,7 @@ cmake_minimum_required(VERSION 3.13)
 
 set(OBSW_VERSION_MAJOR_IF_GIT_FAILS 1)
 set(OBSW_VERSION_MINOR_IF_GIT_FAILS 14)
-set(OBSW_VERSION_REVISION_IF_GIT_FAILS 0)
+set(OBSW_VERSION_REVISION_IF_GIT_FAILS 1)
 
 # set(CMAKE_VERBOSE TRUE)
 

bsp_q7s/core/CoreController.cpp

@@ -1227,29 +1227,29 @@ void CoreController::performWatchdogControlOperation() {
 }
 
 void CoreController::performMountedSdCardOperations() {
-  auto mountedSdCardOp = [&](bool &mntSwitch, sd::SdCard sdCard, std::string mntPoint) {
-    if (mntSwitch) {
-      bool sdCardMounted = sdcMan->isSdCardUsable(sdCard);
-      if (sdCardMounted and not performOneShotSdCardOpsSwitch) {
-        std::ostringstream path;
-        path << mntPoint << "/" << CONF_FOLDER;
-        if (not std::filesystem::exists(path.str())) {
-          std::filesystem::create_directory(path.str());
-        }
-        initVersionFile();
-        initClockFromTimeFile();
-        performRebootFileHandling(false);
-        performOneShotSdCardOpsSwitch = true;
+  auto mountedSdCardOp = [&](sd::SdCard sdCard, std::string mntPoint) {
+    if (not performOneShotSdCardOpsSwitch) {
+      std::ostringstream path;
+      path << mntPoint << "/" << CONF_FOLDER;
+      if (not std::filesystem::exists(path.str())) {
+        std::filesystem::create_directory(path.str());
       }
-      mntSwitch = false;
+      initVersionFile();
+      initClockFromTimeFile();
+      performRebootFileHandling(false);
     }
   };
-  if (sdInfo.active == sd::SdCard::SLOT_1) {
-    mountedSdCardOp(sdInfo.mountSwitch.second, sd::SdCard::SLOT_1, config::SD_1_MOUNT_POINT);
-    mountedSdCardOp(sdInfo.mountSwitch.first, sd::SdCard::SLOT_0, config::SD_0_MOUNT_POINT);
-  } else {
-    mountedSdCardOp(sdInfo.mountSwitch.first, sd::SdCard::SLOT_0, config::SD_0_MOUNT_POINT);
-    mountedSdCardOp(sdInfo.mountSwitch.second, sd::SdCard::SLOT_1, config::SD_1_MOUNT_POINT);
+  bool clearOneShotFlag = false;
+  if (sdInfo.active == sd::SdCard::SLOT_0 and sdcMan->isSdCardUsable(sd::SdCard::SLOT_0)) {
+    mountedSdCardOp(sd::SdCard::SLOT_0, config::SD_0_MOUNT_POINT);
+    clearOneShotFlag = true;
+  }
+  if (sdInfo.active == sd::SdCard::SLOT_1 and sdcMan->isSdCardUsable(sd::SdCard::SLOT_1)) {
+    mountedSdCardOp(sd::SdCard::SLOT_1, config::SD_1_MOUNT_POINT);
+    clearOneShotFlag = true;
+  }
+  if (clearOneShotFlag) {
+    performOneShotSdCardOpsSwitch = true;
   }
   timeFileHandler();
 }

bsp_q7s/core/CoreController.h

@@ -205,7 +205,7 @@ class CoreController : public ExtendedControllerBase {
 
   RebootFile rebootFile = {};
   std::string currMntPrefix;
-  bool performOneShotSdCardOpsSwitch = true;
+  bool performOneShotSdCardOpsSwitch = false;
 
   /**
    * Index 0: Chip 0 Copy 0

bsp_q7s/fs/SdCardManager.cpp

@@ -27,8 +27,7 @@ SdCardManager::SdCardManager() : SystemObject(objects::SDC_MANAGER), cmdExecutor
   }
   uint8_t prefSdRaw = 0;
   result = scratch::readNumber(scratch::PREFERED_SDC_KEY, prefSdRaw);
-  result = mutex->unlockMutex();
-  if (result != returnvalue::OK) {
+  if (mutex->unlockMutex() != returnvalue::OK) {
     sif::error << "SdCardManager::SdCardManager: Mutex unlock failed" << std::endl;
   }
 

mission/controller/ThermalController.cpp

@@ -238,7 +238,8 @@ void ThermalController::copySensors() {
     PoolReadGuard pg0(&max31865Set0);
     if (pg0.getReadResult() == returnvalue::OK) {
       sensorTemperatures.sensor_ploc_heatspreader.value = max31865Set0.temperatureCelcius.value;
-      sensorTemperatures.sensor_ploc_heatspreader.setValid(max31865Set0.temperatureCelcius.isValid());
+      sensorTemperatures.sensor_ploc_heatspreader.setValid(
+          max31865Set0.temperatureCelcius.isValid());
       if (not sensorTemperatures.sensor_ploc_heatspreader.isValid()) {
         sensorTemperatures.sensor_ploc_heatspreader.value = INVALID_TEMPERATURE;
       }
@@ -249,7 +250,8 @@ void ThermalController::copySensors() {
     PoolReadGuard pg1(&max31865Set1);
     if (pg1.getReadResult() == returnvalue::OK) {
       sensorTemperatures.sensor_ploc_missionboard.value = max31865Set1.temperatureCelcius.value;
-      sensorTemperatures.sensor_ploc_missionboard.setValid(max31865Set1.temperatureCelcius.isValid());
+      sensorTemperatures.sensor_ploc_missionboard.setValid(
+          max31865Set1.temperatureCelcius.isValid());
       if (not sensorTemperatures.sensor_ploc_missionboard.isValid()) {
         sensorTemperatures.sensor_ploc_missionboard.value = INVALID_TEMPERATURE;
       }
@@ -271,7 +273,8 @@ void ThermalController::copySensors() {
     PoolReadGuard pg3(&max31865Set3);
     if (pg3.getReadResult() == returnvalue::OK) {
       sensorTemperatures.sensor_dac_heatspreader.value = max31865Set3.temperatureCelcius.value;
-      sensorTemperatures.sensor_dac_heatspreader.setValid(max31865Set3.temperatureCelcius.isValid());
+      sensorTemperatures.sensor_dac_heatspreader.setValid(
+          max31865Set3.temperatureCelcius.isValid());
       if (not sensorTemperatures.sensor_dac_heatspreader.isValid()) {
         sensorTemperatures.sensor_dac_heatspreader.value = INVALID_TEMPERATURE;
       }
@@ -389,7 +392,6 @@ void ThermalController::copySensors() {
     }
   }
 
-
   {
     PoolReadGuard pg14(&max31865Set14);
     if (pg14.getReadResult() == returnvalue::OK) {

tmtc

@@ -1 +1 @@
-Subproject commit 3d2dee8c9c6265162579d363eeed6e55d03f36b9
+Subproject commit a82665321e545fda6360a1a881558fe50e93f64b