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

linux/devices/ScexUartReader.cpp

@@ -118,10 +118,7 @@ ReturnValue_t ScexUartReader::initializeInterface(CookieIF *cookie) {
   tty.c_cc[VTIME] = 0;
   tty.c_cc[VMIN] = 0;
 
-  // The SCEX experiment has a fixed baud rate.
-  if (cfsetispeed(&tty, B38400) != 0) {
-    sif::warning << "ScexUartReader::initializeInterface: Setting baud rate failed" << std::endl;
-  }
+  uart::setBaudrate(tty, uartCookie->getBaudrate());
   if (tcsetattr(serialPort, TCSANOW, &tty) != 0) {
     sif::warning << "ScexUartReader::initializeInterface: tcsetattr call failed with error ["
                  << errno << ", " << strerror(errno) << std::endl;

linux/devices/ploc/PlocSupervisorHandler.cpp

@@ -1917,6 +1917,11 @@ ReturnValue_t PlocSupervisorHandler::checkMramPacketApid() {
 }
 
 ReturnValue_t PlocSupervisorHandler::handleMramDumpFile(DeviceCommandId_t id) {
+#ifdef XIPHOS_Q7S
+  if (not sdcMan->getActiveSdCard()) {
+    return HasFileSystemIF::FILESYSTEM_INACTIVE;
+  }
+#endif
   ReturnValue_t result = returnvalue::OK;
   uint16_t packetLen = readSpacePacketLength(spacePacketBuffer);
   uint8_t sequenceFlags = readSequenceFlags(spacePacketBuffer);

linux/devices/ploc/PlocSupvHelper.cpp

@@ -1,6 +1,7 @@
 #include "PlocSupvHelper.h"
 
 #include <etl/crc16_ccitt.h>
+#include <fsfw/filesystem/HasFileSystemIF.h>
 
 #include <cmath>
 #include <filesystem>
@@ -748,6 +749,11 @@ uint32_t PlocSupvHelper::getFileSize(std::string filename) {
 
 ReturnValue_t PlocSupvHelper::handleEventBufferReception(ploc::SpTmReader& reader) {
   ReturnValue_t result = returnvalue::OK;
+#ifdef XIPHOS_Q7S
+  if (not sdcMan->getActiveSdCard()) {
+    return HasFileSystemIF::FILESYSTEM_INACTIVE;
+  }
+#endif
   std::string filename = Filenaming::generateAbsoluteFilename(
       eventBufferReq.path, eventBufferReq.filename, timestamping);
   std::ofstream file(filename, std::ios_base::app | std::ios_base::out);

linux/devices/startracker/StrHelper.cpp

@@ -1,5 +1,7 @@
 #include "StrHelper.h"
 
+#include <fsfw/filesystem/HasFileSystemIF.h>
+
 #include <filesystem>
 #include <fstream>
 
@@ -176,6 +178,11 @@ void StrHelper::disableTimestamping() { timestamping = false; }
 void StrHelper::enableTimestamping() { timestamping = true; }
 
 ReturnValue_t StrHelper::performImageDownload() {
+#ifdef XIPHOS_Q7S
+  if (not sdcMan->getActiveSdCard()) {
+    return HasFileSystemIF::FILESYSTEM_INACTIVE;
+  }
+#endif
   ReturnValue_t result;
 #if OBSW_DEBUG_STARTRACKER == 1
   ProgressPrinter progressPrinter("Image download", ImageDownload::LAST_POSITION);
@@ -244,6 +251,11 @@ ReturnValue_t StrHelper::performImageUpload() {
   uint32_t imageSize = 0;
   struct UploadActionRequest uploadReq;
   uploadReq.position = 0;
+#ifdef XIPHOS_Q7S
+  if (not sdcMan->getActiveSdCard()) {
+    return HasFileSystemIF::FILESYSTEM_INACTIVE;
+  }
+#endif
   std::memset(&uploadReq.data, 0, sizeof(uploadReq.data));
   if (not std::filesystem::exists(uploadImage.uploadFile)) {
     triggerEvent(STR_HELPER_FILE_NOT_EXISTS, static_cast<uint32_t>(internalState));
@@ -315,6 +327,11 @@ ReturnValue_t StrHelper::performFirmwareUpdate() {
 }
 
 ReturnValue_t StrHelper::performFlashWrite() {
+#ifdef XIPHOS_Q7S
+  if (not sdcMan->getActiveSdCard()) {
+    return HasFileSystemIF::FILESYSTEM_INACTIVE;
+  }
+#endif
   ReturnValue_t result = returnvalue::OK;
   uint32_t size = 0;
   uint32_t bytesWritten = 0;
@@ -394,6 +411,11 @@ ReturnValue_t StrHelper::performFlashWrite() {
 }
 
 ReturnValue_t StrHelper::performFlashRead() {
+#ifdef XIPHOS_Q7S
+  if (not sdcMan->getActiveSdCard()) {
+    return HasFileSystemIF::FILESYSTEM_INACTIVE;
+  }
+#endif
   ReturnValue_t result;
 #if OBSW_DEBUG_STARTRACKER == 1
   ProgressPrinter progressPrinter("Flash read", flashRead.size);