From 633fe00cd6d896c99a36b13cf2278d439c4df167 Mon Sep 17 00:00:00 2001
From: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date: Tue, 24 May 2022 01:14:04 +0200
Subject: [PATCH] run afmt, minor improvements

---
 bsp_q7s/core/CoreController.cpp              | 5 +++--
 linux/devices/Max31865RtdLowlevelHandler.cpp | 2 +-
 mission/devices/Max31865EiveHandler.cpp      | 2 +-
 tmtc                                         | 2 +-
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/bsp_q7s/core/CoreController.cpp b/bsp_q7s/core/CoreController.cpp
index 6471c2c0..30d8cbbe 100644
--- a/bsp_q7s/core/CoreController.cpp
+++ b/bsp_q7s/core/CoreController.cpp
@@ -934,9 +934,10 @@ ReturnValue_t CoreController::actionReboot(const uint8_t *data, size_t size) {
 
 ReturnValue_t CoreController::gracefulShutdownTasks(xsc::Chip chip, xsc::Copy copy,
                                                     bool &protOpPerformed) {
+  sdcMan->setBlocking(true);
   // Attempt graceful shutdown by unmounting and switching off SD cards
-  SdCardManager::instance()->switchOffSdCard(sd::SdCard::SLOT_0);
-  SdCardManager::instance()->switchOffSdCard(sd::SdCard::SLOT_1);
+  sdcMan->switchOffSdCard(sd::SdCard::SLOT_0);
+  sdcMan->switchOffSdCard(sd::SdCard::SLOT_1);
   // If any boot copies are unprotected
   ReturnValue_t result = setBootCopyProtection(xsc::Chip::SELF_CHIP, xsc::Copy::SELF_COPY, true,
                                                protOpPerformed, false);
diff --git a/linux/devices/Max31865RtdLowlevelHandler.cpp b/linux/devices/Max31865RtdLowlevelHandler.cpp
index 6a3af90e..ea038c8b 100644
--- a/linux/devices/Max31865RtdLowlevelHandler.cpp
+++ b/linux/devices/Max31865RtdLowlevelHandler.cpp
@@ -114,7 +114,7 @@ bool Max31865RtdReader::periodicInitHandling() {
 #if OBSW_RTD_AUTO_MODE == 0
       result = writeBiasSel(Bias::ON, rtd->spiCookie, BASE_CFG);
 #endif
-      someRtdUsable =  true;
+      someRtdUsable = true;
     }
   }
   return someRtdUsable;
diff --git a/mission/devices/Max31865EiveHandler.cpp b/mission/devices/Max31865EiveHandler.cpp
index 7075b685..a77bbd51 100644
--- a/mission/devices/Max31865EiveHandler.cpp
+++ b/mission/devices/Max31865EiveHandler.cpp
@@ -123,7 +123,7 @@ void Max31865EiveHandler::fillCommandAndReplyMap() {
 
 ReturnValue_t Max31865EiveHandler::scanForReply(const uint8_t* start, size_t remainingSize,
                                                 DeviceCommandId_t* foundId, size_t* foundLen) {
-  if(mode == _MODE_POWER_ON or mode == _MODE_WAIT_ON) {
+  if (mode == _MODE_POWER_ON or mode == _MODE_WAIT_ON) {
     return IGNORE_FULL_PACKET;
   }
   if (remainingSize != structLen) {
diff --git a/tmtc b/tmtc
index 51bbeaa6..41f1f4c9 160000
--- a/tmtc
+++ b/tmtc
@@ -1 +1 @@
-Subproject commit 51bbeaa693a11bfc4d2cb342354041972dd93c1e
+Subproject commit 41f1f4c99a99fd7e0892773fd209ed6273810885