CHANGELOG.md

@@ -12,6 +12,11 @@ list yields a list of all related PRs for each release.
 
 # [v1.14.0]
 
+- Provide full SW update capability for the OBSW.
+  This includes very basic CFDP integration, a software update
+  procedure specified in detail in the README and some high level
+  commands to make this easier for operators.
+  PR: https://egit.irs.uni-stuttgart.de/eive/eive-obsw/pulls/302
 - Update for FSFW: `HasReturnvaluesIF` class replaced by namespace `returnvalue`
 - Add some GomSpace clients as a submodule dependency. Use this dependency to deserialize the
   GomSpace TM tables

README.md

@@ -152,6 +152,78 @@ When using Windows, run theses steps in MSYS2.
    cmake --build . -j
    ```
 
+## Preparing and executing an OBSW update
+
+A OBSW update consists of a `xz` compressed file `eive-sw-update.tar.xz`
+which contains the following two files:
+
+1. Stripped OBSW binary `eive-obsw-stripped`
+2. OBSW version text file with the name `obsw_version.txt`
+
+These files can be created manually:
+
+1. Build the release image inside `cmake-build-release-q7s`
+2. Switch into the build directory
+3. Run the following command to create the version file
+
+   ```sh
+   git describe --tags --always --exclude docker_* > obsw_version.txt
+   ```
+
+   You can also use the `create-version-file.sh` helper shell script
+   located in the `scripts` folder to do this.
+
+4. Set the Q7S user as the file owner for both files
+
+   ```sh
+   sudo chown root:root eive-obsw-stripped
+   sudo chown root:root obsw_version.txt
+   ```
+
+5. Run the following command to create the compressed archive
+
+   ```sh
+   tar -cJvf eive-sw-update.tar.xz eive-obsw-stripped obsw_version.txt
+   ```
+
+You can also use the helper script `create-sw-update.sh` inside the build folder
+after sourcing the `q7s-env.sh` helper script to perform all steps including
+a rebuild.
+
+After creating these files, they need to be transferred onto the Q7S
+to either the `/mnt/sd0/bin` or `/mnt/sd1/bin` folder if the OBSW update
+is performed from the SD card. It can also be transferred to the `/tmp` folder
+to perform the update from a temporary directory, which does not rely on any
+of the SD cards being on and mounted. However, all files in the temporary
+directory will be deleted if the Linux OS is rebooted for any reason.
+
+After both files are in place (this is checked by the OBSW), the example command
+sequence is used by the OBSW to write the OBSW update to the QSPI chip 0 and
+slot 0 using SD card 0:
+
+```sh
+tar -xJvf eive-update.tar.xz
+xsc_mount_copy 0 0
+cp eive-obsw-stripped /tmp/mntupdate-xdi-qspi0-nom-rootfs/usr/bin/eive-obsw
+cp obsw_update.txt /tmp/mntupdate-xdi-qspi0-nom-rootfs/usr/share/obsw_update.txt
+writeprotect 0 0 1
+```
+
+Some context information about the used commands:
+
+1. It mounts the target chip and copy combination into the `/tmp` folder
+   using the `xsc_mount_copy <chip> <copy>` utility. This also unlocks the
+   writeprotection for the chip. The mount point name inside `/tmp` depends
+   on which chip and copy is used
+
+   - Chip 0 Copy 0: `/tmp/mntupdate-xdi-qspi0-nom-rootfs`
+   - Chip 0 Copy 1: `/tmp/mntupdate-xdi-qspi0-gold-rootfs`
+   - Slot 1 Copy 0: `/tmp/mntupdate-xdi-qspi1-nom-rootfs`
+   - Slot 1 Copy 1: `/tmp/mntupdate-xdi-qspi1-gold-rootfs`
+
+2. Writing the file with a regular `cp <source> <target>` command
+3. Enabling the writeprotection using the `writeprotect <chip> <copy> 1` utility.
+
 ## Build for the Q7S target root filesystem with `yocto`
 
 The EIVE root filesystem will contain the EIVE OBSW and the Watchdog component.

bsp_hosted/ObjectFactory.cpp

@@ -6,10 +6,10 @@
 #include <mission/core/GenericFactory.h>
 #include <mission/tmtc/TmFunnel.h>
 #include <objects/systemObjectList.h>
-#include <tmtc/apid.h>
 #include <tmtc/pusIds.h>
 
 #include "OBSWConfig.h"
+#include "eive/definitions.h"
 #include "fsfw_tests/integration/task/TestTask.h"
 
 #if OBSW_USE_TMTC_TCP_BRIDGE == 0

bsp_hosted/fsfwconfig/events/subsystemIdRanges.h

@@ -1,10 +1,10 @@
 #ifndef CONFIG_EVENTS_SUBSYSTEMIDRANGES_H_
 #define CONFIG_EVENTS_SUBSYSTEMIDRANGES_H_
 
-#include <common/config/commonSubsystemIds.h>
-
 #include <cstdint>
 
+#include "eive/eventSubsystemIds.h"
+
 /**
  * These IDs are part of the ID for an event thrown by a subsystem.
  * Numbers 0-80 are reserved for FSFW Subsystem IDs (framework/events/)

bsp_hosted/fsfwconfig/objects/systemObjectList.h

@@ -1,10 +1,10 @@
 #ifndef HOSTED_CONFIG_OBJECTS_SYSTEMOBJECTLIST_H_
 #define HOSTED_CONFIG_OBJECTS_SYSTEMOBJECTLIST_H_
 
-#include <commonObjects.h>
-
 #include <cstdint>
 
+#include "eive/objects.h"
+
 // The objects will be instantiated in the ID order
 namespace objects {
 enum sourceObjects : uint32_t {

bsp_hosted/fsfwconfig/returnvalues/classIds.h

@@ -3,7 +3,7 @@
 
 #include <fsfw/returnvalues/FwClassIds.h>
 
-#include "commonClassIds.h"
+#include "eive/resultClassIds.h"
 
 /**
  * Source IDs starts at 73 for now

bsp_q7s/CMakeLists.txt

@@ -24,3 +24,4 @@ endif()
 add_subdirectory(memory)
 add_subdirectory(callbacks)
 add_subdirectory(xadc)
+add_subdirectory(fs)

bsp_q7s/boardconfig/q7sConfig.h.in

@@ -16,16 +16,6 @@
 /** Other flags                                                    */
 /*******************************************************************/
 
-#define Q7S_SD_NONE                                 0
-#define Q7S_SD_COLD_REDUNDANT                       1
-#define Q7S_SD_HOT_REDUNDANT                        2
-// The OBSW will perform different actions to set up the SD cards depending on the flag set here
-// Set to Q7S_SD_NONE: Don't do anything
-// Set to Q7S_COLD_REDUNDANT: On startup, get the prefered SD card, turn it on and mount it, and 
-//     turn off the second SD card if it is on
-// Set to Q7S_HOT_REDUNDANT: On startup, turn on both SD cards and mount them  
-#define Q7S_SD_CARD_CONFIG                          Q7S_SD_COLD_REDUNDANT
-
 // Probably better if this is disabled for mission code. Convenient for development
 #define Q7S_CHECK_FOR_ALREADY_RUNNING_IMG           1
 

bsp_q7s/boardtest/Q7STestTask.cpp

@@ -1,10 +1,10 @@
 #include "Q7STestTask.h"
 
 #include <bsp_q7s/core/CoreController.h>
-#include <bsp_q7s/memory/FileSystemHandler.h>
 #include <bsp_q7s/xadc/Xadc.h>
 #include <fsfw/globalfunctions/arrayprinter.h>
 #include <fsfw/objectmanager/ObjectManager.h>
+#include <fsfw_hal/host/HostFilesystem.h>
 #include <gps.h>
 #include <libgpsmm.h>
 #include <param/param_string.h>
@@ -17,13 +17,17 @@
 #include <iostream>
 #include <nlohmann/json.hpp>
 
-#include "bsp_q7s/memory/SdCardManager.h"
+#include "OBSWConfig.h"
+#include "bsp_q7s/fs/SdCardManager.h"
+#include "bsp_q7s/fs/helpers.h"
 #include "bsp_q7s/memory/scratchApi.h"
 #include "fsfw/tasks/TaskFactory.h"
 #include "fsfw/timemanager/Stopwatch.h"
 #include "p60pdu.h"
 #include "test/DummyParameter.h"
 
+using namespace returnvalue;
+
 Q7STestTask::Q7STestTask(object_id_t objectId) : TestTask(objectId) {
   doTestSdCard = false;
   doTestScratchApi = false;
@@ -71,7 +75,7 @@ ReturnValue_t Q7STestTask::performOneShotAction() {
   if (doTestProtHandler) {
     testProtHandler();
   }
-  FsOpCodes opCode = FsOpCodes::APPEND_TO_FILE;
+  FsOpCodes opCode = FsOpCodes::CREATE_EMPTY_FILE_IN_TMP;
   testFileSystemHandlerDirect(opCode);
   return TestTask::performOneShotAction();
 }
@@ -366,145 +370,23 @@ void Q7STestTask::testGpsDaemonSocket() {
 }
 
 void Q7STestTask::testFileSystemHandlerDirect(FsOpCodes opCode) {
-  auto fsHandler = ObjectManager::instance()->get<FileSystemHandler>(objects::FILE_SYSTEM_HANDLER);
+  HostFilesystem hostFs;
-  if (fsHandler == nullptr) {
+  auto* sdcMan = SdCardManager::instance();
-    sif::warning << "Q7STestTask::testFileSystemHandlerDirect: No FS handler running.."
+  std::string mountPrefix = sdcMan->getCurrentMountPrefix();
-                 << std::endl;
+  sif::info << "Current mount prefix: " << mountPrefix << std::endl;
-  }
+  auto prefixedPath = fshelpers::getPrefixedPath(*sdcMan, "conf/test.txt");
-  FileSystemHandler::FsCommandCfg cfg = {};
+  sif::info << "Prefixed path: " << prefixedPath << std::endl;
-  ReturnValue_t result = returnvalue::OK;
+  if (opCode == FsOpCodes::CREATE_EMPTY_FILE_IN_TMP) {
-
+    FilesystemParams params("/tmp/hello.txt");
-  // Lambda for common code
+    auto res = hostFs.createFile(params);
-  auto createNonEmptyTmpDir = [&]() {
+    if (res != OK) {
-    if (not std::filesystem::exists("/tmp/test")) {
+      sif::warning << "Creating empty file in /tmp failed" << std::endl;
-      result = fsHandler->createDirectory("/tmp", "test", false, &cfg);
-      if (result != returnvalue::OK) {
-        return result;
-      }
     }
-    // Creating sample files
+    bool fileExists = std::filesystem::exists("/tmp/hello.txt");
-    sif::info << "Creating sample files in directory" << std::endl;
+    if (not fileExists) {
-    result = fsHandler->createFile("/tmp/test", "test1.txt", nullptr, 0, &cfg);
+      sif::warning << "File was not created!" << std::endl;
-    if (result != returnvalue::OK) {
-      return result;
-    }
-    result = fsHandler->createFile("/tmp/test", "test2.txt", nullptr, 0, &cfg);
-    if (result != returnvalue::OK) {
-      return result;
-    }
-    return result;
-  };
-
-  switch (opCode) {
-    case (FsOpCodes::CREATE_EMPTY_FILE_IN_TMP): {
-      // No mount prefix, cause file is created in tmp
-      cfg.useMountPrefix = false;
-      sif::info << "Creating empty file in /tmp folder" << std::endl;
-      // Do not delete file, user can check existence in shell
-      fsHandler->createFile("/tmp/", "test.txt", nullptr, 0, &cfg);
-      break;
-    }
-    case (FsOpCodes::REMOVE_TMP_FILE): {
-      sif::info << "Deleting /tmp/test.txt sample file" << std::endl;
-      // No mount prefix, cause file is created in tmp
-      cfg.useMountPrefix = false;
-      if (not std::filesystem::exists("/tmp/test.txt")) {
-        // Creating sample file
-        sif::info << "Creating sample file /tmp/test.txt to delete" << std::endl;
-        fsHandler->createFile("/tmp/", "test.txt", nullptr, 0, &cfg);
-      }
-      result = fsHandler->removeFile("/tmp", "test.txt", &cfg);
-      if (result == returnvalue::OK) {
-        sif::info << "File removed successfully" << std::endl;
-      } else {
-        sif::warning << "File removal failed!" << std::endl;
-      }
-      break;
-    }
-    case (FsOpCodes::CREATE_DIR_IN_TMP): {
-      // No mount prefix, cause file is created in tmp
-      cfg.useMountPrefix = false;
-      sif::info << "Creating empty file in /tmp folder" << std::endl;
-      // Do not delete file, user can check existence in shell
-      ReturnValue_t result = fsHandler->createDirectory("/tmp/", "test", false, &cfg);
-      if (result == returnvalue::OK) {
-        sif::info << "Directory created successfully" << std::endl;
-      } else {
-        sif::warning << "Directory creation failed!" << std::endl;
-      }
-      break;
-    }
-    case (FsOpCodes::REMOVE_EMPTY_DIR_IN_TMP): {
-      // No mount prefix, cause file is created in tmp
-      cfg.useMountPrefix = false;
-      if (not std::filesystem::exists("/tmp/test")) {
-        result = fsHandler->createDirectory("/tmp", "test", false, &cfg);
-      } else {
-        // Delete any leftover files to regular dir removal works
-        std::remove("/tmp/test/*");
-      }
-      result = fsHandler->removeDirectory("/tmp/", "test", false, &cfg);
-      if (result == returnvalue::OK) {
-        sif::info << "Directory removed successfully" << std::endl;
-      } else {
-        sif::warning << "Directory removal failed!" << std::endl;
-      }
-      break;
-    }
-    case (FsOpCodes::REMOVE_FILLED_DIR_IN_TMP): {
-      result = createNonEmptyTmpDir();
-      if (result != returnvalue::OK) {
-        return;
-      }
-      result = fsHandler->removeDirectory("/tmp/", "test", true, &cfg);
-      if (result == returnvalue::OK) {
-        sif::info << "Directory removed recursively successfully" << std::endl;
-      } else {
-        sif::warning << "Recursive directory removal failed!" << std::endl;
-      }
-      break;
-    }
-    case (FsOpCodes::ATTEMPT_DIR_REMOVAL_NON_EMPTY): {
-      result = createNonEmptyTmpDir();
-      if (result != returnvalue::OK) {
-        return;
-      }
-      result = fsHandler->removeDirectory("/tmp/", "test", false, &cfg);
-      if (result != returnvalue::OK) {
-        sif::info << "Directory removal attempt failed as expected" << std::endl;
-      } else {
-        sif::warning << "Directory removal worked when it should not have!" << std::endl;
-      }
-      break;
-    }
-    case (FsOpCodes::RENAME_FILE): {
-      // No mount prefix, cause file is created in tmp
-      cfg.useMountPrefix = false;
-      if (std::filesystem::exists("/tmp/test.txt")) {
-        fsHandler->removeDirectory("/tmp/", "test", false, &cfg);
-      }
-      sif::info << "Creating empty file /tmp/test.txt and rename to /tmp/test2.txt" << std::endl;
-      // Do not delete file, user can check existence in shell
-      fsHandler->createFile("/tmp/", "test.txt", nullptr, 0, &cfg);
-      fsHandler->renameFile("/tmp/", "test.txt", "test2.txt", &cfg);
-      break;
-    }
-    case (FsOpCodes::APPEND_TO_FILE): {
-      // No mount prefix, cause file is created in tmp
-      cfg.useMountPrefix = false;
-      if (std::filesystem::exists("/tmp/test.txt")) {
-        fsHandler->removeDirectory("/tmp/", "test", false, &cfg);
-      }
-      if (std::filesystem::exists("/tmp/test.txt")) {
-        fsHandler->removeDirectory("/tmp/", "test", false, &cfg);
-      }
-      sif::info << "Creating empty file /tmp/test.txt and adding content" << std::endl;
-      std::string content = "Hello World\n";
-      // Do not delete file, user can check existence in shell
-      fsHandler->createFile("/tmp/", "test.txt", nullptr, 0, &cfg);
-      fsHandler->appendToFile("/tmp/", "test.txt", reinterpret_cast<const uint8_t*>(content.data()),
-                              content.size(), 0, &cfg);
     }
+    hostFs.removeFile("/tmp/hello.txt");
   }
 }
 

bsp_q7s/core/CoreController.cpp

@@ -1,6 +1,7 @@
 #include "CoreController.h"
 
 #include <fsfw/events/EventManager.h>
+#include <fsfw/filesystem/HasFileSystemIF.h>
 #include <fsfw/ipc/QueueFactory.h>
 
 #include "OBSWConfig.h"
@@ -20,9 +21,10 @@
 #include <algorithm>
 #include <filesystem>
 
-#include "bsp_q7s/memory/SdCardManager.h"
+#include "bsp_q7s/fs/SdCardManager.h"
 #include "bsp_q7s/memory/scratchApi.h"
 #include "bsp_q7s/xadc/Xadc.h"
+#include "eive/definitions.h"
 #include "linux/utility/utility.h"
 
 xsc::Chip CoreController::CURRENT_CHIP = xsc::Chip::NO_CHIP;
@@ -47,7 +49,6 @@ CoreController::CoreController(object_id_t objectId)
     if (not BLOCKING_SD_INIT) {
       sdcMan->setBlocking(false);
     }
-    sdStateMachine();
 
     result = initBootCopy();
     if (result != returnvalue::OK) {
@@ -60,6 +61,8 @@ CoreController::CoreController(object_id_t objectId)
   eventQueue = QueueFactory::instance()->createMessageQueue(5, EventMessage::MAX_MESSAGE_SIZE);
 }
 
+CoreController::~CoreController() {}
+
 ReturnValue_t CoreController::handleCommandMessage(CommandMessage *message) {
   return ExtendedControllerBase::handleCommandMessage(message);
 }
@@ -139,8 +142,14 @@ ReturnValue_t CoreController::initialize() {
 
 ReturnValue_t CoreController::initializeAfterTaskCreation() {
   ReturnValue_t result = returnvalue::OK;
-  sdInfo.pref = sdcMan->getPreferredSdCard();
+  sdInfo.active = sdcMan->getPreferredSdCard();
-  sdcMan->setActiveSdCard(sdInfo.pref);
+  if (sdInfo.active == sd::SdCard::NONE) {
+    sif::error << "CoreController::initializeAfterTaskCreation: "
+                  "Issues getting preferred SD card, setting to 0"
+               << std::endl;
+    sdInfo.active = sd::SdCard::SLOT_0;
+  }
+  sdcMan->setActiveSdCard(sdInfo.active);
   currMntPrefix = sdcMan->getCurrentMountPrefix();
   if (BLOCKING_SD_INIT) {
     ReturnValue_t result = initSdCardBlocking();
@@ -198,6 +207,47 @@ ReturnValue_t CoreController::executeAction(ActionId_t actionId, MessageQueueId_
       }
       return HasActionsIF::EXECUTION_FINISHED;
     }
+    case (OBSW_UPDATE_FROM_SD_0): {
+      return executeSwUpdate(SwUpdateSources::SD_0, data, size);
+    }
+    case (OBSW_UPDATE_FROM_SD_1): {
+      return executeSwUpdate(SwUpdateSources::SD_1, data, size);
+    }
+    case (OBSW_UPDATE_FROM_TMP): {
+      return executeSwUpdate(SwUpdateSources::TMP_DIR, data, size);
+    }
+    case (SWITCH_TO_SD_0): {
+      if (not startSdStateMachine(sd::SdCard::SLOT_0, SdCfgMode::COLD_REDUNDANT, commandedBy,
+                                  actionId)) {
+        return HasActionsIF::IS_BUSY;
+      }
+      // Completion will be reported by SD card state machine
+      return returnvalue::OK;
+    }
+    case (SWITCH_TO_SD_1): {
+      if (not startSdStateMachine(sd::SdCard::SLOT_1, SdCfgMode::COLD_REDUNDANT, commandedBy,
+                                  actionId)) {
+        return HasActionsIF::IS_BUSY;
+      }
+      // Completion will be reported by SD card state machine
+      return returnvalue::OK;
+    }
+    case (SWITCH_TO_BOTH_SD_CARDS): {
+      // An active SD still needs to be specified because the system needs to know which SD
+      // card to use for regular operations like telemetry storage.
+      if (size != 1) {
+        return HasActionsIF::INVALID_PARAMETERS;
+      }
+      if (data[0] != 0 and data[0] != 1) {
+        return HasActionsIF::INVALID_PARAMETERS;
+      }
+      auto active = static_cast<sd::SdCard>(data[0]);
+      if (not startSdStateMachine(active, SdCfgMode::HOT_REDUNDANT, commandedBy, actionId)) {
+        return HasActionsIF::IS_BUSY;
+      }
+      // Completion will be reported by SD card state machine
+      return returnvalue::OK;
+    }
     case (SWITCH_IMG_LOCK): {
       if (size != 3) {
         return HasActionsIF::INVALID_PARAMETERS;
@@ -245,60 +295,59 @@ ReturnValue_t CoreController::initSdCardBlocking() {
   if (result != returnvalue::OK) {
     sif::warning << "CoreController::initialize: Updating SD card state file failed" << std::endl;
   }
-#if Q7S_SD_CARD_CONFIG == Q7S_SD_NONE
+  if (sdInfo.cfgMode == SdCfgMode::PASSIVE) {
-  sif::info << "No SD card initialization will be performed" << std::endl;
+    sif::info << "No SD card initialization will be performed" << std::endl;
-  return returnvalue::OK;
+    return returnvalue::OK;
-#else
+  }
 
   result = sdcMan->getSdCardsStatus(sdInfo.currentState);
   if (result != returnvalue::OK) {
     sif::warning << "Getting SD card activity status failed" << std::endl;
   }
 
-#if Q7S_SD_CARD_CONFIG == Q7S_SD_COLD_REDUNDANT
+  if (sdInfo.cfgMode == SdCfgMode::COLD_REDUNDANT) {
-  updateSdInfoOther();
+    updateSdInfoOther();
-  sif::info << "Cold redundant SD card configuration, preferred SD card: "
+    sif::info << "Cold redundant SD card configuration, preferred SD card: "
-            << static_cast<int>(sdInfo.pref) << std::endl;
+              << static_cast<int>(sdInfo.active) << std::endl;
-  result = sdColdRedundantBlockingInit();
+    result = sdColdRedundantBlockingInit();
-  // Update status file
+    // Update status file
-  sdcMan->updateSdCardStateFile();
+    sdcMan->updateSdCardStateFile();
-  return result;
+    return result;
-#elif Q7S_SD_CARD_CONFIG == Q7S_SD_HOT_REDUNDANT
+  }
-  sif::info << "Hot redundant SD card configuration" << std::endl;
+  if (sdInfo.cfgMode == SdCfgMode::HOT_REDUNDANT) {
-  sdCardSetup(sd::SdCard::SLOT_0, sd::SdState::MOUNTED, "0", false);
+    sif::info << "Hot redundant SD card configuration" << std::endl;
-  sdCardSetup(sd::SdCard::SLOT_1, sd::SdState::MOUNTED, "1", false);
+    sdCardSetup(sd::SdCard::SLOT_0, sd::SdState::MOUNTED, "0", false);
-  // Update status file
+    sdCardSetup(sd::SdCard::SLOT_1, sd::SdState::MOUNTED, "1", false);
-  sdcMan->updateSdCardStateFile();
+    // Update status file
+    sdcMan->updateSdCardStateFile();
+  }
   return returnvalue::OK;
-#endif
-
-#endif /* Q7S_SD_CARD_CONFIG != Q7S_SD_NONE */
 }
 
 ReturnValue_t CoreController::sdStateMachine() {
   ReturnValue_t result = returnvalue::OK;
   SdCardManager::Operations operation;
 
-  if (sdInfo.state == SdStates::IDLE) {
+  if (sdFsmState == SdStates::IDLE) {
     // Nothing to do
     return result;
   }
 
-  if (sdInfo.state == SdStates::START) {
+  if (sdFsmState == SdStates::START) {
     // Init will be performed by separate function
     if (BLOCKING_SD_INIT) {
-      sdInfo.state = SdStates::IDLE;
+      sdFsmState = SdStates::IDLE;
       sdInfo.initFinished = true;
       return result;
     } else {
       // Still update SD state file
-#if Q7S_SD_CARD_CONFIG == Q7S_SD_NONE
+      if (sdInfo.cfgMode == SdCfgMode::PASSIVE) {
-      sdInfo.state = SdStates::UPDATE_INFO;
+        sdFsmState = SdStates::UPDATE_INFO;
-#else
+      } else {
-      sdInfo.cycleCount = 0;
+        sdInfo.cycleCount = 0;
-      sdInfo.commandExecuted = false;
+        sdInfo.commandExecuted = false;
-      sdInfo.state = SdStates::GET_INFO;
+        sdFsmState = SdStates::GET_INFO;
-#endif
+      }
     }
   }
 
@@ -308,7 +357,7 @@ ReturnValue_t CoreController::sdStateMachine() {
                                    std::string opPrintout) {
     SdCardManager::OpStatus status = sdcMan->checkCurrentOp(operation);
     if (status == SdCardManager::OpStatus::SUCCESS) {
-      sdInfo.state = newStateOnSuccess;
+      sdFsmState = newStateOnSuccess;
       sdInfo.commandExecuted = false;
       sdInfo.cycleCount = 0;
       return true;
@@ -320,9 +369,9 @@ ReturnValue_t CoreController::sdStateMachine() {
     return false;
   };
 
-  if (sdInfo.state == SdStates::GET_INFO) {
+  if (sdFsmState == SdStates::GET_INFO) {
     if (not sdInfo.commandExecuted) {
-      // Create update status file
+      // Create updated status file
       result = sdcMan->updateSdCardStateFile();
       if (result != returnvalue::OK) {
         sif::warning << "CoreController::initialize: Updating SD card state file failed"
@@ -334,139 +383,143 @@ ReturnValue_t CoreController::sdStateMachine() {
     }
   }
 
-  if (sdInfo.state == SdStates::SET_STATE_SELF) {
+  if (sdFsmState == SdStates::SET_STATE_SELF) {
     if (not sdInfo.commandExecuted) {
       result = sdcMan->getSdCardsStatus(sdInfo.currentState);
-      sdInfo.pref = sdcMan->getPreferredSdCard();
       updateSdInfoOther();
-      if (sdInfo.pref != sd::SdCard::SLOT_0 and sdInfo.pref != sd::SdCard::SLOT_1) {
+      if (sdInfo.active != sd::SdCard::SLOT_0 and sdInfo.active != sd::SdCard::SLOT_1) {
         sif::warning << "Preferred SD card invalid. Setting to card 0.." << std::endl;
-        sdInfo.pref = sd::SdCard::SLOT_0;
+        sdInfo.active = sd::SdCard::SLOT_0;
       }
       if (result != returnvalue::OK) {
         sif::warning << "Getting SD card activity status failed" << std::endl;
       }
-#if Q7S_SD_CARD_CONFIG == Q7S_SD_COLD_REDUNDANT
+      if (sdInfo.cfgMode == SdCfgMode::COLD_REDUNDANT) {
-      sif::info << "Cold redundant SD card configuration, preferred SD card: "
+        sif::info << "Cold redundant SD card configuration, target SD card: "
-                << static_cast<int>(sdInfo.pref) << std::endl;
+                  << static_cast<int>(sdInfo.active) << std::endl;
-#endif
+      }
-      if (sdInfo.prefState == sd::SdState::MOUNTED) {
+      if (sdInfo.activeState == sd::SdState::MOUNTED) {
 #if OBSW_VERBOSE_LEVEL >= 1
         std::string mountString;
-        if (sdInfo.pref == sd::SdCard::SLOT_0) {
+        if (sdInfo.active == sd::SdCard::SLOT_0) {
-          mountString = SdCardManager::SD_0_MOUNT_POINT;
+          mountString = config::SD_0_MOUNT_POINT;
         } else {
-          mountString = SdCardManager::SD_1_MOUNT_POINT;
+          mountString = config::SD_1_MOUNT_POINT;
         }
-        sif::info << "SD card " << sdInfo.prefChar << " already on and mounted at " << mountString
+        sif::info << "SD card " << sdInfo.activeChar << " already on and mounted at " << mountString
                   << std::endl;
 #endif
-        sdInfo.state = SdStates::DETERMINE_OTHER;
+        sdcMan->setActiveSdCard(sdInfo.active);
-      } else if (sdInfo.prefState == sd::SdState::OFF) {
+        currMntPrefix = sdcMan->getCurrentMountPrefix();
-        sdCardSetup(sdInfo.pref, sd::SdState::ON, sdInfo.prefChar, false);
+        sdFsmState = SdStates::DETERMINE_OTHER;
+      } else if (sdInfo.activeState == sd::SdState::OFF) {
+        sdCardSetup(sdInfo.active, sd::SdState::ON, sdInfo.activeChar, false);
         sdInfo.commandExecuted = true;
-      } else if (sdInfo.prefState == sd::SdState::ON) {
+      } else if (sdInfo.activeState == sd::SdState::ON) {
-        sdInfo.state = SdStates::MOUNT_SELF;
+        sdFsmState = SdStates::MOUNT_SELF;
       }
     } else {
       if (nonBlockingOpChecking(SdStates::MOUNT_SELF, 10, "Setting SDC state")) {
-        sdInfo.prefState = sd::SdState::ON;
+        sdInfo.activeState = sd::SdState::ON;
-        currentStateSetter(sdInfo.pref, sd::SdState::ON);
+        currentStateSetter(sdInfo.active, sd::SdState::ON);
       }
     }
   }
 
-  if (sdInfo.state == SdStates::MOUNT_SELF) {
+  if (sdFsmState == SdStates::MOUNT_SELF) {
     if (not sdInfo.commandExecuted) {
-      result = sdCardSetup(sdInfo.pref, sd::SdState::MOUNTED, sdInfo.prefChar);
+      result = sdCardSetup(sdInfo.active, sd::SdState::MOUNTED, sdInfo.activeChar);
       sdInfo.commandExecuted = true;
     } else {
       if (nonBlockingOpChecking(SdStates::DETERMINE_OTHER, 5, "Mounting SD card")) {
-        sdInfo.prefState = sd::SdState::MOUNTED;
+        sdcMan->setActiveSdCard(sdInfo.active);
-        currentStateSetter(sdInfo.pref, sd::SdState::MOUNTED);
+        currMntPrefix = sdcMan->getCurrentMountPrefix();
+        sdInfo.activeState = sd::SdState::MOUNTED;
+        currentStateSetter(sdInfo.active, sd::SdState::MOUNTED);
       }
     }
   }
 
-  if (sdInfo.state == SdStates::DETERMINE_OTHER) {
+  if (sdFsmState == SdStates::DETERMINE_OTHER) {
     // Determine whether any additional operations have to be done for the other SD card
     // 1. Cold redundant case: Other SD card needs to be unmounted and switched off
     // 2. Hot redundant case: Other SD card needs to be mounted and switched on
-#if Q7S_SD_CARD_CONFIG == Q7S_SD_COLD_REDUNDANT
+    if (sdInfo.cfgMode == SdCfgMode::COLD_REDUNDANT) {
-    if (sdInfo.otherState == sd::SdState::ON) {
+      if (sdInfo.otherState == sd::SdState::ON) {
-      sdInfo.state = SdStates::SET_STATE_OTHER;
+        sdFsmState = SdStates::SET_STATE_OTHER;
-    } else if (sdInfo.otherState == sd::SdState::MOUNTED) {
+      } else if (sdInfo.otherState == sd::SdState::MOUNTED) {
-      sdInfo.state = SdStates::MOUNT_UNMOUNT_OTHER;
+        sdFsmState = SdStates::MOUNT_UNMOUNT_OTHER;
-    } else {
+      } else {
-      // Is already off, update info, but with a small delay
+        // Is already off, update info, but with a small delay
-      sdInfo.state = SdStates::SKIP_CYCLE_BEFORE_INFO_UPDATE;
+        sdFsmState = SdStates::SKIP_CYCLE_BEFORE_INFO_UPDATE;
+      }
+    } else if (sdInfo.cfgMode == SdCfgMode::HOT_REDUNDANT) {
+      if (sdInfo.otherState == sd::SdState::OFF) {
+        sdFsmState = SdStates::SET_STATE_OTHER;
+      } else if (sdInfo.otherState == sd::SdState::ON) {
+        sdFsmState = SdStates::MOUNT_UNMOUNT_OTHER;
+      } else {
+        // Is already on and mounted, update info
+        sdFsmState = SdStates::SKIP_CYCLE_BEFORE_INFO_UPDATE;
+      }
     }
-#elif Q7S_SD_CARD_CONFIG == Q7S_SD_HOT_REDUNDANT
-    if (sdInfo.otherState == sd::SdState::OFF) {
-      sdInfo.state = SdStates::SET_STATE_OTHER;
-    } else if (sdInfo.otherState == sd::SdState::ON) {
-      sdInfo.state = SdStates::MOUNT_UNMOUNT_OTHER;
-    } else {
-      // Is already on and mounted, update info
-      sdInfo.state = SdStates::SKIP_CYCLE_BEFORE_INFO_UPDATE;
-    }
-#endif
   }
 
-  if (sdInfo.state == SdStates::SET_STATE_OTHER) {
+  if (sdFsmState == SdStates::SET_STATE_OTHER) {
     // Set state of other SD card to ON or OFF, depending on redundancy mode
-#if Q7S_SD_CARD_CONFIG == Q7S_SD_COLD_REDUNDANT
+    if (sdInfo.cfgMode == SdCfgMode::COLD_REDUNDANT) {
-    if (not sdInfo.commandExecuted) {
+      if (not sdInfo.commandExecuted) {
-      result = sdCardSetup(sdInfo.other, sd::SdState::OFF, sdInfo.otherChar, false);
+        result = sdCardSetup(sdInfo.other, sd::SdState::OFF, sdInfo.otherChar, false);
-      sdInfo.commandExecuted = true;
+        sdInfo.commandExecuted = true;
-    } else {
+      } else {
-      if (nonBlockingOpChecking(SdStates::SKIP_CYCLE_BEFORE_INFO_UPDATE, 10,
+        if (nonBlockingOpChecking(SdStates::SKIP_CYCLE_BEFORE_INFO_UPDATE, 10,
-                                "Switching off other SD card")) {
+                                  "Switching off other SD card")) {
-        sdInfo.otherState = sd::SdState::OFF;
+          sdInfo.otherState = sd::SdState::OFF;
-        currentStateSetter(sdInfo.other, sd::SdState::OFF);
+          currentStateSetter(sdInfo.other, sd::SdState::OFF);
+        }
+      }
+    } else if (sdInfo.cfgMode == SdCfgMode::HOT_REDUNDANT) {
+      if (not sdInfo.commandExecuted) {
+        result = sdCardSetup(sdInfo.other, sd::SdState::ON, sdInfo.otherChar, false);
+        sdInfo.commandExecuted = true;
+      } else {
+        if (nonBlockingOpChecking(SdStates::MOUNT_UNMOUNT_OTHER, 10,
+                                  "Switching on other SD card")) {
+          sdInfo.otherState = sd::SdState::ON;
+          currentStateSetter(sdInfo.other, sd::SdState::ON);
+        }
       }
     }
-#elif Q7S_SD_CARD_CONFIG == Q7S_SD_HOT_REDUNDANT
-    if (not sdInfo.commandExecuted) {
-      result = sdCardSetup(sdInfo.other, sd::SdState::ON, sdInfo.otherChar, false);
-      sdInfo.commandExecuted = true;
-    } else {
-      if (nonBlockingOpChecking(SdStates::MOUNT_UNMOUNT_OTHER, 10, "Switching on other SD card")) {
-        sdInfo.otherState = sd::SdState::ON;
-        currentStateSetter(sdInfo.other, sd::SdState::ON);
-      }
-    }
-#endif
   }
 
-  if (sdInfo.state == SdStates::MOUNT_UNMOUNT_OTHER) {
+  if (sdFsmState == SdStates::MOUNT_UNMOUNT_OTHER) {
     // Mount or unmount other SD card, depending on redundancy mode
-#if Q7S_SD_CARD_CONFIG == Q7S_SD_COLD_REDUNDANT
+    if (sdInfo.cfgMode == SdCfgMode::COLD_REDUNDANT) {
-    if (not sdInfo.commandExecuted) {
+      if (not sdInfo.commandExecuted) {
-      result = sdCardSetup(sdInfo.other, sd::SdState::ON, sdInfo.otherChar);
+        result = sdCardSetup(sdInfo.other, sd::SdState::ON, sdInfo.otherChar);
-      sdInfo.commandExecuted = true;
+        sdInfo.commandExecuted = true;
-    } else {
+      } else {
-      if (nonBlockingOpChecking(SdStates::SET_STATE_OTHER, 10, "Unmounting other SD card")) {
+        if (nonBlockingOpChecking(SdStates::SET_STATE_OTHER, 10, "Unmounting other SD card")) {
-        sdInfo.otherState = sd::SdState::ON;
+          sdInfo.otherState = sd::SdState::ON;
-        currentStateSetter(sdInfo.other, sd::SdState::ON);
+          currentStateSetter(sdInfo.other, sd::SdState::ON);
+        }
+      }
+    } else if (sdInfo.cfgMode == SdCfgMode::HOT_REDUNDANT) {
+      if (not sdInfo.commandExecuted) {
+        result = sdCardSetup(sdInfo.other, sd::SdState::MOUNTED, sdInfo.otherChar);
+        sdInfo.commandExecuted = true;
+      } else {
+        if (nonBlockingOpChecking(SdStates::UPDATE_INFO, 4, "Mounting other SD card")) {
+          sdInfo.otherState = sd::SdState::MOUNTED;
+          currentStateSetter(sdInfo.other, sd::SdState::MOUNTED);
+        }
       }
     }
-#elif Q7S_SD_CARD_CONFIG == Q7S_SD_HOT_REDUNDANT
-    if (not sdInfo.commandExecuted) {
-      result = sdCardSetup(sdInfo.other, sd::SdState::MOUNTED, sdInfo.otherChar);
-      sdInfo.commandExecuted = true;
-    } else {
-      if (nonBlockingOpChecking(SdStates::UPDATE_INFO, 4, "Mounting other SD card")) {
-        sdInfo.otherState = sd::SdState::MOUNTED;
-        currentStateSetter(sdInfo.other, sd::SdState::MOUNTED);
-      }
-    }
-#endif
   }
 
-  if (sdInfo.state == SdStates::SKIP_CYCLE_BEFORE_INFO_UPDATE) {
+  if (sdFsmState == SdStates::SKIP_CYCLE_BEFORE_INFO_UPDATE) {
-    sdInfo.state = SdStates::UPDATE_INFO;
+    sdFsmState = SdStates::UPDATE_INFO;
-  } else if (sdInfo.state == SdStates::UPDATE_INFO) {
+  } else if (sdFsmState == SdStates::UPDATE_INFO) {
     // It is assumed that all tasks are running by the point this section is reached.
     // Therefore, perform this operation in blocking mode because it does not take long
     // and the ready state of the SD card is available sooner
@@ -477,10 +530,15 @@ ReturnValue_t CoreController::sdStateMachine() {
       sif::warning << "CoreController::initialize: Updating SD card state file failed" << std::endl;
     }
     sdInfo.commandExecuted = false;
-    sdInfo.state = SdStates::IDLE;
+    sdFsmState = SdStates::IDLE;
     sdInfo.cycleCount = 0;
     sdcMan->setBlocking(false);
     sdcMan->getSdCardsStatus(sdInfo.currentState);
+    if (sdCommandingInfo.cmdPending) {
+      sdCommandingInfo.cmdPending = false;
+      actionHelper.finish(true, sdCommandingInfo.commander, sdCommandingInfo.actionId,
+                          returnvalue::OK);
+    }
     if (not sdInfo.initFinished) {
       updateSdInfoOther();
       sdInfo.initFinished = true;
@@ -488,81 +546,10 @@ ReturnValue_t CoreController::sdStateMachine() {
     }
   }
 
-  if (sdInfo.state == SdStates::SET_STATE_FROM_COMMAND) {
-    if (not sdInfo.commandExecuted) {
-      executeNextExternalSdCommand();
-    } else {
-      checkExternalSdCommandStatus();
-    }
-  }
-
   sdInfo.cycleCount++;
   return returnvalue::OK;
 }
 
-void CoreController::executeNextExternalSdCommand() {
-  std::string sdChar;
-  sd::SdState currentStateOfCard = sd::SdState::OFF;
-  if (sdInfo.commandedCard == sd::SdCard::SLOT_0) {
-    sdChar = "0";
-    currentStateOfCard = sdInfo.currentState.first;
-  } else {
-    sdChar = "1";
-    currentStateOfCard = sdInfo.currentState.second;
-  }
-  if (currentStateOfCard == sd::SdState::OFF) {
-    if (sdInfo.commandedState == sd::SdState::ON) {
-      sdInfo.currentlyCommandedState = sdInfo.commandedState;
-    } else if (sdInfo.commandedState == sd::SdState::MOUNTED) {
-      sdInfo.currentlyCommandedState = sd::SdState::ON;
-    } else {
-      // SD card is already on target state
-      sdInfo.commandFinished = true;
-      sdInfo.state = SdStates::IDLE;
-    }
-  } else if (currentStateOfCard == sd::SdState::ON) {
-    if (sdInfo.commandedState == sd::SdState::OFF or
-        sdInfo.commandedState == sd::SdState::MOUNTED) {
-      sdInfo.currentlyCommandedState = sdInfo.commandedState;
-    } else {
-      // Already on target state
-      sdInfo.commandFinished = true;
-      sdInfo.state = SdStates::IDLE;
-    }
-  } else if (currentStateOfCard == sd::SdState::MOUNTED) {
-    if (sdInfo.commandedState == sd::SdState::ON) {
-      sdInfo.currentlyCommandedState = sdInfo.commandedState;
-    } else if (sdInfo.commandedState == sd::SdState::OFF) {
-      // This causes an unmount in sdCardSetup
-      sdInfo.currentlyCommandedState = sd::SdState::ON;
-    } else {
-      sdInfo.commandFinished = true;
-    }
-  }
-  sdCardSetup(sdInfo.commandedCard, sdInfo.commandedState, sdChar);
-  sdInfo.commandExecuted = true;
-}
-
-void CoreController::checkExternalSdCommandStatus() {
-  SdCardManager::Operations operation;
-  SdCardManager::OpStatus status = sdcMan->checkCurrentOp(operation);
-  if (status == SdCardManager::OpStatus::SUCCESS) {
-    if (sdInfo.currentlyCommandedState == sdInfo.commandedState) {
-      sdInfo.state = SdStates::SKIP_CYCLE_BEFORE_INFO_UPDATE;
-      sdInfo.commandFinished = true;
-    } else {
-      // stay on same state machine state because the target state was not reached yet.
-      sdInfo.cycleCount = 0;
-    }
-    currentStateSetter(sdInfo.commandedCard, sdInfo.currentlyCommandedState);
-    sdInfo.commandExecuted = false;
-  } else if (sdInfo.cycleCount > 4) {
-    sif::warning << "CoreController::sdStateMachine: Commanding SD state "
-                    "takes too long"
-                 << std::endl;
-  }
-}
-
 void CoreController::currentStateSetter(sd::SdCard sdCard, sd::SdState newState) {
   if (sdCard == sd::SdCard::SLOT_0) {
     sdInfo.currentState.first = newState;
@@ -576,9 +563,9 @@ ReturnValue_t CoreController::sdCardSetup(sd::SdCard sdCard, sd::SdState targetS
   std::string mountString;
   sdcMan->setPrintCommandOutput(printOutput);
   if (sdCard == sd::SdCard::SLOT_0) {
-    mountString = SdCardManager::SD_0_MOUNT_POINT;
+    mountString = config::SD_0_MOUNT_POINT;
   } else {
-    mountString = SdCardManager::SD_1_MOUNT_POINT;
+    mountString = config::SD_1_MOUNT_POINT;
   }
 
   sd::SdState state = sd::SdState::OFF;
@@ -634,12 +621,12 @@ ReturnValue_t CoreController::sdCardSetup(sd::SdCard sdCard, sd::SdState targetS
 ReturnValue_t CoreController::sdColdRedundantBlockingInit() {
   ReturnValue_t result = returnvalue::OK;
 
-  result = sdCardSetup(sdInfo.pref, sd::SdState::MOUNTED, sdInfo.prefChar);
+  result = sdCardSetup(sdInfo.active, sd::SdState::MOUNTED, sdInfo.activeChar);
   if (result != SdCardManager::ALREADY_MOUNTED and result != returnvalue::OK) {
     sif::warning << "Setting up preferred card " << sdInfo.otherChar
                  << " in cold redundant mode failed" << std::endl;
     // Try other SD card and mark set up operation as failed
-    sdCardSetup(sdInfo.pref, sd::SdState::MOUNTED, sdInfo.prefChar);
+    sdCardSetup(sdInfo.active, sd::SdState::MOUNTED, sdInfo.activeChar);
     result = returnvalue::FAILED;
   }
 
@@ -956,21 +943,19 @@ ReturnValue_t CoreController::gracefulShutdownTasks(xsc::Chip chip, xsc::Copy co
   return result;
 }
 
-CoreController::~CoreController() {}
-
 void CoreController::updateSdInfoOther() {
-  if (sdInfo.pref == sd::SdCard::SLOT_0) {
+  if (sdInfo.active == sd::SdCard::SLOT_0) {
-    sdInfo.prefChar = "0";
+    sdInfo.activeChar = "0";
     sdInfo.otherChar = "1";
     sdInfo.otherState = sdInfo.currentState.second;
-    sdInfo.prefState = sdInfo.currentState.first;
+    sdInfo.activeState = sdInfo.currentState.first;
     sdInfo.other = sd::SdCard::SLOT_1;
 
-  } else if (sdInfo.pref == sd::SdCard::SLOT_1) {
+  } else if (sdInfo.active == sd::SdCard::SLOT_1) {
-    sdInfo.prefChar = "1";
+    sdInfo.activeChar = "1";
     sdInfo.otherChar = "0";
     sdInfo.otherState = sdInfo.currentState.first;
-    sdInfo.prefState = sdInfo.currentState.second;
+    sdInfo.activeState = sdInfo.currentState.second;
     sdInfo.other = sd::SdCard::SLOT_0;
   } else {
     sif::warning << "CoreController::updateSdInfoOther: Invalid SD card passed" << std::endl;
@@ -1243,7 +1228,7 @@ void CoreController::performWatchdogControlOperation() {
 void CoreController::performMountedSdCardOperations() {
   auto mountedSdCardOp = [&](bool &mntSwitch, sd::SdCard sdCard, std::string mntPoint) {
     if (mntSwitch) {
-      bool sdCardMounted = sdcMan->isSdCardMounted(sdCard);
+      bool sdCardMounted = sdcMan->isSdCardUsable(sdCard);
       if (sdCardMounted and not performOneShotSdCardOpsSwitch) {
         std::ostringstream path;
         path << mntPoint << "/" << CONF_FOLDER;
@@ -1258,12 +1243,12 @@ void CoreController::performMountedSdCardOperations() {
       mntSwitch = false;
     }
   };
-  if (sdInfo.pref == sd::SdCard::SLOT_1) {
+  if (sdInfo.active == sd::SdCard::SLOT_1) {
-    mountedSdCardOp(sdInfo.mountSwitch.second, sd::SdCard::SLOT_1, SdCardManager::SD_1_MOUNT_POINT);
+    mountedSdCardOp(sdInfo.mountSwitch.second, sd::SdCard::SLOT_1, config::SD_1_MOUNT_POINT);
-    mountedSdCardOp(sdInfo.mountSwitch.first, sd::SdCard::SLOT_0, SdCardManager::SD_0_MOUNT_POINT);
+    mountedSdCardOp(sdInfo.mountSwitch.first, sd::SdCard::SLOT_0, config::SD_0_MOUNT_POINT);
   } else {
-    mountedSdCardOp(sdInfo.mountSwitch.first, sd::SdCard::SLOT_0, SdCardManager::SD_0_MOUNT_POINT);
+    mountedSdCardOp(sdInfo.mountSwitch.first, sd::SdCard::SLOT_0, config::SD_0_MOUNT_POINT);
-    mountedSdCardOp(sdInfo.mountSwitch.second, sd::SdCard::SLOT_1, SdCardManager::SD_1_MOUNT_POINT);
+    mountedSdCardOp(sdInfo.mountSwitch.second, sd::SdCard::SLOT_1, config::SD_1_MOUNT_POINT);
   }
   timeFileHandler();
 }
@@ -1272,13 +1257,15 @@ ReturnValue_t CoreController::performSdCardCheck() {
   bool mountedReadOnly = false;
   SdCardManager::SdStatePair active;
   sdcMan->getSdCardsStatus(active);
+  if (sdFsmState != SdStates::IDLE) {
+    return returnvalue::OK;
+  }
   auto sdCardCheck = [&](sd::SdCard sdCard) {
     ReturnValue_t result = sdcMan->isSdCardMountedReadOnly(sdCard, mountedReadOnly);
     if (result != returnvalue::OK) {
       sif::error << "CoreController::performSdCardCheck: Could not check "
                     "read-only mount state"
                  << std::endl;
-      mountedReadOnly = true;
     }
     if (mountedReadOnly) {
       int linuxErrno = 0;
@@ -1845,6 +1832,175 @@ void CoreController::readHkData() {
   }
 }
 
+const char *CoreController::getXscMountDir(xsc::Chip chip, xsc::Copy copy) {
+  if (chip == xsc::Chip::CHIP_0) {
+    if (copy == xsc::Copy::COPY_0) {
+      return CHIP_0_COPY_0_MOUNT_DIR;
+    } else if (copy == xsc::Copy::COPY_1) {
+      return CHIP_0_COPY_1_MOUNT_DIR;
+    }
+  } else if (chip == xsc::Chip::CHIP_1) {
+    if (copy == xsc::Copy::COPY_0) {
+      return CHIP_1_COPY_0_MOUNT_DIR;
+    } else if (copy == xsc::Copy::COPY_1) {
+      return CHIP_1_COPY_1_MOUNT_DIR;
+    }
+  }
+  sif::error << "Invalid chip or copy passed to CoreController::getXscMountDir" << std::endl;
+  return CHIP_0_COPY_0_MOUNT_DIR;
+}
+
+ReturnValue_t CoreController::executeSwUpdate(SwUpdateSources sourceDir, const uint8_t *data,
+                                              size_t size) {
+  using namespace std;
+  using namespace std::filesystem;
+  // At the very least, chip and copy ID need to be included in the command
+  if (size < 2) {
+    return HasActionsIF::INVALID_PARAMETERS;
+  }
+  if (data[0] > 1 or data[1] > 1) {
+    return HasActionsIF::INVALID_PARAMETERS;
+  }
+  auto chip = static_cast<xsc::Chip>(data[0]);
+  auto copy = static_cast<xsc::Copy>(data[1]);
+  const char *sourceStr = "unknown";
+  if (sourceDir == SwUpdateSources::SD_0) {
+    sourceStr = "SD 0";
+  } else if (sourceDir == SwUpdateSources::SD_1) {
+    sourceStr = "SD 1";
+  } else {
+    sourceStr = "tmp directory";
+  }
+  bool sameChipAndCopy = false;
+  if(chip == CURRENT_CHIP and copy == CURRENT_COPY) {
+    // This is problematic if the OBSW is running as a systemd service.
+    // Do not allow for now.
+    return HasActionsIF::INVALID_PARAMETERS;
+    //sameChipAndCopy = true;
+  }
+  sif::info << "Executing SW update for Chip " << static_cast<int>(data[0]) << " Copy "
+            << static_cast<int>(data[1]) << " from " << sourceStr << std::endl;
+  path prefixPath;
+  if (sourceDir == SwUpdateSources::SD_0) {
+    prefixPath = path(config::SD_0_MOUNT_POINT);
+  } else if (sourceDir == SwUpdateSources::SD_1) {
+    prefixPath = path(config::SD_1_MOUNT_POINT);
+  } else if (sourceDir == SwUpdateSources::TMP_DIR) {
+    prefixPath = path("/tmp");
+  }
+  path archivePath = prefixPath / path(config::OBSW_UPDATE_ARCHIVE_FILE_NAME);
+  if (not exists(archivePath)) {
+    return HasFileSystemIF::FILE_DOES_NOT_EXIST;
+  }
+  ostringstream cmd("tar -xJf", ios::app);
+  cmd << " " << archivePath << " -C " << prefixPath;
+  int result = system(cmd.str().c_str());
+  if (result != 0) {
+    utility::handleSystemError(result, "CoreController::executeAction: SW Update Decompression");
+  }
+  path strippedImagePath = prefixPath / path(config::STRIPPED_OBSW_BINARY_FILE_NAME);
+  if (!exists(strippedImagePath)) {
+    // TODO: Custom returnvalue?
+    return returnvalue::FAILED;
+  }
+  path obswVersionFilePath = prefixPath / path(config::OBSW_VERSION_FILE_NAME);
+  if (!exists(obswVersionFilePath)) {
+    // TODO: Custom returnvalue?
+    return returnvalue::FAILED;
+  }
+  cmd.str("");
+  cmd.clear();
+  path obswDestPath;
+  path obswVersionDestPath;
+  if(not sameChipAndCopy) {
+    cmd << "xsc_mount_copy " << std::to_string(data[0]) << " " << std::to_string(data[1]);
+    result = system(cmd.str().c_str());
+    if (result != 0) {
+      std::string contextString = "CoreController::executeAction: SW Update Mounting " +
+                                  std::to_string(data[0]) + " " + std::to_string(data[1]);
+      utility::handleSystemError(result, contextString);
+    }
+    cmd.str("");
+    cmd.clear();
+    path xscMountDest(getXscMountDir(chip, copy));
+    obswDestPath = xscMountDest / path(relative(config::OBSW_PATH, "/"));
+    obswVersionDestPath = xscMountDest / path(relative(config::OBSW_VERSION_FILE_PATH, "/"));
+  } else {
+    obswDestPath = path(config::OBSW_PATH);
+    obswVersionDestPath = path(config::OBSW_VERSION_FILE_PATH);
+    cmd << "writeprotect " << std::to_string(CURRENT_CHIP) << " " << std::to_string(CURRENT_COPY)
+        << " 0";
+    result = system(cmd.str().c_str());
+    if (result != 0) {
+      std::string contextString = "CoreController::executeAction: Unlocking current chip";
+      utility::handleSystemError(result, contextString);
+    }
+    cmd.str("");
+    cmd.clear();
+  }
+
+  cmd << "cp " << strippedImagePath << " " << obswDestPath;
+  result = system(cmd.str().c_str());
+  if (result != 0) {
+    utility::handleSystemError(result, "CoreController::executeAction: Copying SW update");
+  }
+  cmd.str("");
+  cmd.clear();
+
+  cmd << "cp " << obswVersionFilePath << " " << obswVersionDestPath;
+  result = system(cmd.str().c_str());
+  if (result != 0) {
+    utility::handleSystemError(result, "CoreController::executeAction: Copying SW version file");
+  }
+  cmd.str("");
+  cmd.clear();
+
+  // Set correct permission for both files
+  cmd << "chmod 0755 " << obswDestPath;
+  result = system(cmd.str().c_str());
+  if (result != 0) {
+    utility::handleSystemError(result,
+                               "CoreController::executeAction: Setting SW permissions 0755");
+  }
+  cmd.str("");
+  cmd.clear();
+
+  cmd << "chmod 0644 " << obswVersionDestPath;
+  result = system(cmd.str().c_str());
+  if (result != 0) {
+    utility::handleSystemError(
+        result, "CoreController::executeAction: Setting version file permission 0644");
+  }
+  cmd.str("");
+  cmd.clear();
+
+  // TODO: This takes a long time and will block the core controller.. Maybe use command executor?
+  //       For now dont care..
+  cmd << "writeprotect " << std::to_string(data[0]) << " " << std::to_string(data[1]) << " 1";
+  result = system(cmd.str().c_str());
+  if (result != 0) {
+    std::string contextString = "CoreController::executeAction: Writeprotecting " +
+                                std::to_string(data[0]) + " " + std::to_string(data[1]);
+    utility::handleSystemError(result, contextString);
+  }
+  sif::info << "SW update complete" << std::endl;
+  return HasActionsIF::EXECUTION_FINISHED;
+}
+
+bool CoreController::startSdStateMachine(sd::SdCard targetActiveSd, SdCfgMode mode,
+                                         MessageQueueId_t commander, DeviceCommandId_t actionId) {
+  if (sdFsmState != SdStates::IDLE or sdCommandingInfo.cmdPending) {
+    return false;
+  }
+  sdFsmState = SdStates::START;
+  sdInfo.active = targetActiveSd;
+  sdInfo.cfgMode = mode;
+  sdCommandingInfo.actionId = actionId;
+  sdCommandingInfo.commander = commander;
+  sdCommandingInfo.cmdPending = true;
+  return true;
+}
+
 bool CoreController::isNumber(const std::string &s) {
   return !s.empty() && std::find_if(s.begin(), s.end(),
                                     [](unsigned char c) { return !std::isdigit(c); }) == s.end();

bsp_q7s/core/CoreController.h

@@ -7,7 +7,7 @@
 #include <cstddef>
 
 #include "CoreDefinitions.h"
-#include "bsp_q7s/memory/SdCardManager.h"
+#include "bsp_q7s/fs/SdCardManager.h"
 #include "events/subsystemIdRanges.h"
 #include "fsfw/controller/ExtendedControllerBase.h"
 #include "mission/devices/devicedefinitions/GPSDefinitions.h"
@@ -51,22 +51,38 @@ class CoreController : public ExtendedControllerBase {
   static constexpr char CHIP_PROT_SCRIPT[] = "get-chip-prot-status.sh";
   static constexpr char CHIP_STATE_FILE[] = "/tmp/chip_prot_status.txt";
   static constexpr char CURR_COPY_FILE[] = "/tmp/curr_copy.txt";
+
   static constexpr char CONF_FOLDER[] = "conf";
+
   static constexpr char VERSION_FILE_NAME[] = "version.txt";
   static constexpr char REBOOT_FILE_NAME[] = "reboot.txt";
   static constexpr char TIME_FILE_NAME[] = "time.txt";
+
   const std::string VERSION_FILE =
       "/" + std::string(CONF_FOLDER) + "/" + std::string(VERSION_FILE_NAME);
   const std::string REBOOT_FILE =
       "/" + std::string(CONF_FOLDER) + "/" + std::string(REBOOT_FILE_NAME);
   const std::string TIME_FILE = "/" + std::string(CONF_FOLDER) + "/" + std::string(TIME_FILE_NAME);
 
+  static constexpr char CHIP_0_COPY_0_MOUNT_DIR[] = "/tmp/mntupdate-xdi-qspi0-nom-rootfs";
+  static constexpr char CHIP_0_COPY_1_MOUNT_DIR[] = "/tmp/mntupdate-xdi-qspi0-gold-rootfs";
+  static constexpr char CHIP_1_COPY_0_MOUNT_DIR[] = "/tmp/mntupdate-xdi-qspi1-nom-rootfs";
+  static constexpr char CHIP_1_COPY_1_MOUNT_DIR[] = "/tmp/mntupdate-xdi-qspi1-gold-rootfs";
+
   static constexpr ActionId_t LIST_DIRECTORY_INTO_FILE = 0;
   static constexpr ActionId_t SWITCH_REBOOT_FILE_HANDLING = 5;
   static constexpr ActionId_t RESET_REBOOT_COUNTERS = 6;
   static constexpr ActionId_t SWITCH_IMG_LOCK = 7;
   static constexpr ActionId_t SET_MAX_REBOOT_CNT = 8;
 
+  static constexpr ActionId_t OBSW_UPDATE_FROM_SD_0 = 10;
+  static constexpr ActionId_t OBSW_UPDATE_FROM_SD_1 = 11;
+  static constexpr ActionId_t OBSW_UPDATE_FROM_TMP = 12;
+
+  static constexpr ActionId_t SWITCH_TO_SD_0 = 16;
+  static constexpr ActionId_t SWITCH_TO_SD_1 = 17;
+  static constexpr ActionId_t SWITCH_TO_BOTH_SD_CARDS = 18;
+
   //! Reboot using the xsc_boot_copy command
   static constexpr ActionId_t XSC_REBOOT_OBC = 32;
   static constexpr ActionId_t MOUNT_OTHER_COPY = 33;
@@ -107,6 +123,7 @@ class CoreController : public ExtendedControllerBase {
   static ReturnValue_t generateChipStateFile();
   static ReturnValue_t incrementAllocationFailureCount();
   static void getCurrentBootCopy(xsc::Chip& chip, xsc::Copy& copy);
+  static const char* getXscMountDir(xsc::Chip chip, xsc::Copy copy);
 
   ReturnValue_t updateProtInfo(bool regenerateChipStateFile = true);
 
@@ -151,36 +168,41 @@ class CoreController : public ExtendedControllerBase {
     SKIP_CYCLE_BEFORE_INFO_UPDATE,
     UPDATE_INFO,
     // SD initialization done
-    IDLE,
+    IDLE
-    // Used if SD switches or mount commands are issued via telecommand
-    SET_STATE_FROM_COMMAND,
   };
+
+  enum class SwUpdateSources { SD_0, SD_1, TMP_DIR };
+
   static constexpr bool BLOCKING_SD_INIT = false;
 
   SdCardManager* sdcMan = nullptr;
   MessageQueueIF* eventQueue = nullptr;
 
-  struct SdInfo {
+  SdStates sdFsmState = SdStates::START;
-    sd::SdCard pref = sd::SdCard::NONE;
+  enum SdCfgMode { PASSIVE, COLD_REDUNDANT, HOT_REDUNDANT };
+
+  struct SdFsmParams {
+    SdCfgMode cfgMode = SdCfgMode::COLD_REDUNDANT;
+    sd::SdCard active = sd::SdCard::NONE;
     sd::SdCard other = sd::SdCard::NONE;
-    sd::SdState prefState = sd::SdState::OFF;
+    sd::SdState activeState = sd::SdState::OFF;
     sd::SdState otherState = sd::SdState::OFF;
-    std::string prefChar = "0";
+    std::string activeChar = "0";
     std::string otherChar = "1";
     std::pair<bool, bool> mountSwitch = {true, true};
-    SdStates state = SdStates::START;
     // Used to track whether a command was executed
     bool commandExecuted = true;
     bool initFinished = false;
     SdCardManager::SdStatePair currentState;
     uint16_t cycleCount = 0;
-    // These two flags are related to external commanding
-    bool commandIssued = false;
-    bool commandFinished = false;
-    sd::SdState currentlyCommandedState = sd::SdState::OFF;
-    sd::SdCard commandedCard = sd::SdCard::NONE;
-    sd::SdState commandedState = sd::SdState::OFF;
   } sdInfo;
+
+  struct SdCommanding {
+    bool cmdPending = false;
+    MessageQueueId_t commander = MessageQueueIF::NO_QUEUE;
+    DeviceCommandId_t actionId;
+  } sdCommandingInfo;
+
   RebootFile rebootFile = {};
   std::string currMntPrefix;
   bool performOneShotSdCardOpsSwitch = true;
@@ -211,12 +233,15 @@ class CoreController : public ExtendedControllerBase {
   ReturnValue_t initBootCopy();
   ReturnValue_t initWatchdogFifo();
   ReturnValue_t initSdCardBlocking();
+  bool startSdStateMachine(sd::SdCard targetActiveSd, SdCfgMode mode, MessageQueueId_t commander,
+                           DeviceCommandId_t actionId);
   void initPrint();
 
   ReturnValue_t sdStateMachine();
   void updateSdInfoOther();
   ReturnValue_t sdCardSetup(sd::SdCard sdCard, sd::SdState targetState, std::string sdChar,
                             bool printOutput = true);
+  ReturnValue_t executeSwUpdate(SwUpdateSources sourceDir, const uint8_t* data, size_t size);
   ReturnValue_t sdColdRedundantBlockingInit();
 
   void currentStateSetter(sd::SdCard sdCard, sd::SdState newState);

bsp_q7s/core/InitMission.cpp

@@ -84,6 +84,10 @@ void initmission::initTasks() {
   if (result != returnvalue::OK) {
     initmission::printAddObjectError("PUS_PACKET_DISTRIB", objects::PUS_PACKET_DISTRIBUTOR);
   }
+  result = tmTcDistributor->addComponent(objects::CFDP_DISTRIBUTOR);
+  if (result != returnvalue::OK) {
+    initmission::printAddObjectError("CFDP_DISTRIBUTOR", objects::CFDP_DISTRIBUTOR);
+  }
   result = tmTcDistributor->addComponent(objects::TM_FUNNEL);
   if (result != returnvalue::OK) {
     initmission::printAddObjectError("TM_FUNNEL", objects::TM_FUNNEL);
@@ -124,6 +128,15 @@ void initmission::initTasks() {
   }
 #endif /* OBSW_USE_CCSDS_IP_CORE == 1 */
 
+#if OBSW_ADD_CFDP_COMPONENTS == 1
+  PeriodicTaskIF* cfdpTask = factory->createPeriodicTask(
+      "CFDP Handler", 45, PeriodicTaskIF::MINIMUM_STACK_SIZE, 0.4, missedDeadlineFunc);
+  result = cfdpTask->addComponent(objects::CFDP_HANDLER);
+  if (result != returnvalue::OK) {
+    initmission::printAddObjectError("CFDP Handler", objects::CFDP_HANDLER);
+  }
+#endif
+
   PeriodicTaskIF* acsTask = factory->createPeriodicTask(
       "ACS_TASK", 50, PeriodicTaskIF::MINIMUM_STACK_SIZE * 2, 0.4, missedDeadlineFunc);
 #if OBSW_ADD_ACS_HANDLERS == 1
@@ -198,15 +211,6 @@ void initmission::initTasks() {
   }
 #endif /* OBSW_ADD_RTD_DEVICES */
 
-  // FS task, task interval does not matter because it runs in permanent loop, priority low
-  // because it is a non-essential background task
-  PeriodicTaskIF* fsTask = factory->createPeriodicTask(
-      "FILE_SYSTEM_TASK", 25, PeriodicTaskIF::MINIMUM_STACK_SIZE, 0.4, missedDeadlineFunc);
-  result = fsTask->addComponent(objects::FILE_SYSTEM_HANDLER);
-  if (result != returnvalue::OK) {
-    initmission::printAddObjectError("FILE_SYSTEM_TASK", objects::FILE_SYSTEM_HANDLER);
-  }
-
 #if OBSW_ADD_STAR_TRACKER == 1
   PeriodicTaskIF* strHelperTask = factory->createPeriodicTask(
       "STR_HELPER", 20, PeriodicTaskIF::MINIMUM_STACK_SIZE, 0.2, missedDeadlineFunc);
@@ -288,7 +292,10 @@ void initmission::initTasks() {
   ptmeTestTask->startTask();
 #endif
 
-  fsTask->startTask();
+#if OBSW_ADD_CFDP_COMPONENTS == 1
+  cfdpTask->startTask();
+#endif
+
 #if OBSW_ADD_STAR_TRACKER == 1
   strHelperTask->startTask();
 #endif /* OBSW_ADD_STAR_TRACKER == 1 */

bsp_q7s/core/ObjectFactory.cpp

@@ -6,13 +6,13 @@
 #include "bsp_q7s/callbacks/pcduSwitchCb.h"
 #include "bsp_q7s/callbacks/q7sGpioCallbacks.h"
 #include "bsp_q7s/callbacks/rwSpiCallback.h"
-#include "bsp_q7s/memory/FileSystemHandler.h"
 #include "busConf.h"
 #include "ccsdsConfig.h"
 #include "devConf.h"
 #include "devices/addresses.h"
 #include "devices/gpioIds.h"
 #include "devices/powerSwitcherList.h"
+#include "eive/definitions.h"
 #include "fsfw/ipc/QueueFactory.h"
 #include "linux/ObjectFactory.h"
 #include "linux/boardtest/I2cTestClass.h"
@@ -41,7 +41,6 @@
 #include "mission/system/fdir/RtdFdir.h"
 #include "mission/system/fdir/SusFdir.h"
 #include "mission/system/fdir/SyrlinksFdir.h"
-#include "tmtc/apid.h"
 #include "tmtc/pusIds.h"
 #if OBSW_TEST_LIBGPIOD == 1
 #include "linux/boardtest/LibgpiodTest.h"
@@ -908,10 +907,7 @@ void ObjectFactory::createBpxBatteryComponent() {
 #endif
 }
 
-void ObjectFactory::createMiscComponents() {
+void ObjectFactory::createMiscComponents() { new PlocMemoryDumper(objects::PLOC_MEMORY_DUMPER); }
-  new FileSystemHandler(objects::FILE_SYSTEM_HANDLER);
-  new PlocMemoryDumper(objects::PLOC_MEMORY_DUMPER);
-}
 
 void ObjectFactory::testAcsBrdAss(AcsBoardAssembly* acsAss) {
   CommandMessage msg;

bsp_q7s/em/emObjectFactory.cpp

@@ -4,8 +4,8 @@
 #include "bsp_q7s/core/CoreController.h"
 #include "bsp_q7s/core/ObjectFactory.h"
 #include "busConf.h"
-#include "commonObjects.h"
 #include "devConf.h"
+#include "eive/objects.h"
 #include "fsfw_hal/linux/gpio/LinuxLibgpioIF.h"
 #include "linux/ObjectFactory.h"
 #include "linux/callbacks/gpioCallbacks.h"

bsp_q7s/fmObjectFactory.cpp

@@ -2,8 +2,8 @@
 #include "bsp_q7s/core/CoreController.h"
 #include "bsp_q7s/core/ObjectFactory.h"
 #include "busConf.h"
-#include "commonObjects.h"
 #include "devConf.h"
+#include "eive/objects.h"
 #include "fsfw_hal/linux/gpio/LinuxLibgpioIF.h"
 #include "linux/ObjectFactory.h"
 #include "linux/callbacks/gpioCallbacks.h"

bsp_q7s/fs/CMakeLists.txt

@@ -0,0 +1,2 @@
+target_sources(${OBSW_NAME} PRIVATE helpers.cpp SdCardManager.cpp
+                                    FilesystemHelper.cpp)

bsp_q7s/fs/FilesystemHelper.cpp

@@ -3,8 +3,9 @@
 #include <filesystem>
 #include <fstream>
 
-#include "bsp_q7s/memory/SdCardManager.h"
+#include "SdCardManager.h"
-#include "fsfw/serviceinterface/ServiceInterfaceStream.h"
+#include "eive/definitions.h"
+#include "fsfw/serviceinterface.h"
 
 FilesystemHelper::FilesystemHelper() {}
 
@@ -14,15 +15,14 @@ ReturnValue_t FilesystemHelper::checkPath(std::string path) {
     sif::warning << "FilesystemHelper::checkPath: Invalid SD card manager" << std::endl;
     return returnvalue::FAILED;
   }
-  if (path.substr(0, sizeof(SdCardManager::SD_0_MOUNT_POINT)) ==
+  if (path.substr(0, sizeof(config::SD_0_MOUNT_POINT)) == std::string(config::SD_0_MOUNT_POINT)) {
-      std::string(SdCardManager::SD_0_MOUNT_POINT)) {
+    if (!sdcMan->isSdCardUsable(sd::SLOT_0)) {
-    if (!sdcMan->isSdCardMounted(sd::SLOT_0)) {
       sif::warning << "FilesystemHelper::checkPath: SD card 0 not mounted" << std::endl;
       return SD_NOT_MOUNTED;
     }
-  } else if (path.substr(0, sizeof(SdCardManager::SD_1_MOUNT_POINT)) ==
+  } else if (path.substr(0, sizeof(config::SD_1_MOUNT_POINT)) ==
-             std::string(SdCardManager::SD_1_MOUNT_POINT)) {
+             std::string(config::SD_1_MOUNT_POINT)) {
-    if (!sdcMan->isSdCardMounted(sd::SLOT_0)) {
+    if (!sdcMan->isSdCardUsable(sd::SLOT_0)) {
       sif::warning << "FilesystemHelper::checkPath: SD card 1 not mounted" << std::endl;
       return SD_NOT_MOUNTED;
     }

bsp_q7s/fs/FilesystemHelper.h

@@ -3,7 +3,7 @@
 
 #include <string>
 
-#include "commonClassIds.h"
+#include "eive/resultClassIds.h"
 #include "fsfw/returnvalues/returnvalue.h"
 
 /**

bsp_q7s/fs/SdCardManager.cpp

@@ -10,11 +10,12 @@
 #include <memory>
 
 #include "OBSWConfig.h"
-#include "common/config/commonObjects.h"
+#include "bsp_q7s/memory/scratchApi.h"
+#include "eive/definitions.h"
+#include "eive/objects.h"
 #include "fsfw/ipc/MutexFactory.h"
 #include "fsfw/serviceinterface/ServiceInterface.h"
 #include "linux/utility/utility.h"
-#include "scratchApi.h"
 
 SdCardManager* SdCardManager::INSTANCE = nullptr;
 
@@ -212,6 +213,9 @@ ReturnValue_t SdCardManager::getSdCardsStatus(SdStatePair& active) {
   while (std::getline(sdStatus, line)) {
     processSdStatusLine(active, line, idx, currentSd);
   }
+  if (active.first != sd::SdState::MOUNTED && active.second != sd::SdState::MOUNTED) {
+    sdCardActive = false;
+  }
   return returnvalue::OK;
 }
 
@@ -229,10 +233,10 @@ ReturnValue_t SdCardManager::mountSdCard(sd::SdCard sdCard) {
   string mountPoint;
   if (sdCard == sd::SdCard::SLOT_0) {
     mountDev = SD_0_DEV_NAME;
-    mountPoint = SD_0_MOUNT_POINT;
+    mountPoint = config::SD_0_MOUNT_POINT;
   } else if (sdCard == sd::SdCard::SLOT_1) {
     mountDev = SD_1_DEV_NAME;
-    mountPoint = SD_1_MOUNT_POINT;
+    mountPoint = config::SD_1_MOUNT_POINT;
   }
   if (not filesystem::exists(mountDev)) {
     sif::warning << "SdCardManager::mountSdCard: Device file does not exists. Make sure to"
@@ -265,9 +269,9 @@ ReturnValue_t SdCardManager::unmountSdCard(sd::SdCard sdCard) {
   }
   string mountPoint;
   if (sdCard == sd::SdCard::SLOT_0) {
-    mountPoint = SD_0_MOUNT_POINT;
+    mountPoint = config::SD_0_MOUNT_POINT;
   } else if (sdCard == sd::SdCard::SLOT_1) {
-    mountPoint = SD_1_MOUNT_POINT;
+    mountPoint = config::SD_1_MOUNT_POINT;
   }
   if (not filesystem::exists(mountPoint)) {
     sif::error << "SdCardManager::unmountSdCard: Default mount point " << mountPoint
@@ -415,9 +419,9 @@ ReturnValue_t SdCardManager::updateSdCardStateFile() {
 std::string SdCardManager::getCurrentMountPrefix() const {
   MutexGuard mg(mutex);
   if (sdInfo.active == sd::SdCard::SLOT_0) {
-    return SD_0_MOUNT_POINT;
+    return config::SD_0_MOUNT_POINT;
   } else {
-    return SD_1_MOUNT_POINT;
+    return config::SD_1_MOUNT_POINT;
   }
 }
 
@@ -465,7 +469,7 @@ void SdCardManager::setBlocking(bool blocking) { this->blocking = blocking; }
 
 void SdCardManager::setPrintCommandOutput(bool print) { this->printCmdOutput = print; }
 
-bool SdCardManager::isSdCardMounted(sd::SdCard sdCard) {
+bool SdCardManager::isSdCardUsable(sd::SdCard sdCard) {
   SdCardManager::SdStatePair active;
   ReturnValue_t result = this->getSdCardsStatus(active);
 
@@ -494,9 +498,11 @@ bool SdCardManager::isSdCardMounted(sd::SdCard sdCard) {
 ReturnValue_t SdCardManager::isSdCardMountedReadOnly(sd::SdCard sdcard, bool& readOnly) {
   std::ostringstream command;
   if (sdcard == sd::SdCard::SLOT_0) {
-    command << "grep -q '" << SD_0_MOUNT_POINT << " vfat ro,' /proc/mounts";
+    command << "grep -q '" << config::SD_0_MOUNT_POINT << " vfat ro,' /proc/mounts";
+  } else if (sdcard == sd::SdCard::SLOT_1) {
+    command << "grep -q '" << config::SD_1_MOUNT_POINT << " vfat ro,' /proc/mounts";
   } else {
-    command << "grep -q '" << SD_1_MOUNT_POINT << " vfat ro,' /proc/mounts";
+    return returnvalue::FAILED;
   }
   ReturnValue_t result = cmdExecutor.load(command.str(), true, false);
   if (result != returnvalue::OK) {
@@ -523,9 +529,9 @@ ReturnValue_t SdCardManager::isSdCardMountedReadOnly(sd::SdCard sdcard, bool& re
 ReturnValue_t SdCardManager::remountReadWrite(sd::SdCard sdcard) {
   std::ostringstream command;
   if (sdcard == sd::SdCard::SLOT_0) {
-    command << "mount -o remount,rw " << SD_0_DEV_NAME << " " << SD_0_MOUNT_POINT;
+    command << "mount -o remount,rw " << SD_0_DEV_NAME << " " << config::SD_0_MOUNT_POINT;
   } else {
-    command << "mount -o remount,rw " << SD_1_DEV_NAME << " " << SD_1_MOUNT_POINT;
+    command << "mount -o remount,rw " << SD_1_DEV_NAME << " " << config::SD_1_MOUNT_POINT;
   }
   ReturnValue_t result = cmdExecutor.load(command.str(), true, false);
   if (result != returnvalue::OK) {

bsp_q7s/fs/SdCardManager.h

@@ -64,8 +64,7 @@ class SdCardManager : public SystemObject, public SdCardMountedIF {
   // C++17 does not support constexpr std::string yet
   static constexpr char SD_0_DEV_NAME[] = "/dev/mmcblk0p1";
   static constexpr char SD_1_DEV_NAME[] = "/dev/mmcblk1p1";
-  static constexpr char SD_0_MOUNT_POINT[] = "/mnt/sd0";
+
-  static constexpr char SD_1_MOUNT_POINT[] = "/mnt/sd1";
   static constexpr char SD_STATE_FILE[] = "/tmp/sd_status.txt";
 
   virtual ~SdCardManager();
@@ -207,7 +206,7 @@ class SdCardManager : public SystemObject, public SdCardMountedIF {
    *
    * @return  true if mounted, otherwise false
    */
-  bool isSdCardMounted(sd::SdCard sdCard) override;
+  bool isSdCardUsable(sd::SdCard sdCard) override;
 
   ReturnValue_t isSdCardMountedReadOnly(sd::SdCard sdcard, bool& readOnly);
 
@@ -219,6 +218,7 @@ class SdCardManager : public SystemObject, public SdCardMountedIF {
   CommandExecutor cmdExecutor;
   Operations currentOp = Operations::IDLE;
   bool blocking = false;
+  bool sdCardActive = true;
   bool printCmdOutput = true;
   MutexIF* mutex = nullptr;
 

bsp_q7s/fs/helpers.cpp

@@ -0,0 +1,8 @@
+#include "helpers.h"
+
+std::filesystem::path fshelpers::getPrefixedPath(SdCardManager &man,
+                                                 std::filesystem::path pathWihtoutPrefix) {
+  auto prefix = man.getCurrentMountPrefix();
+  auto resPath = prefix / pathWihtoutPrefix;
+  return resPath;
+}

bsp_q7s/fs/helpers.h

@@ -0,0 +1,14 @@
+#ifndef BSP_Q7S_MEMORY_HELPERS_H_
+#define BSP_Q7S_MEMORY_HELPERS_H_
+
+#include <filesystem>
+
+#include "SdCardManager.h"
+
+namespace fshelpers {
+
+std::filesystem::path getPrefixedPath(SdCardManager& man, std::filesystem::path pathWihtoutPrefix);
+
+}
+
+#endif /* BSP_Q7S_MEMORY_HELPERS_H_ */

bsp_q7s/memory/CMakeLists.txt

@@ -1,2 +1 @@
-target_sources(${OBSW_NAME} PRIVATE FileSystemHandler.cpp SdCardManager.cpp
+target_sources(${OBSW_NAME} PRIVATE scratchApi.cpp)
-                                    scratchApi.cpp FilesystemHelper.cpp)

bsp_q7s/memory/FileSystemHandler.cpp

@@ -1,238 +0,0 @@
-#include "FileSystemHandler.h"
-
-#include <cstring>
-#include <filesystem>
-#include <fstream>
-
-#include "bsp_q7s/core/CoreController.h"
-#include "fsfw/ipc/QueueFactory.h"
-#include "fsfw/memory/GenericFileSystemMessage.h"
-#include "fsfw/tasks/TaskFactory.h"
-
-FileSystemHandler::FileSystemHandler(object_id_t fileSystemHandler)
-    : SystemObject(fileSystemHandler) {
-  auto mqArgs = MqArgs(this->getObjectId());
-  mq = QueueFactory::instance()->createMessageQueue(FS_MAX_QUEUE_SIZE,
-                                                    MessageQueueMessage::MAX_MESSAGE_SIZE, &mqArgs);
-}
-
-FileSystemHandler::~FileSystemHandler() { QueueFactory::instance()->deleteMessageQueue(mq); }
-
-ReturnValue_t FileSystemHandler::performOperation(uint8_t unsignedChar) {
-  while (true) {
-    try {
-      fileSystemHandlerLoop();
-    } catch (std::bad_alloc& e) {
-      // Restart OBSW, hints at a memory leak
-      sif::error << "Allocation error in FileSystemHandler::performOperation" << e.what()
-                 << std::endl;
-      // Set up an error file or a special flag in the scratch buffer for these cases
-      triggerEvent(CoreController::ALLOC_FAILURE, 0, 0);
-      CoreController::incrementAllocationFailureCount();
-    }
-  }
-}
-
-void FileSystemHandler::fileSystemHandlerLoop() {
-  CommandMessage filemsg;
-  ReturnValue_t result = returnvalue::OK;
-  while (true) {
-    if (opCounter % 5 == 0) {
-      if (coreCtrl->sdInitFinished()) {
-        fileSystemCheckup();
-      }
-    }
-    result = mq->receiveMessage(&filemsg);
-    if (result == MessageQueueIF::EMPTY) {
-      break;
-    } else if (result != returnvalue::FAILED) {
-      sif::warning << "FileSystemHandler::performOperation: Message reception failed!" << std::endl;
-      break;
-    }
-    Command_t command = filemsg.getCommand();
-    switch (command) {
-      case (GenericFileSystemMessage::CMD_CREATE_DIRECTORY): {
-        break;
-      }
-      case (GenericFileSystemMessage::CMD_CREATE_FILE): {
-        break;
-      }
-    }
-    opCounter++;
-  }
-
-  // This task will have a low priority and will run permanently in the background
-  // so we will just run in a permanent loop here and check file system
-  // messages permanently
-  opCounter++;
-  TaskFactory::instance()->delayTask(1000);
-}
-
-void FileSystemHandler::fileSystemCheckup() {
-  SdCardManager::SdStatePair statusPair;
-  sdcMan->getSdCardsStatus(statusPair);
-  sd::SdCard preferredSdCard = sdcMan->getPreferredSdCard();
-  if ((preferredSdCard == sd::SdCard::SLOT_0) and (statusPair.first == sd::SdState::MOUNTED)) {
-    currentMountPrefix = SdCardManager::SD_0_MOUNT_POINT;
-  } else if ((preferredSdCard == sd::SdCard::SLOT_1) and
-             (statusPair.second == sd::SdState::MOUNTED)) {
-    currentMountPrefix = SdCardManager::SD_1_MOUNT_POINT;
-  } else {
-    std::string sdString;
-    if (preferredSdCard == sd::SdCard::SLOT_0) {
-      sdString = "0";
-    } else {
-      sdString = "1";
-    }
-    sif::warning << "FileSystemHandler::performOperation: "
-                    "Inconsistent state detected"
-                 << std::endl;
-    sif::warning << "Preferred SD card is " << sdString
-                 << " but does not appear to be mounted. Attempting fix.." << std::endl;
-    // This function will appear to fix the inconsistent state
-    ReturnValue_t result = sdcMan->sanitizeState(&statusPair, preferredSdCard);
-    if (result != returnvalue::OK) {
-      // Oh no.
-      triggerEvent(SdCardManager::SANITIZATION_FAILED, 0, 0);
-      sif::error << "FileSystemHandler::fileSystemCheckup: Sanitization failed" << std::endl;
-    }
-  }
-}
-
-MessageQueueId_t FileSystemHandler::getCommandQueue() const { return mq->getId(); }
-
-ReturnValue_t FileSystemHandler::initialize() {
-  coreCtrl = ObjectManager::instance()->get<CoreController>(objects::CORE_CONTROLLER);
-  if (coreCtrl == nullptr) {
-    sif::error << "FileSystemHandler::initialize: Could not retrieve core controller handle"
-               << std::endl;
-  }
-  sdcMan = SdCardManager::instance();
-  sd::SdCard preferredSdCard = sdcMan->getPreferredSdCard();
-  if (preferredSdCard == sd::SdCard::SLOT_0) {
-    currentMountPrefix = SdCardManager::SD_0_MOUNT_POINT;
-  } else if (preferredSdCard == sd::SdCard::SLOT_1) {
-    currentMountPrefix = SdCardManager::SD_1_MOUNT_POINT;
-  }
-  return returnvalue::OK;
-}
-
-ReturnValue_t FileSystemHandler::appendToFile(const char* repositoryPath, const char* filename,
-                                              const uint8_t* data, size_t size,
-                                              uint16_t packetNumber, FileSystemArgsIF* args) {
-  auto path = getInitPath(args) / repositoryPath / filename;
-  if (not std::filesystem::exists(path)) {
-    return FILE_DOES_NOT_EXIST;
-  }
-  std::ofstream file(path, std::ios_base::app | std::ios_base::out);
-  file.write(reinterpret_cast<const char*>(data), size);
-  if (not file.good()) {
-    return GENERIC_FILE_ERROR;
-  }
-  return returnvalue::OK;
-}
-
-ReturnValue_t FileSystemHandler::createFile(const char* repositoryPath, const char* filename,
-                                            const uint8_t* data, size_t size,
-                                            FileSystemArgsIF* args) {
-  auto path = getInitPath(args) / filename;
-  if (std::filesystem::exists(path)) {
-    return FILE_ALREADY_EXISTS;
-  }
-  std::ofstream file(path);
-  file.write(reinterpret_cast<const char*>(data), size);
-  if (not file.good()) {
-    return GENERIC_FILE_ERROR;
-  }
-  return returnvalue::OK;
-}
-
-ReturnValue_t FileSystemHandler::removeFile(const char* repositoryPath, const char* filename,
-                                            FileSystemArgsIF* args) {
-  auto path = getInitPath(args) / repositoryPath / filename;
-  if (not std::filesystem::exists(path)) {
-    return FILE_DOES_NOT_EXIST;
-  }
-  int result = std::remove(path.c_str());
-  if (result != 0) {
-    sif::warning << "FileSystemHandler::deleteFile: Failed with code " << result << std::endl;
-    return GENERIC_FILE_ERROR;
-  }
-  return returnvalue::OK;
-}
-
-ReturnValue_t FileSystemHandler::createDirectory(const char* repositoryPath, const char* dirname,
-                                                 bool createParentDirs, FileSystemArgsIF* args) {
-  auto path = getInitPath(args) / repositoryPath / dirname;
-  if (std::filesystem::exists(path)) {
-    return DIRECTORY_ALREADY_EXISTS;
-  }
-  if (std::filesystem::create_directory(path)) {
-    return returnvalue::OK;
-  }
-  sif::warning << "Creating directory " << path << " failed" << std::endl;
-  return GENERIC_FILE_ERROR;
-}
-
-ReturnValue_t FileSystemHandler::removeDirectory(const char* repositoryPath, const char* dirname,
-                                                 bool deleteRecurively, FileSystemArgsIF* args) {
-  auto path = getInitPath(args) / repositoryPath / dirname;
-  if (not std::filesystem::exists(path)) {
-    return DIRECTORY_DOES_NOT_EXIST;
-  }
-  std::error_code err;
-  if (not deleteRecurively) {
-    if (std::filesystem::remove(path, err)) {
-      return returnvalue::OK;
-    } else {
-      // Check error code. Most probably denied permissions because folder is not empty
-      sif::warning << "FileSystemHandler::removeDirectory: Deleting directory failed with "
-                      "code "
-                   << err.value() << ": " << strerror(err.value()) << std::endl;
-      if (err.value() == ENOTEMPTY) {
-        return DIRECTORY_NOT_EMPTY;
-      } else {
-        return GENERIC_FILE_ERROR;
-      }
-    }
-  } else {
-    if (std::filesystem::remove_all(path, err)) {
-      return returnvalue::OK;
-    } else {
-      sif::warning << "FileSystemHandler::removeDirectory: Deleting directory failed with "
-                      "code "
-                   << err.value() << ": " << strerror(err.value()) << std::endl;
-      // Check error code
-      if (err.value() == ENOTEMPTY) {
-        return DIRECTORY_NOT_EMPTY;
-      } else {
-        return GENERIC_FILE_ERROR;
-      }
-    }
-  }
-
-  return returnvalue::OK;
-}
-
-ReturnValue_t FileSystemHandler::renameFile(const char* repositoryPath, const char* oldFilename,
-                                            const char* newFilename, FileSystemArgsIF* args) {
-  auto basepath = getInitPath(args) / repositoryPath;
-  std::filesystem::rename(basepath / oldFilename, basepath / newFilename);
-  return returnvalue::OK;
-}
-
-void FileSystemHandler::parseCfg(FsCommandCfg* cfg, bool& useMountPrefix) {
-  if (cfg != nullptr) {
-    useMountPrefix = cfg->useMountPrefix;
-  }
-}
-
-std::filesystem::path FileSystemHandler::getInitPath(FileSystemArgsIF* args) {
-  bool useMountPrefix = true;
-  parseCfg(reinterpret_cast<FsCommandCfg*>(args), useMountPrefix);
-  std::string path;
-  if (useMountPrefix) {
-    path = currentMountPrefix;
-  }
-  return std::filesystem::path(path);
-}

bsp_q7s/memory/FileSystemHandler.h

@@ -1,68 +0,0 @@
-#ifndef BSP_Q7S_MEMORY_FILESYSTEMHANDLER_H_
-#define BSP_Q7S_MEMORY_FILESYSTEMHANDLER_H_
-
-#include <filesystem>
-#include <string>
-
-#include "OBSWConfig.h"
-#include "SdCardManager.h"
-#include "eive/definitions.h"
-#include "fsfw/ipc/MessageQueueIF.h"
-#include "fsfw/memory/HasFileSystemIF.h"
-#include "fsfw/objectmanager/SystemObject.h"
-#include "fsfw/tasks/ExecutableObjectIF.h"
-
-class CoreController;
-
-class FileSystemHandler : public SystemObject, public ExecutableObjectIF, public HasFileSystemIF {
- public:
-  struct FsCommandCfg : public FileSystemArgsIF {
-    // Can be used to automatically use mount prefix of active SD card.
-    // Otherwise, the operator has to specify the full path to the mounted SD card as well.
-    bool useMountPrefix = false;
-  };
-
-  FileSystemHandler(object_id_t fileSystemHandler);
-  virtual ~FileSystemHandler();
-
-  ReturnValue_t performOperation(uint8_t) override;
-
-  ReturnValue_t initialize() override;
-
-  /**
-   * Function to get the MessageQueueId_t of the implementing object
-   * @return MessageQueueId_t of the object
-   */
-  MessageQueueId_t getCommandQueue() const override;
-  ReturnValue_t appendToFile(const char* repositoryPath, const char* filename, const uint8_t* data,
-                             size_t size, uint16_t packetNumber,
-                             FileSystemArgsIF* args = nullptr) override;
-  ReturnValue_t createFile(const char* repositoryPath, const char* filename,
-                           const uint8_t* data = nullptr, size_t size = 0,
-                           FileSystemArgsIF* args = nullptr) override;
-  ReturnValue_t removeFile(const char* repositoryPath, const char* filename,
-                           FileSystemArgsIF* args = nullptr) override;
-  ReturnValue_t createDirectory(const char* repositoryPath, const char* dirname,
-                                bool createParentDirs, FileSystemArgsIF* args = nullptr) override;
-  ReturnValue_t removeDirectory(const char* repositoryPath, const char* dirname,
-                                bool deleteRecurively = false,
-                                FileSystemArgsIF* args = nullptr) override;
-  ReturnValue_t renameFile(const char* repositoryPath, const char* oldFilename,
-                           const char* newFilename, FileSystemArgsIF* args = nullptr) override;
-
- private:
-  CoreController* coreCtrl = nullptr;
-  MessageQueueIF* mq = nullptr;
-  std::string currentMountPrefix = SdCardManager::SD_0_MOUNT_POINT;
-  static constexpr uint32_t FS_MAX_QUEUE_SIZE = config::OBSW_FILESYSTEM_HANDLER_QUEUE_SIZE;
-
-  SdCardManager* sdcMan = nullptr;
-  uint8_t opCounter = 0;
-
-  void fileSystemHandlerLoop();
-  void fileSystemCheckup();
-  std::filesystem::path getInitPath(FileSystemArgsIF* args);
-  void parseCfg(FsCommandCfg* cfg, bool& useMountPrefix);
-};
-
-#endif /* BSP_Q7S_MEMORY_FILESYSTEMMANAGER_H_ */

common/config/commonConfig.cpp

@@ -1,8 +1,11 @@
 #include "commonConfig.h"
 
+#include "eive/definitions.h"
 #include "fsfw/tmtcpacket/ccsds/defs.h"
-#include "tmtc/apid.h"
 
 const fsfw::Version common::OBSW_VERSION{OBSW_VERSION_MAJOR, OBSW_VERSION_MINOR,
                                          OBSW_VERSION_REVISION, OBSW_VERSION_CST_GIT_SHA1};
-const uint16_t common::PUS_PACKET_ID = ccsds::getTcSpacePacketIdFromApid(apid::EIVE_OBSW);
+const uint16_t common::PUS_PACKET_ID =
+    ccsds::getTcSpacePacketIdFromApid(config::EIVE_PUS_APID, true);
+const uint16_t common::CFDP_PACKET_ID =
+    ccsds::getTcSpacePacketIdFromApid(config::EIVE_CFDP_APID, false);

common/config/commonConfig.h.in

@@ -25,6 +25,8 @@ debugging. */
 // CCSDS IP Cores. 
 #define OBSW_USE_TMTC_TCP_BRIDGE            1
 
+#define OBSW_ADD_CFDP_COMPONENTS            1
+
 namespace common {
 
 static constexpr uint8_t OBSW_VERSION_MAJOR = @OBSW_VERSION_MAJOR@;
@@ -39,6 +41,7 @@ static constexpr uint32_t OBSW_MAX_SCHEDULED_TCS = @OBSW_MAX_SCHEDULED_TCS@;
 extern const fsfw::Version OBSW_VERSION;
 
 extern const uint16_t PUS_PACKET_ID;
+extern const uint16_t CFDP_PACKET_ID;
 
 static constexpr uint32_t CCSDS_HANDLER_QUEUE_SIZE = 50;
 static constexpr uint8_t NUMBER_OF_VIRTUAL_CHANNELS = 4;

common/config/eive/definitions.h

@@ -5,6 +5,21 @@
 
 namespace config {
 
+static constexpr char SD_0_MOUNT_POINT[] = "/mnt/sd0";
+static constexpr char SD_1_MOUNT_POINT[] = "/mnt/sd1";
+
+static constexpr char OBSW_UPDATE_ARCHIVE_FILE_NAME[] = "eive-sw-update.tar.xz";
+static constexpr char STRIPPED_OBSW_BINARY_FILE_NAME[] = "eive-obsw-stripped";
+static constexpr char OBSW_VERSION_FILE_NAME[] = "obsw_version.txt";
+
+static constexpr char OBSW_PATH[] = "/usr/bin/eive-obsw";
+static constexpr char OBSW_VERSION_FILE_PATH[] = "/usr/share/eive-obsw/obsw_version.txt";
+
+static constexpr uint16_t EIVE_PUS_APID = 0x65;
+static constexpr uint16_t EIVE_CFDP_APID = 0x66;
+static constexpr uint16_t EIVE_LOCAL_CFDP_ENTITY_ID = EIVE_CFDP_APID;
+static constexpr uint16_t EIVE_GROUND_CFDP_ENTITY_ID = 1;
+
 static constexpr uint32_t PL_PCDU_TRANSITION_TIMEOUT_MS = 20 * 60 * 1000;
 static constexpr uint32_t LONGEST_MODE_TIMEOUT_SECONDS = PL_PCDU_TRANSITION_TIMEOUT_MS / 1000;
 

common/config/eive/objects.h

@@ -121,7 +121,9 @@ enum commonObjects : uint32_t {
   ACS_BOARD_ASS = 0x73000001,
   SUS_BOARD_ASS = 0x73000002,
   TCS_BOARD_ASS = 0x73000003,
-  RW_ASS = 0x73000004
+  RW_ASS = 0x73000004,
+  CFDP_HANDLER = 0x73000005,
+  CFDP_DISTRIBUTOR = 0x73000006
 };
 }
 

common/config/tmtc/apid.h

@@ -1,18 +0,0 @@
-#ifndef FSFWCONFIG_TMTC_APID_H_
-#define FSFWCONFIG_TMTC_APID_H_
-
-#include <cstdint>
-
-/**
- * Application Process Definition: entity, uniquely identified by an
- * application process ID (APID), capable of generating telemetry source
- * packets and receiving telecommand packets
- *
- * EIVE APID: 0x65 / 101 / e
- * APID is a 11 bit number
- */
-namespace apid {
-static const uint16_t EIVE_OBSW = 0x65;
-}
-
-#endif /* FSFWCONFIG_TMTC_APID_H_ */

fsfw

@@ -1 +1 @@
-Subproject commit 2ca8d72e83d79c1ddf810509738c2107b92221cd
+Subproject commit c932e51818514ae7848ade815e09efeee25060ad

generators/bsp_q7s_events.csv

@@ -69,6 +69,7 @@ Event ID (dec); Event ID (hex); Name; Severity; Description; File Path
 7510;0x1d56;TRYING_RECOVERY;MEDIUM;;fsfw/src/fsfw/health/HasHealthIF.h
 7511;0x1d57;RECOVERY_STEP;MEDIUM;;fsfw/src/fsfw/health/HasHealthIF.h
 7512;0x1d58;RECOVERY_DONE;MEDIUM;;fsfw/src/fsfw/health/HasHealthIF.h
+7600;0x1db0;HANDLE_PACKET_FAILED;LOW;;fsfw/src/fsfw/tcdistribution/definitions.h
 7900;0x1edc;RF_AVAILABLE;INFO;A RF available signal was detected. P1: raw RFA state, P2: 0;fsfw/src/fsfw/datalinklayer/DataLinkLayer.h
 7901;0x1edd;RF_LOST;INFO;A previously found RF available signal was lost. P1: raw RFA state, P2: 0;fsfw/src/fsfw/datalinklayer/DataLinkLayer.h
 7902;0x1ede;BIT_LOCK;INFO;A Bit Lock signal. Was detected. P1: raw BLO state, P2: 0;fsfw/src/fsfw/datalinklayer/DataLinkLayer.h
@@ -119,8 +120,8 @@ Event ID (dec); Event ID (hex); Name; Severity; Description; File Path
 12003;0x2ee3;SUPV_EXE_FAILURE;LOW;PLOC received execution failure report P1: ID of command for which the execution failed P2: Status code sent by the supervisor handler;linux/devices/ploc/PlocSupervisorHandler.h
 12004;0x2ee4;SUPV_CRC_FAILURE_EVENT;LOW;PLOC supervisor reply has invalid crc;linux/devices/ploc/PlocSupervisorHandler.h
 12005;0x2ee5;SUPV_MPSOC_SHUWDOWN_BUILD_FAILED;LOW;Failed to build the command to shutdown the MPSoC;linux/devices/ploc/PlocSupervisorHandler.h
-12100;0x2f44;SANITIZATION_FAILED;LOW;;bsp_q7s/memory/SdCardManager.h
+12100;0x2f44;SANITIZATION_FAILED;LOW;;bsp_q7s/fs/SdCardManager.h
-12101;0x2f45;MOUNTED_SD_CARD;INFO;;bsp_q7s/memory/SdCardManager.h
+12101;0x2f45;MOUNTED_SD_CARD;INFO;;bsp_q7s/fs/SdCardManager.h
 12300;0x300c;SEND_MRAM_DUMP_FAILED;LOW;Failed to send mram dump command to supervisor handler P1: Return value of commandAction function P2: Start address of MRAM to dump with this command;linux/devices/ploc/PlocMemoryDumper.h
 12301;0x300d;MRAM_DUMP_FAILED;LOW;Received completion failure report form PLOC supervisor handler P1: MRAM start address of failing dump command;linux/devices/ploc/PlocMemoryDumper.h
 12302;0x300e;MRAM_DUMP_FINISHED;LOW;MRAM dump finished successfully;linux/devices/ploc/PlocMemoryDumper.h

generators/bsp_q7s_objects.csv

@@ -128,6 +128,8 @@
 0x73000002;SUS_BOARD_ASS
 0x73000003;TCS_BOARD_ASS
 0x73000004;RW_ASS
+0x73000005;CFDP_HANDLER
+0x73000006;CFDP_DISTRIBUTOR
 0x73000100;TM_FUNNEL
 0x73500000;CCSDS_IP_CORE_BRIDGE
 0xFFFFFFFF;NO_OBJECT

generators/bsp_q7s_returnvalues.csv

@@ -1,14 +1,13 @@
 Full ID (hex); Name; Description; Unique ID; Subsytem Name; File Path
-0x0000;OK;System-wide code for ok.;0;HasReturnvaluesIF;fsfw/returnvalues/HasReturnvaluesIF.h
+0x0000;OK;System-wide code for ok.;0;HasReturnvaluesIF;fsfw/returnvalues/returnvalue.h
-0x0001;Failed;Unspecified system-wide code for failed.;1;HasReturnvaluesIF;fsfw/returnvalues/HasReturnvaluesIF.h
+0x0001;Failed;Unspecified system-wide code for failed.;1;HasReturnvaluesIF;fsfw/returnvalues/returnvalue.h
-0x63a0;NVMB_KeyNotExists;Specified key does not exist in json file;160;NVM_PARAM_BASE;mission/memory/NVMParameterBase.h
+0x60a0;CCSDS_CommandNotImplemented;Received action message with unknown action id;160;CCSDS_HANDLER;mission/tmtc/CCSDSHandler.h
-0x58a0;SUSS_ErrorUnlockMutex;;160;SUS_HANDLER;mission/devices/SusHandler.h
+0x5d00;GOMS_PacketTooLong;;0;GOM_SPACE_HANDLER;mission/devices/GomspaceDeviceHandler.h
-0x58a1;SUSS_ErrorLockMutex;;161;SUS_HANDLER;mission/devices/SusHandler.h
+0x5d01;GOMS_InvalidTableId;;1;GOM_SPACE_HANDLER;mission/devices/GomspaceDeviceHandler.h
-0x66a0;SADPL_CommandNotSupported;;160;SA_DEPL_HANDLER;mission/devices/SolarArrayDeploymentHandler.h
+0x5d02;GOMS_InvalidAddress;;2;GOM_SPACE_HANDLER;mission/devices/GomspaceDeviceHandler.h
-0x66a1;SADPL_DeploymentAlreadyExecuting;;161;SA_DEPL_HANDLER;mission/devices/SolarArrayDeploymentHandler.h
+0x5d03;GOMS_InvalidParamSize;;3;GOM_SPACE_HANDLER;mission/devices/GomspaceDeviceHandler.h
-0x66a2;SADPL_MainSwitchTimeoutFailure;;162;SA_DEPL_HANDLER;mission/devices/SolarArrayDeploymentHandler.h
+0x5d04;GOMS_InvalidPayloadSize;;4;GOM_SPACE_HANDLER;mission/devices/GomspaceDeviceHandler.h
-0x66a3;SADPL_SwitchingDeplSa1Failed;;163;SA_DEPL_HANDLER;mission/devices/SolarArrayDeploymentHandler.h
+0x5d05;GOMS_UnknownReplyId;;5;GOM_SPACE_HANDLER;mission/devices/GomspaceDeviceHandler.h
-0x66a4;SADPL_SwitchingDeplSa2Failed;;164;SA_DEPL_HANDLER;mission/devices/SolarArrayDeploymentHandler.h
 0x52b0;RWHA_SpiWriteFailure;;176;RW_HANDLER;mission/devices/RwHandler.h
 0x52b1;RWHA_SpiReadFailure;Used by the spi send function to tell a failing read call;177;RW_HANDLER;mission/devices/RwHandler.h
 0x52b2;RWHA_MissingStartSign;Can be used by the HDLC decoding mechanism to inform about a missing start sign 0x7E;178;RW_HANDLER;mission/devices/RwHandler.h
@@ -21,12 +20,13 @@ Full ID (hex); Name; Description; Unique ID; Subsytem Name; File Path
 0x52a2;RWHA_SetSpeedCommandInvalidLength;Received set speed command has invalid length. Should be 6.;162;RW_HANDLER;mission/devices/RwHandler.h
 0x52a3;RWHA_ExecutionFailed;Command execution failed;163;RW_HANDLER;mission/devices/RwHandler.h
 0x52a4;RWHA_CrcError;Reaction wheel reply has invalid crc;164;RW_HANDLER;mission/devices/RwHandler.h
-0x5d00;GOMS_PacketTooLong;;0;GOM_SPACE_HANDLER;mission/devices/GomspaceDeviceHandler.h
+0x4fa1;HEATER_CommandNotSupported;;161;HEATER_HANDLER;mission/devices/HeaterHandler.h
-0x5d01;GOMS_InvalidTableId;;1;GOM_SPACE_HANDLER;mission/devices/GomspaceDeviceHandler.h
+0x4fa2;HEATER_InitFailed;;162;HEATER_HANDLER;mission/devices/HeaterHandler.h
-0x5d02;GOMS_InvalidAddress;;2;GOM_SPACE_HANDLER;mission/devices/GomspaceDeviceHandler.h
+0x4fa3;HEATER_InvalidSwitchNr;;163;HEATER_HANDLER;mission/devices/HeaterHandler.h
-0x5d03;GOMS_InvalidParamSize;;3;GOM_SPACE_HANDLER;mission/devices/GomspaceDeviceHandler.h
+0x4fa4;HEATER_MainSwitchSetTimeout;;164;HEATER_HANDLER;mission/devices/HeaterHandler.h
-0x5d04;GOMS_InvalidPayloadSize;;4;GOM_SPACE_HANDLER;mission/devices/GomspaceDeviceHandler.h
+0x4fa5;HEATER_CommandAlreadyWaiting;;165;HEATER_HANDLER;mission/devices/HeaterHandler.h
-0x5d05;GOMS_UnknownReplyId;;5;GOM_SPACE_HANDLER;mission/devices/GomspaceDeviceHandler.h
+0x58a0;SUSS_ErrorUnlockMutex;;160;SUS_HANDLER;mission/devices/SusHandler.h
+0x58a1;SUSS_ErrorLockMutex;;161;SUS_HANDLER;mission/devices/SusHandler.h
 0x51a0;IMTQ_InvalidCommandCode;;160;IMTQ_HANDLER;mission/devices/IMTQHandler.h
 0x51a1;IMTQ_ParameterMissing;;161;IMTQ_HANDLER;mission/devices/IMTQHandler.h
 0x51a2;IMTQ_ParameterInvalid;;162;IMTQ_HANDLER;mission/devices/IMTQHandler.h
@@ -44,126 +44,130 @@ Full ID (hex); Name; Description; Unique ID; Subsytem Name; File Path
 0x50a6;SYRLINKS_BadCrcAck;;166;SYRLINKS_HANDLER;mission/devices/SyrlinksHkHandler.h
 0x50a7;SYRLINKS_ReplyWrongSize;;167;SYRLINKS_HANDLER;mission/devices/SyrlinksHkHandler.h
 0x50a8;SYRLINKS_MissingStartFrameCharacter;;168;SYRLINKS_HANDLER;mission/devices/SyrlinksHkHandler.h
-0x4fa1;HEATER_CommandNotSupported;;161;HEATER_HANDLER;mission/devices/HeaterHandler.h
+0x66a0;SADPL_CommandNotSupported;;160;SA_DEPL_HANDLER;mission/devices/SolarArrayDeploymentHandler.h
-0x4fa2;HEATER_InitFailed;;162;HEATER_HANDLER;mission/devices/HeaterHandler.h
+0x66a1;SADPL_DeploymentAlreadyExecuting;;161;SA_DEPL_HANDLER;mission/devices/SolarArrayDeploymentHandler.h
-0x4fa3;HEATER_InvalidSwitchNr;;163;HEATER_HANDLER;mission/devices/HeaterHandler.h
+0x66a2;SADPL_MainSwitchTimeoutFailure;;162;SA_DEPL_HANDLER;mission/devices/SolarArrayDeploymentHandler.h
-0x4fa4;HEATER_MainSwitchSetTimeout;;164;HEATER_HANDLER;mission/devices/HeaterHandler.h
+0x66a3;SADPL_SwitchingDeplSa1Failed;;163;SA_DEPL_HANDLER;mission/devices/SolarArrayDeploymentHandler.h
-0x4fa5;HEATER_CommandAlreadyWaiting;;165;HEATER_HANDLER;mission/devices/HeaterHandler.h
+0x66a4;SADPL_SwitchingDeplSa2Failed;;164;SA_DEPL_HANDLER;mission/devices/SolarArrayDeploymentHandler.h
-0x60a0;CCSDS_CommandNotImplemented;Received action message with unknown action id;160;CCSDS_HANDLER;mission/tmtc/CCSDSHandler.h
+0x63a0;NVMB_KeyNotExists;Specified key does not exist in json file;160;NVM_PARAM_BASE;mission/memory/NVMParameterBase.h
-0x4500;HSPI_OpeningFileFailed;;0;HAL_SPI;fsfw/src/fsfw_hal/linux/spi/SpiComIF.h
+0x2c01;CCS_BcIsSetVrCommand;;1;CCSDS_HANDLER_IF;fsfw/src/fsfw/datalinklayer/CCSDSReturnValuesIF.h
-0x4501;HSPI_FullDuplexTransferFailed;;1;HAL_SPI;fsfw/src/fsfw_hal/linux/spi/SpiComIF.h
+0x2c02;CCS_BcIsUnlockCommand;;2;CCSDS_HANDLER_IF;fsfw/src/fsfw/datalinklayer/CCSDSReturnValuesIF.h
-0x4502;HSPI_HalfDuplexTransferFailed;;2;HAL_SPI;fsfw/src/fsfw_hal/linux/spi/SpiComIF.h
+0x2cb0;CCS_BcIllegalCommand;;176;CCSDS_HANDLER_IF;fsfw/src/fsfw/datalinklayer/CCSDSReturnValuesIF.h
-0x4801;HGIO_UnknownGpioId;;1;HAL_GPIO;fsfw/src/fsfw_hal/linux/gpio/LinuxLibgpioIF.h
+0x2cb1;CCS_BoardReadingNotFinished;;177;CCSDS_HANDLER_IF;fsfw/src/fsfw/datalinklayer/CCSDSReturnValuesIF.h
-0x4802;HGIO_DriveGpioFailure;;2;HAL_GPIO;fsfw/src/fsfw_hal/linux/gpio/LinuxLibgpioIF.h
+0x2cf0;CCS_NsPositiveW;;240;CCSDS_HANDLER_IF;fsfw/src/fsfw/datalinklayer/CCSDSReturnValuesIF.h
-0x4803;HGIO_GpioTypeFailure;;3;HAL_GPIO;fsfw/src/fsfw_hal/linux/gpio/LinuxLibgpioIF.h
+0x2cf1;CCS_NsNegativeW;;241;CCSDS_HANDLER_IF;fsfw/src/fsfw/datalinklayer/CCSDSReturnValuesIF.h
-0x4804;HGIO_GpioInvalidInstance;;4;HAL_GPIO;fsfw/src/fsfw_hal/linux/gpio/LinuxLibgpioIF.h
+0x2cf2;CCS_NsLockout;;242;CCSDS_HANDLER_IF;fsfw/src/fsfw/datalinklayer/CCSDSReturnValuesIF.h
-0x4805;HGIO_GpioDuplicateDetected;;5;HAL_GPIO;fsfw/src/fsfw_hal/linux/gpio/LinuxLibgpioIF.h
+0x2cf3;CCS_FarmInLockout;;243;CCSDS_HANDLER_IF;fsfw/src/fsfw/datalinklayer/CCSDSReturnValuesIF.h
-0x4806;HGIO_GpioInitFailed;;6;HAL_GPIO;fsfw/src/fsfw_hal/linux/gpio/LinuxLibgpioIF.h
+0x2cf4;CCS_FarmInWait;;244;CCSDS_HANDLER_IF;fsfw/src/fsfw/datalinklayer/CCSDSReturnValuesIF.h
-0x4807;HGIO_GpioGetValueFailed;;7;HAL_GPIO;fsfw/src/fsfw_hal/linux/gpio/LinuxLibgpioIF.h
+0x2ce0;CCS_WrongSymbol;;224;CCSDS_HANDLER_IF;fsfw/src/fsfw/datalinklayer/CCSDSReturnValuesIF.h
-0x4601;HURT_UartReadFailure;;1;HAL_UART;fsfw/src/fsfw_hal/linux/uart/UartComIF.h
+0x2ce1;CCS_DoubleStart;;225;CCSDS_HANDLER_IF;fsfw/src/fsfw/datalinklayer/CCSDSReturnValuesIF.h
-0x4602;HURT_UartReadSizeMissmatch;;2;HAL_UART;fsfw/src/fsfw_hal/linux/uart/UartComIF.h
+0x2ce2;CCS_StartSymbolMissed;;226;CCSDS_HANDLER_IF;fsfw/src/fsfw/datalinklayer/CCSDSReturnValuesIF.h
-0x4603;HURT_UartRxBufferTooSmall;;3;HAL_UART;fsfw/src/fsfw_hal/linux/uart/UartComIF.h
+0x2ce3;CCS_EndWithoutStart;;227;CCSDS_HANDLER_IF;fsfw/src/fsfw/datalinklayer/CCSDSReturnValuesIF.h
-0x4400;UXOS_ExecutionFinished;Execution of the current command has finished;0;LINUX_OSAL;fsfw/src/fsfw_hal/linux/CommandExecutor.h
+0x2ce4;CCS_TooLarge;;228;CCSDS_HANDLER_IF;fsfw/src/fsfw/datalinklayer/CCSDSReturnValuesIF.h
-0x4401;UXOS_CommandPending;Command is pending. This will also be returned if the user tries to load another command but a command is still pending;1;LINUX_OSAL;fsfw/src/fsfw_hal/linux/CommandExecutor.h
+0x2ce5;CCS_TooShort;;229;CCSDS_HANDLER_IF;fsfw/src/fsfw/datalinklayer/CCSDSReturnValuesIF.h
-0x4402;UXOS_BytesRead;Some bytes have been read from the executing process;2;LINUX_OSAL;fsfw/src/fsfw_hal/linux/CommandExecutor.h
+0x2ce6;CCS_WrongTfVersion;;230;CCSDS_HANDLER_IF;fsfw/src/fsfw/datalinklayer/CCSDSReturnValuesIF.h
-0x4403;UXOS_CommandError;Command execution failed;3;LINUX_OSAL;fsfw/src/fsfw_hal/linux/CommandExecutor.h
+0x2ce7;CCS_WrongSpacecraftId;;231;CCSDS_HANDLER_IF;fsfw/src/fsfw/datalinklayer/CCSDSReturnValuesIF.h
-0x4404;UXOS_NoCommandLoadedOrPending;;4;LINUX_OSAL;fsfw/src/fsfw_hal/linux/CommandExecutor.h
+0x2ce8;CCS_NoValidFrameType;;232;CCSDS_HANDLER_IF;fsfw/src/fsfw/datalinklayer/CCSDSReturnValuesIF.h
-0x4406;UXOS_PcloseCallError;;6;LINUX_OSAL;fsfw/src/fsfw_hal/linux/CommandExecutor.h
+0x2ce9;CCS_CrcFailed;;233;CCSDS_HANDLER_IF;fsfw/src/fsfw/datalinklayer/CCSDSReturnValuesIF.h
-0x2801;SM_DataTooLarge;;1;STORAGE_MANAGER_IF;fsfw/src/fsfw/storagemanager/StorageManagerIF.h
+0x2cea;CCS_VcNotFound;;234;CCSDS_HANDLER_IF;fsfw/src/fsfw/datalinklayer/CCSDSReturnValuesIF.h
-0x2802;SM_DataStorageFull;;2;STORAGE_MANAGER_IF;fsfw/src/fsfw/storagemanager/StorageManagerIF.h
+0x2ceb;CCS_ForwardingFailed;;235;CCSDS_HANDLER_IF;fsfw/src/fsfw/datalinklayer/CCSDSReturnValuesIF.h
-0x2803;SM_IllegalStorageId;;3;STORAGE_MANAGER_IF;fsfw/src/fsfw/storagemanager/StorageManagerIF.h
+0x2cec;CCS_ContentTooLarge;;236;CCSDS_HANDLER_IF;fsfw/src/fsfw/datalinklayer/CCSDSReturnValuesIF.h
-0x2804;SM_DataDoesNotExist;;4;STORAGE_MANAGER_IF;fsfw/src/fsfw/storagemanager/StorageManagerIF.h
+0x2ced;CCS_ResidualData;;237;CCSDS_HANDLER_IF;fsfw/src/fsfw/datalinklayer/CCSDSReturnValuesIF.h
-0x2805;SM_IllegalAddress;;5;STORAGE_MANAGER_IF;fsfw/src/fsfw/storagemanager/StorageManagerIF.h
+0x2cee;CCS_DataCorrupted;;238;CCSDS_HANDLER_IF;fsfw/src/fsfw/datalinklayer/CCSDSReturnValuesIF.h
-0x2806;SM_PoolTooLarge;;6;STORAGE_MANAGER_IF;fsfw/src/fsfw/storagemanager/StorageManagerIF.h
+0x2cef;CCS_IllegalSegmentationFlag;;239;CCSDS_HANDLER_IF;fsfw/src/fsfw/datalinklayer/CCSDSReturnValuesIF.h
-0x0601;PP_DoItMyself;;1;HAS_MEMORY_IF;fsfw/src/fsfw/memory/HasMemoryIF.h
+0x2cd0;CCS_IllegalFlagCombination;;208;CCSDS_HANDLER_IF;fsfw/src/fsfw/datalinklayer/CCSDSReturnValuesIF.h
-0x0602;PP_PointsToVariable;;2;HAS_MEMORY_IF;fsfw/src/fsfw/memory/HasMemoryIF.h
+0x2cd1;CCS_ShorterThanHeader;;209;CCSDS_HANDLER_IF;fsfw/src/fsfw/datalinklayer/CCSDSReturnValuesIF.h
-0x0603;PP_PointsToMemory;;3;HAS_MEMORY_IF;fsfw/src/fsfw/memory/HasMemoryIF.h
+0x2cd2;CCS_TooShortBlockedPacket;;210;CCSDS_HANDLER_IF;fsfw/src/fsfw/datalinklayer/CCSDSReturnValuesIF.h
-0x0604;PP_ActivityCompleted;;4;HAS_MEMORY_IF;fsfw/src/fsfw/memory/HasMemoryIF.h
+0x2cd3;CCS_TooShortMapExtraction;;211;CCSDS_HANDLER_IF;fsfw/src/fsfw/datalinklayer/CCSDSReturnValuesIF.h
-0x0605;PP_PointsToVectorUint8;;5;HAS_MEMORY_IF;fsfw/src/fsfw/memory/HasMemoryIF.h
+0x3b00;SPH_ConnBroken;;0;SEMAPHORE_IF;fsfw/src/fsfw/osal/common/TcpTmTcServer.h
-0x0606;PP_PointsToVectorUint16;;6;HAS_MEMORY_IF;fsfw/src/fsfw/memory/HasMemoryIF.h
+0x2a01;IEC_NoConfigurationTable;;1;INTERNAL_ERROR_CODES;fsfw/src/fsfw/osal/InternalErrorCodes.h
-0x0607;PP_PointsToVectorUint32;;7;HAS_MEMORY_IF;fsfw/src/fsfw/memory/HasMemoryIF.h
+0x2a02;IEC_NoCpuTable;;2;INTERNAL_ERROR_CODES;fsfw/src/fsfw/osal/InternalErrorCodes.h
-0x0608;PP_PointsToVectorFloat;;8;HAS_MEMORY_IF;fsfw/src/fsfw/memory/HasMemoryIF.h
+0x2a03;IEC_InvalidWorkspaceAddress;;3;INTERNAL_ERROR_CODES;fsfw/src/fsfw/osal/InternalErrorCodes.h
-0x06a0;PP_DumpNotSupported;;160;HAS_MEMORY_IF;fsfw/src/fsfw/memory/HasMemoryIF.h
+0x2a04;IEC_TooLittleWorkspace;;4;INTERNAL_ERROR_CODES;fsfw/src/fsfw/osal/InternalErrorCodes.h
-0x06e0;PP_InvalidSize;;224;HAS_MEMORY_IF;fsfw/src/fsfw/memory/HasMemoryIF.h
+0x2a05;IEC_WorkspaceAllocation;;5;INTERNAL_ERROR_CODES;fsfw/src/fsfw/osal/InternalErrorCodes.h
-0x06e1;PP_InvalidAddress;;225;HAS_MEMORY_IF;fsfw/src/fsfw/memory/HasMemoryIF.h
+0x2a06;IEC_InterruptStackTooSmall;;6;INTERNAL_ERROR_CODES;fsfw/src/fsfw/osal/InternalErrorCodes.h
-0x06e2;PP_InvalidContent;;226;HAS_MEMORY_IF;fsfw/src/fsfw/memory/HasMemoryIF.h
+0x2a07;IEC_ThreadExitted;;7;INTERNAL_ERROR_CODES;fsfw/src/fsfw/osal/InternalErrorCodes.h
-0x06e3;PP_UnalignedAccess;;227;HAS_MEMORY_IF;fsfw/src/fsfw/memory/HasMemoryIF.h
+0x2a08;IEC_InconsistentMpInformation;;8;INTERNAL_ERROR_CODES;fsfw/src/fsfw/osal/InternalErrorCodes.h
-0x06e4;PP_WriteProtected;;228;HAS_MEMORY_IF;fsfw/src/fsfw/memory/HasMemoryIF.h
+0x2a09;IEC_InvalidNode;;9;INTERNAL_ERROR_CODES;fsfw/src/fsfw/osal/InternalErrorCodes.h
-0x4300;FILS_GenericFileError;;0;FILE_SYSTEM;fsfw/src/fsfw/memory/HasFileSystemIF.h
+0x2a0a;IEC_NoMpci;;10;INTERNAL_ERROR_CODES;fsfw/src/fsfw/osal/InternalErrorCodes.h
-0x4301;FILS_IsBusy;;1;FILE_SYSTEM;fsfw/src/fsfw/memory/HasFileSystemIF.h
+0x2a0b;IEC_BadPacket;;11;INTERNAL_ERROR_CODES;fsfw/src/fsfw/osal/InternalErrorCodes.h
-0x4302;FILS_InvalidParameters;;2;FILE_SYSTEM;fsfw/src/fsfw/memory/HasFileSystemIF.h
+0x2a0c;IEC_OutOfPackets;;12;INTERNAL_ERROR_CODES;fsfw/src/fsfw/osal/InternalErrorCodes.h
-0x4305;FILS_FileDoesNotExist;;5;FILE_SYSTEM;fsfw/src/fsfw/memory/HasFileSystemIF.h
+0x2a0d;IEC_OutOfGlobalObjects;;13;INTERNAL_ERROR_CODES;fsfw/src/fsfw/osal/InternalErrorCodes.h
-0x4306;FILS_FileAlreadyExists;;6;FILE_SYSTEM;fsfw/src/fsfw/memory/HasFileSystemIF.h
+0x2a0e;IEC_OutOfProxies;;14;INTERNAL_ERROR_CODES;fsfw/src/fsfw/osal/InternalErrorCodes.h
-0x4307;FILS_FileLocked;;7;FILE_SYSTEM;fsfw/src/fsfw/memory/HasFileSystemIF.h
+0x2a0f;IEC_InvalidGlobalId;;15;INTERNAL_ERROR_CODES;fsfw/src/fsfw/osal/InternalErrorCodes.h
-0x430a;FILS_DirectoryDoesNotExist;;10;FILE_SYSTEM;fsfw/src/fsfw/memory/HasFileSystemIF.h
+0x2a10;IEC_BadStackHook;;16;INTERNAL_ERROR_CODES;fsfw/src/fsfw/osal/InternalErrorCodes.h
-0x430b;FILS_DirectoryAlreadyExists;;11;FILE_SYSTEM;fsfw/src/fsfw/memory/HasFileSystemIF.h
+0x2a11;IEC_BadAttributes;;17;INTERNAL_ERROR_CODES;fsfw/src/fsfw/osal/InternalErrorCodes.h
-0x430c;FILS_DirectoryNotEmpty;;12;FILE_SYSTEM;fsfw/src/fsfw/memory/HasFileSystemIF.h
+0x2a12;IEC_ImplementationKeyCreateInconsistency;;18;INTERNAL_ERROR_CODES;fsfw/src/fsfw/osal/InternalErrorCodes.h
-0x430f;FILS_SequencePacketMissingWrite;;15;FILE_SYSTEM;fsfw/src/fsfw/memory/HasFileSystemIF.h
+0x2a13;IEC_ImplementationBlockingOperationCancel;;19;INTERNAL_ERROR_CODES;fsfw/src/fsfw/osal/InternalErrorCodes.h
-0x4310;FILS_SequencePacketMissingRead;;16;FILE_SYSTEM;fsfw/src/fsfw/memory/HasFileSystemIF.h
+0x2a14;IEC_MutexObtainFromBadState;;20;INTERNAL_ERROR_CODES;fsfw/src/fsfw/osal/InternalErrorCodes.h
-0x13e0;MH_UnknownCmd;;224;MEMORY_HELPER;fsfw/src/fsfw/memory/MemoryHelper.h
+0x2a15;IEC_UnlimitedAndMaximumIs0;;21;INTERNAL_ERROR_CODES;fsfw/src/fsfw/osal/InternalErrorCodes.h
-0x13e1;MH_InvalidAddress;;225;MEMORY_HELPER;fsfw/src/fsfw/memory/MemoryHelper.h
-0x13e2;MH_InvalidSize;;226;MEMORY_HELPER;fsfw/src/fsfw/memory/MemoryHelper.h
-0x13e3;MH_StateMismatch;;227;MEMORY_HELPER;fsfw/src/fsfw/memory/MemoryHelper.h
-0x38a1;SGP4_InvalidEccentricity;;161;SGP4PROPAGATOR_CLASS;fsfw/src/fsfw/coordinates/Sgp4Propagator.h
-0x38a2;SGP4_InvalidMeanMotion;;162;SGP4PROPAGATOR_CLASS;fsfw/src/fsfw/coordinates/Sgp4Propagator.h
-0x38a3;SGP4_InvalidPerturbationElements;;163;SGP4PROPAGATOR_CLASS;fsfw/src/fsfw/coordinates/Sgp4Propagator.h
-0x38a4;SGP4_InvalidSemiLatusRectum;;164;SGP4PROPAGATOR_CLASS;fsfw/src/fsfw/coordinates/Sgp4Propagator.h
-0x38a5;SGP4_InvalidEpochElements;;165;SGP4PROPAGATOR_CLASS;fsfw/src/fsfw/coordinates/Sgp4Propagator.h
-0x38a6;SGP4_SatelliteHasDecayed;;166;SGP4PROPAGATOR_CLASS;fsfw/src/fsfw/coordinates/Sgp4Propagator.h
-0x38b1;SGP4_TleTooOld;;177;SGP4PROPAGATOR_CLASS;fsfw/src/fsfw/coordinates/Sgp4Propagator.h
-0x38b2;SGP4_TleNotInitialized;;178;SGP4PROPAGATOR_CLASS;fsfw/src/fsfw/coordinates/Sgp4Propagator.h
-0x1101;AL_Full;;1;ARRAY_LIST;fsfw/src/fsfw/container/ArrayList.h
-0x1501;FM_KeyAlreadyExists;;1;FIXED_MAP;fsfw/src/fsfw/container/FixedMap.h
-0x1502;FM_MapFull;;2;FIXED_MAP;fsfw/src/fsfw/container/FixedMap.h
-0x1503;FM_KeyDoesNotExist;;3;FIXED_MAP;fsfw/src/fsfw/container/FixedMap.h
-0x1801;FF_Full;;1;FIFO_CLASS;fsfw/src/fsfw/container/FIFOBase.h
-0x1802;FF_Empty;;2;FIFO_CLASS;fsfw/src/fsfw/container/FIFOBase.h
-0x1601;FMM_MapFull;;1;FIXED_MULTIMAP;fsfw/src/fsfw/container/FixedOrderedMultimap.h
-0x1602;FMM_KeyDoesNotExist;;2;FIXED_MULTIMAP;fsfw/src/fsfw/container/FixedOrderedMultimap.h
-0x3901;MUX_NotEnoughResources;;1;MUTEX_IF;fsfw/src/fsfw/ipc/MutexIF.h
-0x3902;MUX_InsufficientMemory;;2;MUTEX_IF;fsfw/src/fsfw/ipc/MutexIF.h
-0x3903;MUX_NoPrivilege;;3;MUTEX_IF;fsfw/src/fsfw/ipc/MutexIF.h
-0x3904;MUX_WrongAttributeSetting;;4;MUTEX_IF;fsfw/src/fsfw/ipc/MutexIF.h
-0x3905;MUX_MutexAlreadyLocked;;5;MUTEX_IF;fsfw/src/fsfw/ipc/MutexIF.h
-0x3906;MUX_MutexNotFound;;6;MUTEX_IF;fsfw/src/fsfw/ipc/MutexIF.h
-0x3907;MUX_MutexMaxLocks;;7;MUTEX_IF;fsfw/src/fsfw/ipc/MutexIF.h
-0x3908;MUX_CurrThreadAlreadyOwnsMutex;;8;MUTEX_IF;fsfw/src/fsfw/ipc/MutexIF.h
-0x3909;MUX_CurrThreadDoesNotOwnMutex;;9;MUTEX_IF;fsfw/src/fsfw/ipc/MutexIF.h
-0x390a;MUX_MutexTimeout;;10;MUTEX_IF;fsfw/src/fsfw/ipc/MutexIF.h
-0x390b;MUX_MutexInvalidId;;11;MUTEX_IF;fsfw/src/fsfw/ipc/MutexIF.h
-0x390c;MUX_MutexDestroyedWhileWaiting;;12;MUTEX_IF;fsfw/src/fsfw/ipc/MutexIF.h
-0x3a01;MQI_Empty;;1;MESSAGE_QUEUE_IF;fsfw/src/fsfw/ipc/MessageQueueIF.h
-0x3a02;MQI_Full;No space left for more messages;2;MESSAGE_QUEUE_IF;fsfw/src/fsfw/ipc/MessageQueueIF.h
-0x3a03;MQI_NoReplyPartner;Returned if a reply method was called without partner;3;MESSAGE_QUEUE_IF;fsfw/src/fsfw/ipc/MessageQueueIF.h
-0x3a04;MQI_DestinationInvalid;Returned if the target destination is invalid.;4;MESSAGE_QUEUE_IF;fsfw/src/fsfw/ipc/MessageQueueIF.h
-0x0f01;CM_UnknownCommand;;1;COMMAND_MESSAGE;fsfw/src/fsfw/ipc/CommandMessageIF.h
 0x0e01;HM_InvalidMode;;1;HAS_MODES_IF;fsfw/src/fsfw/modes/HasModesIF.h
 0x0e02;HM_TransNotAllowed;;2;HAS_MODES_IF;fsfw/src/fsfw/modes/HasModesIF.h
 0x0e03;HM_InTransition;;3;HAS_MODES_IF;fsfw/src/fsfw/modes/HasModesIF.h
 0x0e04;HM_InvalidSubmode;;4;HAS_MODES_IF;fsfw/src/fsfw/modes/HasModesIF.h
-0x0c02;MS_InvalidEntry;;2;MODE_STORE_IF;fsfw/src/fsfw/subsystem/modes/ModeStoreIF.h
+0x2e01;HPA_InvalidIdentifierId;;1;HAS_PARAMETERS_IF;fsfw/src/fsfw/parameters/HasParametersIF.h
-0x0c03;MS_TooManyElements;;3;MODE_STORE_IF;fsfw/src/fsfw/subsystem/modes/ModeStoreIF.h
+0x2e02;HPA_InvalidDomainId;;2;HAS_PARAMETERS_IF;fsfw/src/fsfw/parameters/HasParametersIF.h
-0x0c04;MS_CantStoreEmpty;;4;MODE_STORE_IF;fsfw/src/fsfw/subsystem/modes/ModeStoreIF.h
+0x2e03;HPA_InvalidValue;;3;HAS_PARAMETERS_IF;fsfw/src/fsfw/parameters/HasParametersIF.h
-0x0b01;SB_ChildNotFound;;1;SUBSYSTEM_BASE;fsfw/src/fsfw/subsystem/SubsystemBase.h
+0x2e05;HPA_ReadOnly;;5;HAS_PARAMETERS_IF;fsfw/src/fsfw/parameters/HasParametersIF.h
-0x0b02;SB_ChildInfoUpdated;;2;SUBSYSTEM_BASE;fsfw/src/fsfw/subsystem/SubsystemBase.h
+0x2d01;PAW_UnknownDatatype;;1;PARAMETER_WRAPPER;fsfw/src/fsfw/parameters/ParameterWrapper.h
-0x0b03;SB_ChildDoesntHaveModes;;3;SUBSYSTEM_BASE;fsfw/src/fsfw/subsystem/SubsystemBase.h
+0x2d02;PAW_DatatypeMissmatch;;2;PARAMETER_WRAPPER;fsfw/src/fsfw/parameters/ParameterWrapper.h
-0x0b04;SB_CouldNotInsertChild;;4;SUBSYSTEM_BASE;fsfw/src/fsfw/subsystem/SubsystemBase.h
+0x2d03;PAW_Readonly;;3;PARAMETER_WRAPPER;fsfw/src/fsfw/parameters/ParameterWrapper.h
-0x0b05;SB_TableContainsInvalidObjectId;;5;SUBSYSTEM_BASE;fsfw/src/fsfw/subsystem/SubsystemBase.h
+0x2d04;PAW_TooBig;;4;PARAMETER_WRAPPER;fsfw/src/fsfw/parameters/ParameterWrapper.h
-0x0d01;SS_SequenceAlreadyExists;;1;SUBSYSTEM;fsfw/src/fsfw/subsystem/Subsystem.h
+0x2d05;PAW_SourceNotSet;;5;PARAMETER_WRAPPER;fsfw/src/fsfw/parameters/ParameterWrapper.h
-0x0d02;SS_TableAlreadyExists;;2;SUBSYSTEM;fsfw/src/fsfw/subsystem/Subsystem.h
+0x2d06;PAW_OutOfBounds;;6;PARAMETER_WRAPPER;fsfw/src/fsfw/parameters/ParameterWrapper.h
-0x0d03;SS_TableDoesNotExist;;3;SUBSYSTEM;fsfw/src/fsfw/subsystem/Subsystem.h
+0x2d07;PAW_NotSet;;7;PARAMETER_WRAPPER;fsfw/src/fsfw/parameters/ParameterWrapper.h
-0x0d04;SS_TableOrSequenceLengthInvalid;;4;SUBSYSTEM;fsfw/src/fsfw/subsystem/Subsystem.h
+0x2d08;PAW_ColumnOrRowsZero;;8;PARAMETER_WRAPPER;fsfw/src/fsfw/parameters/ParameterWrapper.h
-0x0d05;SS_SequenceDoesNotExist;;5;SUBSYSTEM;fsfw/src/fsfw/subsystem/Subsystem.h
+0x3201;CF_ObjectHasNoFunctions;;1;COMMANDS_ACTIONS_IF;fsfw/src/fsfw/action/CommandsActionsIF.h
-0x0d06;SS_TableContainsInvalidObjectId;;6;SUBSYSTEM;fsfw/src/fsfw/subsystem/Subsystem.h
+0x3202;CF_AlreadyCommanding;;2;COMMANDS_ACTIONS_IF;fsfw/src/fsfw/action/CommandsActionsIF.h
-0x0d07;SS_FallbackSequenceDoesNotExist;;7;SUBSYSTEM;fsfw/src/fsfw/subsystem/Subsystem.h
+0x3301;HF_IsBusy;;1;HAS_ACTIONS_IF;fsfw/src/fsfw/action/HasActionsIF.h
-0x0d08;SS_NoTargetTable;;8;SUBSYSTEM;fsfw/src/fsfw/subsystem/Subsystem.h
+0x3302;HF_InvalidParameters;;2;HAS_ACTIONS_IF;fsfw/src/fsfw/action/HasActionsIF.h
-0x0d09;SS_SequenceOrTableTooLong;;9;SUBSYSTEM;fsfw/src/fsfw/subsystem/Subsystem.h
+0x3303;HF_ExecutionFinished;;3;HAS_ACTIONS_IF;fsfw/src/fsfw/action/HasActionsIF.h
-0x0d0b;SS_IsFallbackSequence;;11;SUBSYSTEM;fsfw/src/fsfw/subsystem/Subsystem.h
+0x3304;HF_InvalidActionId;;4;HAS_ACTIONS_IF;fsfw/src/fsfw/action/HasActionsIF.h
-0x0d0c;SS_AccessDenied;;12;SUBSYSTEM;fsfw/src/fsfw/subsystem/Subsystem.h
+0x0201;OM_InsertionFailed;;1;OBJECT_MANAGER_IF;fsfw/src/fsfw/objectmanager/ObjectManagerIF.h
-0x0d0e;SS_TableInUse;;14;SUBSYSTEM;fsfw/src/fsfw/subsystem/Subsystem.h
+0x0202;OM_NotFound;;2;OBJECT_MANAGER_IF;fsfw/src/fsfw/objectmanager/ObjectManagerIF.h
-0x0da1;SS_TargetTableNotReached;;161;SUBSYSTEM;fsfw/src/fsfw/subsystem/Subsystem.h
+0x0203;OM_ChildInitFailed;;3;OBJECT_MANAGER_IF;fsfw/src/fsfw/objectmanager/ObjectManagerIF.h
-0x0da2;SS_TableCheckFailed;;162;SUBSYSTEM;fsfw/src/fsfw/subsystem/Subsystem.h
+0x0204;OM_InternalErrReporterUninit;;4;OBJECT_MANAGER_IF;fsfw/src/fsfw/objectmanager/ObjectManagerIF.h
-0x2501;EV_ListenerNotFound;;1;EVENT_MANAGER_IF;fsfw/src/fsfw/events/EventManagerIF.h
+0x2600;FDI_YourFault;;0;HANDLES_FAILURES_IF;fsfw/src/fsfw/fdir/ConfirmsFailuresIF.h
+0x2601;FDI_MyFault;;1;HANDLES_FAILURES_IF;fsfw/src/fsfw/fdir/ConfirmsFailuresIF.h
+0x2602;FDI_ConfirmLater;;2;HANDLES_FAILURES_IF;fsfw/src/fsfw/fdir/ConfirmsFailuresIF.h
+0x2201;TMF_Busy;;1;TM_STORE_FRONTEND_IF;fsfw/src/fsfw/tmstorage/TmStoreFrontendIF.h
+0x2202;TMF_LastPacketFound;;2;TM_STORE_FRONTEND_IF;fsfw/src/fsfw/tmstorage/TmStoreFrontendIF.h
+0x2203;TMF_StopFetch;;3;TM_STORE_FRONTEND_IF;fsfw/src/fsfw/tmstorage/TmStoreFrontendIF.h
+0x2204;TMF_Timeout;;4;TM_STORE_FRONTEND_IF;fsfw/src/fsfw/tmstorage/TmStoreFrontendIF.h
+0x2205;TMF_TmChannelFull;;5;TM_STORE_FRONTEND_IF;fsfw/src/fsfw/tmstorage/TmStoreFrontendIF.h
+0x2206;TMF_NotStored;;6;TM_STORE_FRONTEND_IF;fsfw/src/fsfw/tmstorage/TmStoreFrontendIF.h
+0x2207;TMF_AllDeleted;;7;TM_STORE_FRONTEND_IF;fsfw/src/fsfw/tmstorage/TmStoreFrontendIF.h
+0x2208;TMF_InvalidData;;8;TM_STORE_FRONTEND_IF;fsfw/src/fsfw/tmstorage/TmStoreFrontendIF.h
+0x2209;TMF_NotReady;;9;TM_STORE_FRONTEND_IF;fsfw/src/fsfw/tmstorage/TmStoreFrontendIF.h
+0x2101;TMB_Busy;;1;TM_STORE_BACKEND_IF;fsfw/src/fsfw/tmstorage/TmStoreBackendIF.h
+0x2102;TMB_Full;;2;TM_STORE_BACKEND_IF;fsfw/src/fsfw/tmstorage/TmStoreBackendIF.h
+0x2103;TMB_Empty;;3;TM_STORE_BACKEND_IF;fsfw/src/fsfw/tmstorage/TmStoreBackendIF.h
+0x2104;TMB_NullRequested;;4;TM_STORE_BACKEND_IF;fsfw/src/fsfw/tmstorage/TmStoreBackendIF.h
+0x2105;TMB_TooLarge;;5;TM_STORE_BACKEND_IF;fsfw/src/fsfw/tmstorage/TmStoreBackendIF.h
+0x2106;TMB_NotReady;;6;TM_STORE_BACKEND_IF;fsfw/src/fsfw/tmstorage/TmStoreBackendIF.h
+0x2107;TMB_DumpError;;7;TM_STORE_BACKEND_IF;fsfw/src/fsfw/tmstorage/TmStoreBackendIF.h
+0x2108;TMB_CrcError;;8;TM_STORE_BACKEND_IF;fsfw/src/fsfw/tmstorage/TmStoreBackendIF.h
+0x2109;TMB_Timeout;;9;TM_STORE_BACKEND_IF;fsfw/src/fsfw/tmstorage/TmStoreBackendIF.h
+0x210a;TMB_IdlePacketFound;;10;TM_STORE_BACKEND_IF;fsfw/src/fsfw/tmstorage/TmStoreBackendIF.h
+0x210b;TMB_TelecommandFound;;11;TM_STORE_BACKEND_IF;fsfw/src/fsfw/tmstorage/TmStoreBackendIF.h
+0x210c;TMB_NoPusATm;;12;TM_STORE_BACKEND_IF;fsfw/src/fsfw/tmstorage/TmStoreBackendIF.h
+0x210d;TMB_TooSmall;;13;TM_STORE_BACKEND_IF;fsfw/src/fsfw/tmstorage/TmStoreBackendIF.h
+0x210e;TMB_BlockNotFound;;14;TM_STORE_BACKEND_IF;fsfw/src/fsfw/tmstorage/TmStoreBackendIF.h
+0x210f;TMB_InvalidRequest;;15;TM_STORE_BACKEND_IF;fsfw/src/fsfw/tmstorage/TmStoreBackendIF.h
+0x1c01;TCD_PacketLost;;1;PACKET_DISTRIBUTION;fsfw/src/fsfw/tcdistribution/TcDistributorBase.h
+0x1c02;TCD_DestinationNotFound;;2;PACKET_DISTRIBUTION;fsfw/src/fsfw/tcdistribution/TcDistributorBase.h
+0x1c03;TCD_ServiceIdAlreadyExists;;3;PACKET_DISTRIBUTION;fsfw/src/fsfw/tcdistribution/TcDistributorBase.h
+0x1b00;TCC_NoDestinationFound;;0;TMTC_DISTRIBUTION;fsfw/src/fsfw/tcdistribution/definitions.h
+0x1b01;TCC_InvalidCcsdsVersion;;1;TMTC_DISTRIBUTION;fsfw/src/fsfw/tcdistribution/definitions.h
+0x1b02;TCC_InvalidApid;;2;TMTC_DISTRIBUTION;fsfw/src/fsfw/tcdistribution/definitions.h
+0x1b03;TCC_InvalidPacketType;;3;TMTC_DISTRIBUTION;fsfw/src/fsfw/tcdistribution/definitions.h
+0x1b04;TCC_InvalidSecHeaderField;;4;TMTC_DISTRIBUTION;fsfw/src/fsfw/tcdistribution/definitions.h
+0x1b05;TCC_IncorrectPrimaryHeader;;5;TMTC_DISTRIBUTION;fsfw/src/fsfw/tcdistribution/definitions.h
+0x1b07;TCC_IncompletePacket;;7;TMTC_DISTRIBUTION;fsfw/src/fsfw/tcdistribution/definitions.h
+0x1b08;TCC_InvalidPusVersion;;8;TMTC_DISTRIBUTION;fsfw/src/fsfw/tcdistribution/definitions.h
+0x1b09;TCC_IncorrectChecksum;;9;TMTC_DISTRIBUTION;fsfw/src/fsfw/tcdistribution/definitions.h
+0x1b0a;TCC_IllegalPacketSubtype;;10;TMTC_DISTRIBUTION;fsfw/src/fsfw/tcdistribution/definitions.h
+0x1b0b;TCC_IncorrectSecondaryHeader;;11;TMTC_DISTRIBUTION;fsfw/src/fsfw/tcdistribution/definitions.h
 0x04e1;RMP_CommandNoDescriptorsAvailable;;225;RMAP_CHANNEL;fsfw/src/fsfw/rmap/RMAP.h
 0x04e2;RMP_CommandBufferFull;;226;RMAP_CHANNEL;fsfw/src/fsfw/rmap/RMAP.h
 0x04e3;RMP_CommandChannelOutOfRange;;227;RMAP_CHANNEL;fsfw/src/fsfw/rmap/RMAP.h
@@ -204,9 +208,95 @@ Full ID (hex); Name; Description; Unique ID; Subsytem Name; File Path
 0x040a;RMP_ReplyCommandNotImplementedOrNotAuthorised;;10;RMAP_CHANNEL;fsfw/src/fsfw/rmap/RMAP.h
 0x040b;RMP_ReplyRmwDataLengthError;;11;RMAP_CHANNEL;fsfw/src/fsfw/rmap/RMAP.h
 0x040c;RMP_ReplyInvalidTargetLogicalAddress;;12;RMAP_CHANNEL;fsfw/src/fsfw/rmap/RMAP.h
-0x1401;SE_BufferTooShort;;1;SERIALIZE_IF;fsfw/src/fsfw/serialize/SerializeIF.h
+0x2801;SM_DataTooLarge;;1;STORAGE_MANAGER_IF;fsfw/src/fsfw/storagemanager/StorageManagerIF.h
-0x1402;SE_StreamTooShort;;2;SERIALIZE_IF;fsfw/src/fsfw/serialize/SerializeIF.h
+0x2802;SM_DataStorageFull;;2;STORAGE_MANAGER_IF;fsfw/src/fsfw/storagemanager/StorageManagerIF.h
-0x1403;SE_TooManyElements;;3;SERIALIZE_IF;fsfw/src/fsfw/serialize/SerializeIF.h
+0x2803;SM_IllegalStorageId;;3;STORAGE_MANAGER_IF;fsfw/src/fsfw/storagemanager/StorageManagerIF.h
+0x2804;SM_DataDoesNotExist;;4;STORAGE_MANAGER_IF;fsfw/src/fsfw/storagemanager/StorageManagerIF.h
+0x2805;SM_IllegalAddress;;5;STORAGE_MANAGER_IF;fsfw/src/fsfw/storagemanager/StorageManagerIF.h
+0x2806;SM_PoolTooLarge;;6;STORAGE_MANAGER_IF;fsfw/src/fsfw/storagemanager/StorageManagerIF.h
+0x38a1;SGP4_InvalidEccentricity;;161;SGP4PROPAGATOR_CLASS;fsfw/src/fsfw/coordinates/Sgp4Propagator.h
+0x38a2;SGP4_InvalidMeanMotion;;162;SGP4PROPAGATOR_CLASS;fsfw/src/fsfw/coordinates/Sgp4Propagator.h
+0x38a3;SGP4_InvalidPerturbationElements;;163;SGP4PROPAGATOR_CLASS;fsfw/src/fsfw/coordinates/Sgp4Propagator.h
+0x38a4;SGP4_InvalidSemiLatusRectum;;164;SGP4PROPAGATOR_CLASS;fsfw/src/fsfw/coordinates/Sgp4Propagator.h
+0x38a5;SGP4_InvalidEpochElements;;165;SGP4PROPAGATOR_CLASS;fsfw/src/fsfw/coordinates/Sgp4Propagator.h
+0x38a6;SGP4_SatelliteHasDecayed;;166;SGP4PROPAGATOR_CLASS;fsfw/src/fsfw/coordinates/Sgp4Propagator.h
+0x38b1;SGP4_TleTooOld;;177;SGP4PROPAGATOR_CLASS;fsfw/src/fsfw/coordinates/Sgp4Propagator.h
+0x38b2;SGP4_TleNotInitialized;;178;SGP4PROPAGATOR_CLASS;fsfw/src/fsfw/coordinates/Sgp4Propagator.h
+0x2401;MT_TooDetailedRequest;;1;MATCH_TREE_CLASS;fsfw/src/fsfw/globalfunctions/matching/MatchTree.h
+0x2402;MT_TooGeneralRequest;;2;MATCH_TREE_CLASS;fsfw/src/fsfw/globalfunctions/matching/MatchTree.h
+0x2403;MT_NoMatch;;3;MATCH_TREE_CLASS;fsfw/src/fsfw/globalfunctions/matching/MatchTree.h
+0x2404;MT_Full;;4;MATCH_TREE_CLASS;fsfw/src/fsfw/globalfunctions/matching/MatchTree.h
+0x2405;MT_NewNodeCreated;;5;MATCH_TREE_CLASS;fsfw/src/fsfw/globalfunctions/matching/MatchTree.h
+0x3f01;DLEE_StreamTooShort;;1;DLE_ENCODER;fsfw/src/fsfw/globalfunctions/DleEncoder.h
+0x3f02;DLEE_DecodingError;;2;DLE_ENCODER;fsfw/src/fsfw/globalfunctions/DleEncoder.h
+0x2f01;ASC_TooLongForTargetType;;1;ASCII_CONVERTER;fsfw/src/fsfw/globalfunctions/AsciiConverter.h
+0x2f02;ASC_InvalidCharacters;;2;ASCII_CONVERTER;fsfw/src/fsfw/globalfunctions/AsciiConverter.h
+0x2f03;ASC_BufferTooSmall;;3;ASCII_CONVERTER;fsfw/src/fsfw/globalfunctions/AsciiConverter.h
+0x0f01;CM_UnknownCommand;;1;COMMAND_MESSAGE;fsfw/src/fsfw/ipc/CommandMessageIF.h
+0x3a01;MQI_Empty;;1;MESSAGE_QUEUE_IF;fsfw/src/fsfw/ipc/MessageQueueIF.h
+0x3a02;MQI_Full;No space left for more messages;2;MESSAGE_QUEUE_IF;fsfw/src/fsfw/ipc/MessageQueueIF.h
+0x3a03;MQI_NoReplyPartner;Returned if a reply method was called without partner;3;MESSAGE_QUEUE_IF;fsfw/src/fsfw/ipc/MessageQueueIF.h
+0x3a04;MQI_DestinationInvalid;Returned if the target destination is invalid.;4;MESSAGE_QUEUE_IF;fsfw/src/fsfw/ipc/MessageQueueIF.h
+0x3901;MUX_NotEnoughResources;;1;MUTEX_IF;fsfw/src/fsfw/ipc/MutexIF.h
+0x3902;MUX_InsufficientMemory;;2;MUTEX_IF;fsfw/src/fsfw/ipc/MutexIF.h
+0x3903;MUX_NoPrivilege;;3;MUTEX_IF;fsfw/src/fsfw/ipc/MutexIF.h
+0x3904;MUX_WrongAttributeSetting;;4;MUTEX_IF;fsfw/src/fsfw/ipc/MutexIF.h
+0x3905;MUX_MutexAlreadyLocked;;5;MUTEX_IF;fsfw/src/fsfw/ipc/MutexIF.h
+0x3906;MUX_MutexNotFound;;6;MUTEX_IF;fsfw/src/fsfw/ipc/MutexIF.h
+0x3907;MUX_MutexMaxLocks;;7;MUTEX_IF;fsfw/src/fsfw/ipc/MutexIF.h
+0x3908;MUX_CurrThreadAlreadyOwnsMutex;;8;MUTEX_IF;fsfw/src/fsfw/ipc/MutexIF.h
+0x3909;MUX_CurrThreadDoesNotOwnMutex;;9;MUTEX_IF;fsfw/src/fsfw/ipc/MutexIF.h
+0x390a;MUX_MutexTimeout;;10;MUTEX_IF;fsfw/src/fsfw/ipc/MutexIF.h
+0x390b;MUX_MutexInvalidId;;11;MUTEX_IF;fsfw/src/fsfw/ipc/MutexIF.h
+0x390c;MUX_MutexDestroyedWhileWaiting;;12;MUTEX_IF;fsfw/src/fsfw/ipc/MutexIF.h
+0x3b01;SPH_SemaphoreTimeout;;1;SEMAPHORE_IF;fsfw/src/fsfw/tasks/SemaphoreIF.h
+0x3b02;SPH_SemaphoreNotOwned;;2;SEMAPHORE_IF;fsfw/src/fsfw/tasks/SemaphoreIF.h
+0x3b03;SPH_SemaphoreInvalid;;3;SEMAPHORE_IF;fsfw/src/fsfw/tasks/SemaphoreIF.h
+0x1e00;PUS_InvalidPusVersion;;0;PUS_IF;fsfw/src/fsfw/tmtcpacket/pus/PusIF.h
+0x1e01;PUS_InvalidCrc16;;1;PUS_IF;fsfw/src/fsfw/tmtcpacket/pus/PusIF.h
+0x3601;CFDP_InvalidTlvType;;1;CFDP;fsfw/src/fsfw/cfdp/definitions.h
+0x3602;CFDP_InvalidDirectiveField;;2;CFDP;fsfw/src/fsfw/cfdp/definitions.h
+0x3603;CFDP_InvalidPduDatafieldLen;;3;CFDP;fsfw/src/fsfw/cfdp/definitions.h
+0x3604;CFDP_InvalidAckDirectiveFields;;4;CFDP;fsfw/src/fsfw/cfdp/definitions.h
+0x3605;CFDP_MetadataCantParseOptions;;5;CFDP;fsfw/src/fsfw/cfdp/definitions.h
+0x3606;CFDP_NakCantParseOptions;;6;CFDP;fsfw/src/fsfw/cfdp/definitions.h
+0x3607;CFDP_FinishedCantParseFsResponses;;7;CFDP;fsfw/src/fsfw/cfdp/definitions.h
+0x3608;CFDP_FilestoreRequiresSecondFile;;8;CFDP;fsfw/src/fsfw/cfdp/definitions.h
+0x3609;CFDP_FilestoreResponseCantParseFsMessage;;9;CFDP;fsfw/src/fsfw/cfdp/definitions.h
+0x360a;CFDP_InvalidPduFormat;;10;CFDP;fsfw/src/fsfw/cfdp/definitions.h
+0x2901;TC_InvalidTargetState;;1;THERMAL_COMPONENT_IF;fsfw/src/fsfw/thermal/ThermalComponentIF.h
+0x29f1;TC_AboveOperationalLimit;;241;THERMAL_COMPONENT_IF;fsfw/src/fsfw/thermal/ThermalComponentIF.h
+0x29f2;TC_BelowOperationalLimit;;242;THERMAL_COMPONENT_IF;fsfw/src/fsfw/thermal/ThermalComponentIF.h
+0x0c02;MS_InvalidEntry;;2;MODE_STORE_IF;fsfw/src/fsfw/subsystem/modes/ModeStoreIF.h
+0x0c03;MS_TooManyElements;;3;MODE_STORE_IF;fsfw/src/fsfw/subsystem/modes/ModeStoreIF.h
+0x0c04;MS_CantStoreEmpty;;4;MODE_STORE_IF;fsfw/src/fsfw/subsystem/modes/ModeStoreIF.h
+0x0d01;SS_SequenceAlreadyExists;;1;SUBSYSTEM;fsfw/src/fsfw/subsystem/Subsystem.h
+0x0d02;SS_TableAlreadyExists;;2;SUBSYSTEM;fsfw/src/fsfw/subsystem/Subsystem.h
+0x0d03;SS_TableDoesNotExist;;3;SUBSYSTEM;fsfw/src/fsfw/subsystem/Subsystem.h
+0x0d04;SS_TableOrSequenceLengthInvalid;;4;SUBSYSTEM;fsfw/src/fsfw/subsystem/Subsystem.h
+0x0d05;SS_SequenceDoesNotExist;;5;SUBSYSTEM;fsfw/src/fsfw/subsystem/Subsystem.h
+0x0d06;SS_TableContainsInvalidObjectId;;6;SUBSYSTEM;fsfw/src/fsfw/subsystem/Subsystem.h
+0x0d07;SS_FallbackSequenceDoesNotExist;;7;SUBSYSTEM;fsfw/src/fsfw/subsystem/Subsystem.h
+0x0d08;SS_NoTargetTable;;8;SUBSYSTEM;fsfw/src/fsfw/subsystem/Subsystem.h
+0x0d09;SS_SequenceOrTableTooLong;;9;SUBSYSTEM;fsfw/src/fsfw/subsystem/Subsystem.h
+0x0d0b;SS_IsFallbackSequence;;11;SUBSYSTEM;fsfw/src/fsfw/subsystem/Subsystem.h
+0x0d0c;SS_AccessDenied;;12;SUBSYSTEM;fsfw/src/fsfw/subsystem/Subsystem.h
+0x0d0e;SS_TableInUse;;14;SUBSYSTEM;fsfw/src/fsfw/subsystem/Subsystem.h
+0x0da1;SS_TargetTableNotReached;;161;SUBSYSTEM;fsfw/src/fsfw/subsystem/Subsystem.h
+0x0da2;SS_TableCheckFailed;;162;SUBSYSTEM;fsfw/src/fsfw/subsystem/Subsystem.h
+0x0b01;SB_ChildNotFound;;1;SUBSYSTEM_BASE;fsfw/src/fsfw/subsystem/SubsystemBase.h
+0x0b02;SB_ChildInfoUpdated;;2;SUBSYSTEM_BASE;fsfw/src/fsfw/subsystem/SubsystemBase.h
+0x0b03;SB_ChildDoesntHaveModes;;3;SUBSYSTEM_BASE;fsfw/src/fsfw/subsystem/SubsystemBase.h
+0x0b04;SB_CouldNotInsertChild;;4;SUBSYSTEM_BASE;fsfw/src/fsfw/subsystem/SubsystemBase.h
+0x0b05;SB_TableContainsInvalidObjectId;;5;SUBSYSTEM_BASE;fsfw/src/fsfw/subsystem/SubsystemBase.h
+0x3e00;HKM_QueueOrDestinationInvalid;;0;HOUSEKEEPING_MANAGER;fsfw/src/fsfw/datapoollocal/LocalDataPoolManager.h
+0x3e01;HKM_WrongHkPacketType;;1;HOUSEKEEPING_MANAGER;fsfw/src/fsfw/datapoollocal/LocalDataPoolManager.h
+0x3e02;HKM_ReportingStatusUnchanged;;2;HOUSEKEEPING_MANAGER;fsfw/src/fsfw/datapoollocal/LocalDataPoolManager.h
+0x3e03;HKM_PeriodicHelperInvalid;;3;HOUSEKEEPING_MANAGER;fsfw/src/fsfw/datapoollocal/LocalDataPoolManager.h
+0x3e04;HKM_PoolobjectNotFound;;4;HOUSEKEEPING_MANAGER;fsfw/src/fsfw/datapoollocal/LocalDataPoolManager.h
+0x3e05;HKM_DatasetNotFound;;5;HOUSEKEEPING_MANAGER;fsfw/src/fsfw/datapoollocal/LocalDataPoolManager.h
+0x3c00;LPIF_PoolEntryNotFound;;0;LOCAL_POOL_OWNER_IF;fsfw/src/fsfw/datapoollocal/localPoolDefinitions.h
+0x3c01;LPIF_PoolEntryTypeConflict;;1;LOCAL_POOL_OWNER_IF;fsfw/src/fsfw/datapoollocal/localPoolDefinitions.h
 0x3da0;PVA_InvalidReadWriteMode;;160;POOL_VARIABLE_IF;fsfw/src/fsfw/datapool/PoolVariableIF.h
 0x3da1;PVA_InvalidPoolEntry;;161;POOL_VARIABLE_IF;fsfw/src/fsfw/datapool/PoolVariableIF.h
 0x0801;DPS_InvalidParameterDefinition;;1;DATA_SET_CLASS;fsfw/src/fsfw/datapool/DataSetIF.h
@@ -215,19 +305,39 @@ Full ID (hex); Name; Description; Unique ID; Subsytem Name; File Path
 0x0804;DPS_DataSetUninitialised;;4;DATA_SET_CLASS;fsfw/src/fsfw/datapool/DataSetIF.h
 0x0805;DPS_DataSetFull;;5;DATA_SET_CLASS;fsfw/src/fsfw/datapool/DataSetIF.h
 0x0806;DPS_PoolVarNull;;6;DATA_SET_CLASS;fsfw/src/fsfw/datapool/DataSetIF.h
-0x1c01;TCD_PacketLost;;1;PACKET_DISTRIBUTION;fsfw/src/fsfw/tcdistribution/TcDistributor.h
+0x1000;TIM_UnsupportedTimeFormat;;0;CCSDS_TIME_HELPER_CLASS;fsfw/src/fsfw/timemanager/CCSDSTime.h
-0x1c02;TCD_DestinationNotFound;;2;PACKET_DISTRIBUTION;fsfw/src/fsfw/tcdistribution/TcDistributor.h
+0x1001;TIM_NotEnoughInformationForTargetFormat;;1;CCSDS_TIME_HELPER_CLASS;fsfw/src/fsfw/timemanager/CCSDSTime.h
-0x1c03;TCD_ServiceIdAlreadyExists;;3;PACKET_DISTRIBUTION;fsfw/src/fsfw/tcdistribution/TcDistributor.h
+0x1002;TIM_LengthMismatch;;2;CCSDS_TIME_HELPER_CLASS;fsfw/src/fsfw/timemanager/CCSDSTime.h
-0x1b00;TCC_InvalidCcsdsVersion;;0;PACKET_CHECK;fsfw/src/fsfw/tcdistribution/definitions.h
+0x1003;TIM_InvalidTimeFormat;;3;CCSDS_TIME_HELPER_CLASS;fsfw/src/fsfw/timemanager/CCSDSTime.h
-0x1b01;TCC_InvalidApid;;1;PACKET_CHECK;fsfw/src/fsfw/tcdistribution/definitions.h
+0x1004;TIM_InvalidDayOfYear;;4;CCSDS_TIME_HELPER_CLASS;fsfw/src/fsfw/timemanager/CCSDSTime.h
-0x1b02;TCC_InvalidPacketType;;2;PACKET_CHECK;fsfw/src/fsfw/tcdistribution/definitions.h
+0x1005;TIM_TimeDoesNotFitFormat;;5;CCSDS_TIME_HELPER_CLASS;fsfw/src/fsfw/timemanager/CCSDSTime.h
-0x1b03;TCC_InvalidSecHeaderField;;3;PACKET_CHECK;fsfw/src/fsfw/tcdistribution/definitions.h
+0x3701;TSI_BadTimestamp;;1;TIME_STAMPER_IF;fsfw/src/fsfw/timemanager/TimeStampIF.h
-0x1b04;TCC_IncorrectPrimaryHeader;;4;PACKET_CHECK;fsfw/src/fsfw/tcdistribution/definitions.h
+0x1d01;ATC_ActivityStarted;;1;ACCEPTS_TELECOMMANDS_IF;fsfw/src/fsfw/tmtcservices/AcceptsTelecommandsIF.h
-0x1b05;TCC_IncompletePacket;;5;PACKET_CHECK;fsfw/src/fsfw/tcdistribution/definitions.h
+0x1d02;ATC_InvalidSubservice;;2;ACCEPTS_TELECOMMANDS_IF;fsfw/src/fsfw/tmtcservices/AcceptsTelecommandsIF.h
-0x1b06;TCC_InvalidPusVersion;;6;PACKET_CHECK;fsfw/src/fsfw/tcdistribution/definitions.h
+0x1d03;ATC_IllegalApplicationData;;3;ACCEPTS_TELECOMMANDS_IF;fsfw/src/fsfw/tmtcservices/AcceptsTelecommandsIF.h
-0x1b07;TCC_IncorrectChecksum;;7;PACKET_CHECK;fsfw/src/fsfw/tcdistribution/definitions.h
+0x1d04;ATC_SendTmFailed;;4;ACCEPTS_TELECOMMANDS_IF;fsfw/src/fsfw/tmtcservices/AcceptsTelecommandsIF.h
-0x1b08;TCC_IllegalPacketSubtype;;8;PACKET_CHECK;fsfw/src/fsfw/tcdistribution/definitions.h
+0x1d05;ATC_Timeout;;5;ACCEPTS_TELECOMMANDS_IF;fsfw/src/fsfw/tmtcservices/AcceptsTelecommandsIF.h
-0x1b09;TCC_IncorrectSecondaryHeader;;9;PACKET_CHECK;fsfw/src/fsfw/tcdistribution/definitions.h
+0x4c00;SPPA_NoPacketFound;;0;SPACE_PACKET_PARSER;fsfw/src/fsfw/tmtcservices/SpacePacketParser.h
+0x4c01;SPPA_SplitPacket;;1;SPACE_PACKET_PARSER;fsfw/src/fsfw/tmtcservices/SpacePacketParser.h
+0x2001;CSB_ExecutionComplete;;1;COMMAND_SERVICE_BASE;fsfw/src/fsfw/tmtcservices/CommandingServiceBase.h
+0x2002;CSB_NoStepMessage;;2;COMMAND_SERVICE_BASE;fsfw/src/fsfw/tmtcservices/CommandingServiceBase.h
+0x2003;CSB_ObjectBusy;;3;COMMAND_SERVICE_BASE;fsfw/src/fsfw/tmtcservices/CommandingServiceBase.h
+0x2004;CSB_Busy;;4;COMMAND_SERVICE_BASE;fsfw/src/fsfw/tmtcservices/CommandingServiceBase.h
+0x2005;CSB_InvalidTc;;5;COMMAND_SERVICE_BASE;fsfw/src/fsfw/tmtcservices/CommandingServiceBase.h
+0x2006;CSB_InvalidObject;;6;COMMAND_SERVICE_BASE;fsfw/src/fsfw/tmtcservices/CommandingServiceBase.h
+0x2007;CSB_InvalidReply;;7;COMMAND_SERVICE_BASE;fsfw/src/fsfw/tmtcservices/CommandingServiceBase.h
+0x1101;AL_Full;;1;ARRAY_LIST;fsfw/src/fsfw/container/ArrayList.h
+0x1801;FF_Full;;1;FIFO_CLASS;fsfw/src/fsfw/container/FIFOBase.h
+0x1802;FF_Empty;;2;FIFO_CLASS;fsfw/src/fsfw/container/FIFOBase.h
+0x1601;FMM_MapFull;;1;FIXED_MULTIMAP;fsfw/src/fsfw/container/FixedOrderedMultimap.h
+0x1602;FMM_KeyDoesNotExist;;2;FIXED_MULTIMAP;fsfw/src/fsfw/container/FixedOrderedMultimap.h
+0x1501;FM_KeyAlreadyExists;;1;FIXED_MAP;fsfw/src/fsfw/container/FixedMap.h
+0x1502;FM_MapFull;;2;FIXED_MAP;fsfw/src/fsfw/container/FixedMap.h
+0x1503;FM_KeyDoesNotExist;;3;FIXED_MAP;fsfw/src/fsfw/container/FixedMap.h
+0x2501;EV_ListenerNotFound;;1;EVENT_MANAGER_IF;fsfw/src/fsfw/events/EventManagerIF.h
+0x1701;HHI_ObjectNotHealthy;;1;HAS_HEALTH_IF;fsfw/src/fsfw/health/HasHealthIF.h
+0x1702;HHI_InvalidHealthState;;2;HAS_HEALTH_IF;fsfw/src/fsfw/health/HasHealthIF.h
+0x1703;HHI_IsExternallyControlled;;3;HAS_HEALTH_IF;fsfw/src/fsfw/health/HasHealthIF.h
 0x3001;POS_InPowerTransition;;1;POWER_SWITCHER;fsfw/src/fsfw/power/PowerSwitcher.h
 0x3002;POS_SwitchStateMismatch;;2;POWER_SWITCHER;fsfw/src/fsfw/power/PowerSwitcher.h
 0x0501;PS_SwitchOn;;1;POWER_SWITCH_IF;fsfw/src/fsfw/power/PowerSwitchIF.h
@@ -235,76 +345,22 @@ Full ID (hex); Name; Description; Unique ID; Subsytem Name; File Path
 0x0502;PS_SwitchTimeout;;2;POWER_SWITCH_IF;fsfw/src/fsfw/power/PowerSwitchIF.h
 0x0503;PS_FuseOn;;3;POWER_SWITCH_IF;fsfw/src/fsfw/power/PowerSwitchIF.h
 0x0504;PS_FuseOff;;4;POWER_SWITCH_IF;fsfw/src/fsfw/power/PowerSwitchIF.h
-0x3b00;SPH_ConnBroken;;0;SEMAPHORE_IF;fsfw/src/fsfw/osal/common/TcpTmTcServer.h
+0x4300;FILS_GenericFileError;;0;FILE_SYSTEM;fsfw/src/fsfw/filesystem/HasFileSystemIF.h
-0x2a01;IEC_NoConfigurationTable;;1;INTERNAL_ERROR_CODES;fsfw/src/fsfw/osal/InternalErrorCodes.h
+0x4301;FILS_GenericDirError;;1;FILE_SYSTEM;fsfw/src/fsfw/filesystem/HasFileSystemIF.h
-0x2a02;IEC_NoCpuTable;;2;INTERNAL_ERROR_CODES;fsfw/src/fsfw/osal/InternalErrorCodes.h
+0x4303;FILS_GenericRenameError;;3;FILE_SYSTEM;fsfw/src/fsfw/filesystem/HasFileSystemIF.h
-0x2a03;IEC_InvalidWorkspaceAddress;;3;INTERNAL_ERROR_CODES;fsfw/src/fsfw/osal/InternalErrorCodes.h
+0x4304;FILS_IsBusy;;4;FILE_SYSTEM;fsfw/src/fsfw/filesystem/HasFileSystemIF.h
-0x2a04;IEC_TooLittleWorkspace;;4;INTERNAL_ERROR_CODES;fsfw/src/fsfw/osal/InternalErrorCodes.h
+0x4305;FILS_InvalidParameters;;5;FILE_SYSTEM;fsfw/src/fsfw/filesystem/HasFileSystemIF.h
-0x2a05;IEC_WorkspaceAllocation;;5;INTERNAL_ERROR_CODES;fsfw/src/fsfw/osal/InternalErrorCodes.h
+0x430a;FILS_FileDoesNotExist;;10;FILE_SYSTEM;fsfw/src/fsfw/filesystem/HasFileSystemIF.h
-0x2a06;IEC_InterruptStackTooSmall;;6;INTERNAL_ERROR_CODES;fsfw/src/fsfw/osal/InternalErrorCodes.h
+0x430b;FILS_FileAlreadyExists;;11;FILE_SYSTEM;fsfw/src/fsfw/filesystem/HasFileSystemIF.h
-0x2a07;IEC_ThreadExitted;;7;INTERNAL_ERROR_CODES;fsfw/src/fsfw/osal/InternalErrorCodes.h
+0x430c;FILS_NotAFile;;12;FILE_SYSTEM;fsfw/src/fsfw/filesystem/HasFileSystemIF.h
-0x2a08;IEC_InconsistentMpInformation;;8;INTERNAL_ERROR_CODES;fsfw/src/fsfw/osal/InternalErrorCodes.h
+0x430d;FILS_FileLocked;;13;FILE_SYSTEM;fsfw/src/fsfw/filesystem/HasFileSystemIF.h
-0x2a09;IEC_InvalidNode;;9;INTERNAL_ERROR_CODES;fsfw/src/fsfw/osal/InternalErrorCodes.h
+0x430e;FILS_PermissionDenied;;14;FILE_SYSTEM;fsfw/src/fsfw/filesystem/HasFileSystemIF.h
-0x2a0a;IEC_NoMpci;;10;INTERNAL_ERROR_CODES;fsfw/src/fsfw/osal/InternalErrorCodes.h
+0x4315;FILS_DirectoryDoesNotExist;;21;FILE_SYSTEM;fsfw/src/fsfw/filesystem/HasFileSystemIF.h
-0x2a0b;IEC_BadPacket;;11;INTERNAL_ERROR_CODES;fsfw/src/fsfw/osal/InternalErrorCodes.h
+0x4316;FILS_DirectoryAlreadyExists;;22;FILE_SYSTEM;fsfw/src/fsfw/filesystem/HasFileSystemIF.h
-0x2a0c;IEC_OutOfPackets;;12;INTERNAL_ERROR_CODES;fsfw/src/fsfw/osal/InternalErrorCodes.h
+0x4317;FILS_NotADirectory;;23;FILE_SYSTEM;fsfw/src/fsfw/filesystem/HasFileSystemIF.h
-0x2a0d;IEC_OutOfGlobalObjects;;13;INTERNAL_ERROR_CODES;fsfw/src/fsfw/osal/InternalErrorCodes.h
+0x4318;FILS_DirectoryNotEmpty;;24;FILE_SYSTEM;fsfw/src/fsfw/filesystem/HasFileSystemIF.h
-0x2a0e;IEC_OutOfProxies;;14;INTERNAL_ERROR_CODES;fsfw/src/fsfw/osal/InternalErrorCodes.h
+0x431e;FILS_SequencePacketMissingWrite;;30;FILE_SYSTEM;fsfw/src/fsfw/filesystem/HasFileSystemIF.h
-0x2a0f;IEC_InvalidGlobalId;;15;INTERNAL_ERROR_CODES;fsfw/src/fsfw/osal/InternalErrorCodes.h
+0x431f;FILS_SequencePacketMissingRead;;31;FILE_SYSTEM;fsfw/src/fsfw/filesystem/HasFileSystemIF.h
-0x2a10;IEC_BadStackHook;;16;INTERNAL_ERROR_CODES;fsfw/src/fsfw/osal/InternalErrorCodes.h
-0x2a11;IEC_BadAttributes;;17;INTERNAL_ERROR_CODES;fsfw/src/fsfw/osal/InternalErrorCodes.h
-0x2a12;IEC_ImplementationKeyCreateInconsistency;;18;INTERNAL_ERROR_CODES;fsfw/src/fsfw/osal/InternalErrorCodes.h
-0x2a13;IEC_ImplementationBlockingOperationCancel;;19;INTERNAL_ERROR_CODES;fsfw/src/fsfw/osal/InternalErrorCodes.h
-0x2a14;IEC_MutexObtainFromBadState;;20;INTERNAL_ERROR_CODES;fsfw/src/fsfw/osal/InternalErrorCodes.h
-0x2a15;IEC_UnlimitedAndMaximumIs0;;21;INTERNAL_ERROR_CODES;fsfw/src/fsfw/osal/InternalErrorCodes.h
-0x2600;FDI_YourFault;;0;HANDLES_FAILURES_IF;fsfw/src/fsfw/fdir/ConfirmsFailuresIF.h
-0x2601;FDI_MyFault;;1;HANDLES_FAILURES_IF;fsfw/src/fsfw/fdir/ConfirmsFailuresIF.h
-0x2602;FDI_ConfirmLater;;2;HANDLES_FAILURES_IF;fsfw/src/fsfw/fdir/ConfirmsFailuresIF.h
-0x1e00;PUS_InvalidPusVersion;;0;PUS_IF;fsfw/src/fsfw/tmtcpacket/pus/PusIF.h
-0x1e01;PUS_InvalidCrc16;;1;PUS_IF;fsfw/src/fsfw/tmtcpacket/pus/PusIF.h
-0x0201;OM_InsertionFailed;;1;OBJECT_MANAGER_IF;fsfw/src/fsfw/objectmanager/ObjectManagerIF.h
-0x0202;OM_NotFound;;2;OBJECT_MANAGER_IF;fsfw/src/fsfw/objectmanager/ObjectManagerIF.h
-0x0203;OM_ChildInitFailed;;3;OBJECT_MANAGER_IF;fsfw/src/fsfw/objectmanager/ObjectManagerIF.h
-0x0204;OM_InternalErrReporterUninit;;4;OBJECT_MANAGER_IF;fsfw/src/fsfw/objectmanager/ObjectManagerIF.h
-0x2201;TMF_Busy;;1;TM_STORE_FRONTEND_IF;fsfw/src/fsfw/tmstorage/TmStoreFrontendIF.h
-0x2202;TMF_LastPacketFound;;2;TM_STORE_FRONTEND_IF;fsfw/src/fsfw/tmstorage/TmStoreFrontendIF.h
-0x2203;TMF_StopFetch;;3;TM_STORE_FRONTEND_IF;fsfw/src/fsfw/tmstorage/TmStoreFrontendIF.h
-0x2204;TMF_Timeout;;4;TM_STORE_FRONTEND_IF;fsfw/src/fsfw/tmstorage/TmStoreFrontendIF.h
-0x2205;TMF_TmChannelFull;;5;TM_STORE_FRONTEND_IF;fsfw/src/fsfw/tmstorage/TmStoreFrontendIF.h
-0x2206;TMF_NotStored;;6;TM_STORE_FRONTEND_IF;fsfw/src/fsfw/tmstorage/TmStoreFrontendIF.h
-0x2207;TMF_AllDeleted;;7;TM_STORE_FRONTEND_IF;fsfw/src/fsfw/tmstorage/TmStoreFrontendIF.h
-0x2208;TMF_InvalidData;;8;TM_STORE_FRONTEND_IF;fsfw/src/fsfw/tmstorage/TmStoreFrontendIF.h
-0x2209;TMF_NotReady;;9;TM_STORE_FRONTEND_IF;fsfw/src/fsfw/tmstorage/TmStoreFrontendIF.h
-0x2101;TMB_Busy;;1;TM_STORE_BACKEND_IF;fsfw/src/fsfw/tmstorage/TmStoreBackendIF.h
-0x2102;TMB_Full;;2;TM_STORE_BACKEND_IF;fsfw/src/fsfw/tmstorage/TmStoreBackendIF.h
-0x2103;TMB_Empty;;3;TM_STORE_BACKEND_IF;fsfw/src/fsfw/tmstorage/TmStoreBackendIF.h
-0x2104;TMB_NullRequested;;4;TM_STORE_BACKEND_IF;fsfw/src/fsfw/tmstorage/TmStoreBackendIF.h
-0x2105;TMB_TooLarge;;5;TM_STORE_BACKEND_IF;fsfw/src/fsfw/tmstorage/TmStoreBackendIF.h
-0x2106;TMB_NotReady;;6;TM_STORE_BACKEND_IF;fsfw/src/fsfw/tmstorage/TmStoreBackendIF.h
-0x2107;TMB_DumpError;;7;TM_STORE_BACKEND_IF;fsfw/src/fsfw/tmstorage/TmStoreBackendIF.h
-0x2108;TMB_CrcError;;8;TM_STORE_BACKEND_IF;fsfw/src/fsfw/tmstorage/TmStoreBackendIF.h
-0x2109;TMB_Timeout;;9;TM_STORE_BACKEND_IF;fsfw/src/fsfw/tmstorage/TmStoreBackendIF.h
-0x210a;TMB_IdlePacketFound;;10;TM_STORE_BACKEND_IF;fsfw/src/fsfw/tmstorage/TmStoreBackendIF.h
-0x210b;TMB_TelecommandFound;;11;TM_STORE_BACKEND_IF;fsfw/src/fsfw/tmstorage/TmStoreBackendIF.h
-0x210c;TMB_NoPusATm;;12;TM_STORE_BACKEND_IF;fsfw/src/fsfw/tmstorage/TmStoreBackendIF.h
-0x210d;TMB_TooSmall;;13;TM_STORE_BACKEND_IF;fsfw/src/fsfw/tmstorage/TmStoreBackendIF.h
-0x210e;TMB_BlockNotFound;;14;TM_STORE_BACKEND_IF;fsfw/src/fsfw/tmstorage/TmStoreBackendIF.h
-0x210f;TMB_InvalidRequest;;15;TM_STORE_BACKEND_IF;fsfw/src/fsfw/tmstorage/TmStoreBackendIF.h
-0x2d01;PAW_UnknownDatatype;;1;PARAMETER_WRAPPER;fsfw/src/fsfw/parameters/ParameterWrapper.h
-0x2d02;PAW_DatatypeMissmatch;;2;PARAMETER_WRAPPER;fsfw/src/fsfw/parameters/ParameterWrapper.h
-0x2d03;PAW_Readonly;;3;PARAMETER_WRAPPER;fsfw/src/fsfw/parameters/ParameterWrapper.h
-0x2d04;PAW_TooBig;;4;PARAMETER_WRAPPER;fsfw/src/fsfw/parameters/ParameterWrapper.h
-0x2d05;PAW_SourceNotSet;;5;PARAMETER_WRAPPER;fsfw/src/fsfw/parameters/ParameterWrapper.h
-0x2d06;PAW_OutOfBounds;;6;PARAMETER_WRAPPER;fsfw/src/fsfw/parameters/ParameterWrapper.h
-0x2d07;PAW_NotSet;;7;PARAMETER_WRAPPER;fsfw/src/fsfw/parameters/ParameterWrapper.h
-0x2d08;PAW_ColumnOrRowsZero;;8;PARAMETER_WRAPPER;fsfw/src/fsfw/parameters/ParameterWrapper.h
-0x2e01;HPA_InvalidIdentifierId;;1;HAS_PARAMETERS_IF;fsfw/src/fsfw/parameters/HasParametersIF.h
-0x2e02;HPA_InvalidDomainId;;2;HAS_PARAMETERS_IF;fsfw/src/fsfw/parameters/HasParametersIF.h
-0x2e03;HPA_InvalidValue;;3;HAS_PARAMETERS_IF;fsfw/src/fsfw/parameters/HasParametersIF.h
-0x2e05;HPA_ReadOnly;;5;HAS_PARAMETERS_IF;fsfw/src/fsfw/parameters/HasParametersIF.h
-0x3b01;SPH_SemaphoreTimeout;;1;SEMAPHORE_IF;fsfw/src/fsfw/tasks/SemaphoreIF.h
-0x3b02;SPH_SemaphoreNotOwned;;2;SEMAPHORE_IF;fsfw/src/fsfw/tasks/SemaphoreIF.h
-0x3b03;SPH_SemaphoreInvalid;;3;SEMAPHORE_IF;fsfw/src/fsfw/tasks/SemaphoreIF.h
 0x1a01;TRC_NotEnoughSensors;;1;TRIPLE_REDUNDACY_CHECK;fsfw/src/fsfw/monitoring/TriplexMonitor.h
 0x1a02;TRC_LowestValueOol;;2;TRIPLE_REDUNDACY_CHECK;fsfw/src/fsfw/monitoring/TriplexMonitor.h
 0x1a03;TRC_HighestValueOol;;3;TRIPLE_REDUNDACY_CHECK;fsfw/src/fsfw/monitoring/TriplexMonitor.h
@@ -323,52 +379,34 @@ Full ID (hex); Name; Description; Unique ID; Subsytem Name; File Path
 0x31e2;LIM_WrongPid;;226;LIMITS_IF;fsfw/src/fsfw/monitoring/MonitoringIF.h
 0x31e3;LIM_WrongLimitId;;227;LIMITS_IF;fsfw/src/fsfw/monitoring/MonitoringIF.h
 0x31ee;LIM_MonitorNotFound;;238;LIMITS_IF;fsfw/src/fsfw/monitoring/MonitoringIF.h
-0x3601;CFDP_InvalidTlvType;;1;CFDP;fsfw/src/fsfw/cfdp/definitions.h
-0x3602;CFDP_InvalidDirectiveFields;;2;CFDP;fsfw/src/fsfw/cfdp/definitions.h
-0x3603;CFDP_InvalidPduDatafieldLen;;3;CFDP;fsfw/src/fsfw/cfdp/definitions.h
-0x3604;CFDP_InvalidAckDirectiveFields;;4;CFDP;fsfw/src/fsfw/cfdp/definitions.h
-0x3605;CFDP_MetadataCantParseOptions;;5;CFDP;fsfw/src/fsfw/cfdp/definitions.h
-0x3606;CFDP_FinishedCantParseFsResponses;;6;CFDP;fsfw/src/fsfw/cfdp/definitions.h
-0x3608;CFDP_FilestoreRequiresSecondFile;;8;CFDP;fsfw/src/fsfw/cfdp/definitions.h
-0x3609;CFDP_FilestoreResponseCantParseFsMessage;;9;CFDP;fsfw/src/fsfw/cfdp/definitions.h
-0x2c01;CCS_BcIsSetVrCommand;;1;CCSDS_HANDLER_IF;fsfw/src/fsfw/datalinklayer/CCSDSReturnValuesIF.h
-0x2c02;CCS_BcIsUnlockCommand;;2;CCSDS_HANDLER_IF;fsfw/src/fsfw/datalinklayer/CCSDSReturnValuesIF.h
-0x2cb0;CCS_BcIllegalCommand;;176;CCSDS_HANDLER_IF;fsfw/src/fsfw/datalinklayer/CCSDSReturnValuesIF.h
-0x2cb1;CCS_BoardReadingNotFinished;;177;CCSDS_HANDLER_IF;fsfw/src/fsfw/datalinklayer/CCSDSReturnValuesIF.h
-0x2cf0;CCS_NsPositiveW;;240;CCSDS_HANDLER_IF;fsfw/src/fsfw/datalinklayer/CCSDSReturnValuesIF.h
-0x2cf1;CCS_NsNegativeW;;241;CCSDS_HANDLER_IF;fsfw/src/fsfw/datalinklayer/CCSDSReturnValuesIF.h
-0x2cf2;CCS_NsLockout;;242;CCSDS_HANDLER_IF;fsfw/src/fsfw/datalinklayer/CCSDSReturnValuesIF.h
-0x2cf3;CCS_FarmInLockout;;243;CCSDS_HANDLER_IF;fsfw/src/fsfw/datalinklayer/CCSDSReturnValuesIF.h
-0x2cf4;CCS_FarmInWait;;244;CCSDS_HANDLER_IF;fsfw/src/fsfw/datalinklayer/CCSDSReturnValuesIF.h
-0x2ce0;CCS_WrongSymbol;;224;CCSDS_HANDLER_IF;fsfw/src/fsfw/datalinklayer/CCSDSReturnValuesIF.h
-0x2ce1;CCS_DoubleStart;;225;CCSDS_HANDLER_IF;fsfw/src/fsfw/datalinklayer/CCSDSReturnValuesIF.h
-0x2ce2;CCS_StartSymbolMissed;;226;CCSDS_HANDLER_IF;fsfw/src/fsfw/datalinklayer/CCSDSReturnValuesIF.h
-0x2ce3;CCS_EndWithoutStart;;227;CCSDS_HANDLER_IF;fsfw/src/fsfw/datalinklayer/CCSDSReturnValuesIF.h
-0x2ce4;CCS_TooLarge;;228;CCSDS_HANDLER_IF;fsfw/src/fsfw/datalinklayer/CCSDSReturnValuesIF.h
-0x2ce5;CCS_TooShort;;229;CCSDS_HANDLER_IF;fsfw/src/fsfw/datalinklayer/CCSDSReturnValuesIF.h
-0x2ce6;CCS_WrongTfVersion;;230;CCSDS_HANDLER_IF;fsfw/src/fsfw/datalinklayer/CCSDSReturnValuesIF.h
-0x2ce7;CCS_WrongSpacecraftId;;231;CCSDS_HANDLER_IF;fsfw/src/fsfw/datalinklayer/CCSDSReturnValuesIF.h
-0x2ce8;CCS_NoValidFrameType;;232;CCSDS_HANDLER_IF;fsfw/src/fsfw/datalinklayer/CCSDSReturnValuesIF.h
-0x2ce9;CCS_CrcFailed;;233;CCSDS_HANDLER_IF;fsfw/src/fsfw/datalinklayer/CCSDSReturnValuesIF.h
-0x2cea;CCS_VcNotFound;;234;CCSDS_HANDLER_IF;fsfw/src/fsfw/datalinklayer/CCSDSReturnValuesIF.h
-0x2ceb;CCS_ForwardingFailed;;235;CCSDS_HANDLER_IF;fsfw/src/fsfw/datalinklayer/CCSDSReturnValuesIF.h
-0x2cec;CCS_ContentTooLarge;;236;CCSDS_HANDLER_IF;fsfw/src/fsfw/datalinklayer/CCSDSReturnValuesIF.h
-0x2ced;CCS_ResidualData;;237;CCSDS_HANDLER_IF;fsfw/src/fsfw/datalinklayer/CCSDSReturnValuesIF.h
-0x2cee;CCS_DataCorrupted;;238;CCSDS_HANDLER_IF;fsfw/src/fsfw/datalinklayer/CCSDSReturnValuesIF.h
-0x2cef;CCS_IllegalSegmentationFlag;;239;CCSDS_HANDLER_IF;fsfw/src/fsfw/datalinklayer/CCSDSReturnValuesIF.h
-0x2cd0;CCS_IllegalFlagCombination;;208;CCSDS_HANDLER_IF;fsfw/src/fsfw/datalinklayer/CCSDSReturnValuesIF.h
-0x2cd1;CCS_ShorterThanHeader;;209;CCSDS_HANDLER_IF;fsfw/src/fsfw/datalinklayer/CCSDSReturnValuesIF.h
-0x2cd2;CCS_TooShortBlockedPacket;;210;CCSDS_HANDLER_IF;fsfw/src/fsfw/datalinklayer/CCSDSReturnValuesIF.h
-0x2cd3;CCS_TooShortMapExtraction;;211;CCSDS_HANDLER_IF;fsfw/src/fsfw/datalinklayer/CCSDSReturnValuesIF.h
 0x4201;PUS11_InvalidTypeTimeWindow;;1;PUS_SERVICE_11;fsfw/src/fsfw/pus/Service11TelecommandScheduling.h
-0x4202;PUS11_TimeshiftingNotPossible;;2;PUS_SERVICE_11;fsfw/src/fsfw/pus/Service11TelecommandScheduling.h
+0x4202;PUS11_InvalidTimeWindow;;2;PUS_SERVICE_11;fsfw/src/fsfw/pus/Service11TelecommandScheduling.h
-0x4203;PUS11_InvalidRelativeTime;;3;PUS_SERVICE_11;fsfw/src/fsfw/pus/Service11TelecommandScheduling.h
+0x4203;PUS11_TimeshiftingNotPossible;;3;PUS_SERVICE_11;fsfw/src/fsfw/pus/Service11TelecommandScheduling.h
-0x3401;DC_NoReplyReceived;;1;DEVICE_COMMUNICATION_IF;fsfw/src/fsfw/devicehandlers/DeviceCommunicationIF.h
+0x4204;PUS11_InvalidRelativeTime;;4;PUS_SERVICE_11;fsfw/src/fsfw/pus/Service11TelecommandScheduling.h
-0x3402;DC_ProtocolError;;2;DEVICE_COMMUNICATION_IF;fsfw/src/fsfw/devicehandlers/DeviceCommunicationIF.h
+0x0601;PP_DoItMyself;;1;HAS_MEMORY_IF;fsfw/src/fsfw/memory/HasMemoryIF.h
-0x3403;DC_Nullpointer;;3;DEVICE_COMMUNICATION_IF;fsfw/src/fsfw/devicehandlers/DeviceCommunicationIF.h
+0x0602;PP_PointsToVariable;;2;HAS_MEMORY_IF;fsfw/src/fsfw/memory/HasMemoryIF.h
-0x3404;DC_InvalidCookieType;;4;DEVICE_COMMUNICATION_IF;fsfw/src/fsfw/devicehandlers/DeviceCommunicationIF.h
+0x0603;PP_PointsToMemory;;3;HAS_MEMORY_IF;fsfw/src/fsfw/memory/HasMemoryIF.h
-0x3405;DC_NotActive;;5;DEVICE_COMMUNICATION_IF;fsfw/src/fsfw/devicehandlers/DeviceCommunicationIF.h
+0x0604;PP_ActivityCompleted;;4;HAS_MEMORY_IF;fsfw/src/fsfw/memory/HasMemoryIF.h
-0x3406;DC_TooMuchData;;6;DEVICE_COMMUNICATION_IF;fsfw/src/fsfw/devicehandlers/DeviceCommunicationIF.h
+0x0605;PP_PointsToVectorUint8;;5;HAS_MEMORY_IF;fsfw/src/fsfw/memory/HasMemoryIF.h
+0x0606;PP_PointsToVectorUint16;;6;HAS_MEMORY_IF;fsfw/src/fsfw/memory/HasMemoryIF.h
+0x0607;PP_PointsToVectorUint32;;7;HAS_MEMORY_IF;fsfw/src/fsfw/memory/HasMemoryIF.h
+0x0608;PP_PointsToVectorFloat;;8;HAS_MEMORY_IF;fsfw/src/fsfw/memory/HasMemoryIF.h
+0x06a0;PP_DumpNotSupported;;160;HAS_MEMORY_IF;fsfw/src/fsfw/memory/HasMemoryIF.h
+0x06e0;PP_InvalidSize;;224;HAS_MEMORY_IF;fsfw/src/fsfw/memory/HasMemoryIF.h
+0x06e1;PP_InvalidAddress;;225;HAS_MEMORY_IF;fsfw/src/fsfw/memory/HasMemoryIF.h
+0x06e2;PP_InvalidContent;;226;HAS_MEMORY_IF;fsfw/src/fsfw/memory/HasMemoryIF.h
+0x06e3;PP_UnalignedAccess;;227;HAS_MEMORY_IF;fsfw/src/fsfw/memory/HasMemoryIF.h
+0x06e4;PP_WriteProtected;;228;HAS_MEMORY_IF;fsfw/src/fsfw/memory/HasMemoryIF.h
+0x13e0;MH_UnknownCmd;;224;MEMORY_HELPER;fsfw/src/fsfw/memory/MemoryHelper.h
+0x13e1;MH_InvalidAddress;;225;MEMORY_HELPER;fsfw/src/fsfw/memory/MemoryHelper.h
+0x13e2;MH_InvalidSize;;226;MEMORY_HELPER;fsfw/src/fsfw/memory/MemoryHelper.h
+0x13e3;MH_StateMismatch;;227;MEMORY_HELPER;fsfw/src/fsfw/memory/MemoryHelper.h
+0x1201;AB_NeedSecondStep;;1;ASSEMBLY_BASE;fsfw/src/fsfw/devicehandlers/AssemblyBase.h
+0x1202;AB_NeedToReconfigure;;2;ASSEMBLY_BASE;fsfw/src/fsfw/devicehandlers/AssemblyBase.h
+0x1203;AB_ModeFallback;;3;ASSEMBLY_BASE;fsfw/src/fsfw/devicehandlers/AssemblyBase.h
+0x1204;AB_ChildNotCommandable;;4;ASSEMBLY_BASE;fsfw/src/fsfw/devicehandlers/AssemblyBase.h
+0x1205;AB_NeedToChangeHealth;;5;ASSEMBLY_BASE;fsfw/src/fsfw/devicehandlers/AssemblyBase.h
+0x12a1;AB_NotEnoughChildrenInCorrectState;;161;ASSEMBLY_BASE;fsfw/src/fsfw/devicehandlers/AssemblyBase.h
 0x03a0;DHB_InvalidChannel;;160;DEVICE_HANDLER_BASE;fsfw/src/fsfw/devicehandlers/DeviceHandlerBase.h
 0x03b0;DHB_AperiodicReply;;176;DEVICE_HANDLER_BASE;fsfw/src/fsfw/devicehandlers/DeviceHandlerBase.h
 0x03b1;DHB_IgnoreReplyData;;177;DEVICE_HANDLER_BASE;fsfw/src/fsfw/devicehandlers/DeviceHandlerBase.h
@@ -378,12 +416,12 @@ Full ID (hex); Name; Description; Unique ID; Subsytem Name; File Path
 0x03d0;DHB_NoSwitch;;208;DEVICE_HANDLER_BASE;fsfw/src/fsfw/devicehandlers/DeviceHandlerBase.h
 0x03e0;DHB_ChildTimeout;;224;DEVICE_HANDLER_BASE;fsfw/src/fsfw/devicehandlers/DeviceHandlerBase.h
 0x03e1;DHB_SwitchFailed;;225;DEVICE_HANDLER_BASE;fsfw/src/fsfw/devicehandlers/DeviceHandlerBase.h
-0x1201;AB_NeedSecondStep;;1;ASSEMBLY_BASE;fsfw/src/fsfw/devicehandlers/AssemblyBase.h
+0x3401;DC_NoReplyReceived;;1;DEVICE_COMMUNICATION_IF;fsfw/src/fsfw/devicehandlers/DeviceCommunicationIF.h
-0x1202;AB_NeedToReconfigure;;2;ASSEMBLY_BASE;fsfw/src/fsfw/devicehandlers/AssemblyBase.h
+0x3402;DC_ProtocolError;;2;DEVICE_COMMUNICATION_IF;fsfw/src/fsfw/devicehandlers/DeviceCommunicationIF.h
-0x1203;AB_ModeFallback;;3;ASSEMBLY_BASE;fsfw/src/fsfw/devicehandlers/AssemblyBase.h
+0x3403;DC_Nullpointer;;3;DEVICE_COMMUNICATION_IF;fsfw/src/fsfw/devicehandlers/DeviceCommunicationIF.h
-0x1204;AB_ChildNotCommandable;;4;ASSEMBLY_BASE;fsfw/src/fsfw/devicehandlers/AssemblyBase.h
+0x3404;DC_InvalidCookieType;;4;DEVICE_COMMUNICATION_IF;fsfw/src/fsfw/devicehandlers/DeviceCommunicationIF.h
-0x1205;AB_NeedToChangeHealth;;5;ASSEMBLY_BASE;fsfw/src/fsfw/devicehandlers/AssemblyBase.h
+0x3405;DC_NotActive;;5;DEVICE_COMMUNICATION_IF;fsfw/src/fsfw/devicehandlers/DeviceCommunicationIF.h
-0x12a1;AB_NotEnoughChildrenInCorrectState;;161;ASSEMBLY_BASE;fsfw/src/fsfw/devicehandlers/AssemblyBase.h
+0x3406;DC_TooMuchData;;6;DEVICE_COMMUNICATION_IF;fsfw/src/fsfw/devicehandlers/DeviceCommunicationIF.h
 0x27a0;DHI_NoCommandData;;160;DEVICE_HANDLER_IF;fsfw/src/fsfw/devicehandlers/DeviceHandlerIF.h
 0x27a1;DHI_CommandNotSupported;;161;DEVICE_HANDLER_IF;fsfw/src/fsfw/devicehandlers/DeviceHandlerIF.h
 0x27a2;DHI_CommandAlreadySent;;162;DEVICE_HANDLER_IF;fsfw/src/fsfw/devicehandlers/DeviceHandlerIF.h
@@ -405,67 +443,38 @@ Full ID (hex); Name; Description; Unique ID; Subsytem Name; File Path
 0x27c3;DHI_DeviceReplyInvalid;;195;DEVICE_HANDLER_IF;fsfw/src/fsfw/devicehandlers/DeviceHandlerIF.h
 0x27d0;DHI_InvalidCommandParameter;;208;DEVICE_HANDLER_IF;fsfw/src/fsfw/devicehandlers/DeviceHandlerIF.h
 0x27d1;DHI_InvalidNumberOrLengthOfParameters;;209;DEVICE_HANDLER_IF;fsfw/src/fsfw/devicehandlers/DeviceHandlerIF.h
-0x2401;MT_TooDetailedRequest;;1;MATCH_TREE_CLASS;fsfw/src/fsfw/globalfunctions/matching/MatchTree.h
+0x1401;SE_BufferTooShort;;1;SERIALIZE_IF;fsfw/src/fsfw/serialize/SerializeIF.h
-0x2402;MT_TooGeneralRequest;;2;MATCH_TREE_CLASS;fsfw/src/fsfw/globalfunctions/matching/MatchTree.h
+0x1402;SE_StreamTooShort;;2;SERIALIZE_IF;fsfw/src/fsfw/serialize/SerializeIF.h
-0x2403;MT_NoMatch;;3;MATCH_TREE_CLASS;fsfw/src/fsfw/globalfunctions/matching/MatchTree.h
+0x1403;SE_TooManyElements;;3;SERIALIZE_IF;fsfw/src/fsfw/serialize/SerializeIF.h
-0x2404;MT_Full;;4;MATCH_TREE_CLASS;fsfw/src/fsfw/globalfunctions/matching/MatchTree.h
+0x4500;HSPI_HalTimeoutRetval;;0;HAL_SPI;fsfw/src/fsfw_hal/stm32h7/spi/spiDefinitions.h
-0x2405;MT_NewNodeCreated;;5;MATCH_TREE_CLASS;fsfw/src/fsfw/globalfunctions/matching/MatchTree.h
+0x4501;HSPI_HalBusyRetval;;1;HAL_SPI;fsfw/src/fsfw_hal/stm32h7/spi/spiDefinitions.h
-0x3f01;DLEE_StreamTooShort;;1;DLE_ENCODER;fsfw/src/fsfw/globalfunctions/DleEncoder.h
+0x4502;HSPI_HalErrorRetval;;2;HAL_SPI;fsfw/src/fsfw_hal/stm32h7/spi/spiDefinitions.h
-0x3f02;DLEE_DecodingError;;2;DLE_ENCODER;fsfw/src/fsfw/globalfunctions/DleEncoder.h
+0x4601;HURT_UartReadFailure;;1;HAL_UART;fsfw/src/fsfw_hal/linux/uart/UartComIF.h
-0x2f01;ASC_TooLongForTargetType;;1;ASCII_CONVERTER;fsfw/src/fsfw/globalfunctions/AsciiConverter.h
+0x4602;HURT_UartReadSizeMissmatch;;2;HAL_UART;fsfw/src/fsfw_hal/linux/uart/UartComIF.h
-0x2f02;ASC_InvalidCharacters;;2;ASCII_CONVERTER;fsfw/src/fsfw/globalfunctions/AsciiConverter.h
+0x4603;HURT_UartRxBufferTooSmall;;3;HAL_UART;fsfw/src/fsfw_hal/linux/uart/UartComIF.h
-0x2f03;ASC_BufferTooSmall;;3;ASCII_CONVERTER;fsfw/src/fsfw/globalfunctions/AsciiConverter.h
+0x4801;HGIO_UnknownGpioId;;1;HAL_GPIO;fsfw/src/fsfw_hal/linux/gpio/LinuxLibgpioIF.h
-0x1701;HHI_ObjectNotHealthy;;1;HAS_HEALTH_IF;fsfw/src/fsfw/health/HasHealthIF.h
+0x4802;HGIO_DriveGpioFailure;;2;HAL_GPIO;fsfw/src/fsfw_hal/linux/gpio/LinuxLibgpioIF.h
-0x1702;HHI_InvalidHealthState;;2;HAS_HEALTH_IF;fsfw/src/fsfw/health/HasHealthIF.h
+0x4803;HGIO_GpioTypeFailure;;3;HAL_GPIO;fsfw/src/fsfw_hal/linux/gpio/LinuxLibgpioIF.h
-0x1703;HHI_IsExternallyControlled;;3;HAS_HEALTH_IF;fsfw/src/fsfw/health/HasHealthIF.h
+0x4804;HGIO_GpioInvalidInstance;;4;HAL_GPIO;fsfw/src/fsfw_hal/linux/gpio/LinuxLibgpioIF.h
-0x3201;CF_ObjectHasNoFunctions;;1;COMMANDS_ACTIONS_IF;fsfw/src/fsfw/action/CommandsActionsIF.h
+0x4805;HGIO_GpioDuplicateDetected;;5;HAL_GPIO;fsfw/src/fsfw_hal/linux/gpio/LinuxLibgpioIF.h
-0x3202;CF_AlreadyCommanding;;2;COMMANDS_ACTIONS_IF;fsfw/src/fsfw/action/CommandsActionsIF.h
+0x4806;HGIO_GpioInitFailed;;6;HAL_GPIO;fsfw/src/fsfw_hal/linux/gpio/LinuxLibgpioIF.h
-0x3301;HF_IsBusy;;1;HAS_ACTIONS_IF;fsfw/src/fsfw/action/HasActionsIF.h
+0x4807;HGIO_GpioGetValueFailed;;7;HAL_GPIO;fsfw/src/fsfw_hal/linux/gpio/LinuxLibgpioIF.h
-0x3302;HF_InvalidParameters;;2;HAS_ACTIONS_IF;fsfw/src/fsfw/action/HasActionsIF.h
+0x4400;UXOS_ExecutionFinished;Execution of the current command has finished;0;LINUX_OSAL;fsfw/src/fsfw_hal/linux/CommandExecutor.h
-0x3303;HF_ExecutionFinished;;3;HAS_ACTIONS_IF;fsfw/src/fsfw/action/HasActionsIF.h
+0x4401;UXOS_CommandPending;Command is pending. This will also be returned if the user tries to load another command but a command is still pending;1;LINUX_OSAL;fsfw/src/fsfw_hal/linux/CommandExecutor.h
-0x3304;HF_InvalidActionId;;4;HAS_ACTIONS_IF;fsfw/src/fsfw/action/HasActionsIF.h
+0x4402;UXOS_BytesRead;Some bytes have been read from the executing process;2;LINUX_OSAL;fsfw/src/fsfw_hal/linux/CommandExecutor.h
-0x1000;TIM_UnsupportedTimeFormat;;0;CCSDS_TIME_HELPER_CLASS;fsfw/src/fsfw/timemanager/CCSDSTime.h
+0x4403;UXOS_CommandError;Command execution failed;3;LINUX_OSAL;fsfw/src/fsfw_hal/linux/CommandExecutor.h
-0x1001;TIM_NotEnoughInformationForTargetFormat;;1;CCSDS_TIME_HELPER_CLASS;fsfw/src/fsfw/timemanager/CCSDSTime.h
+0x4404;UXOS_NoCommandLoadedOrPending;;4;LINUX_OSAL;fsfw/src/fsfw_hal/linux/CommandExecutor.h
-0x1002;TIM_LengthMismatch;;2;CCSDS_TIME_HELPER_CLASS;fsfw/src/fsfw/timemanager/CCSDSTime.h
+0x4406;UXOS_PcloseCallError;;6;LINUX_OSAL;fsfw/src/fsfw_hal/linux/CommandExecutor.h
-0x1003;TIM_InvalidTimeFormat;;3;CCSDS_TIME_HELPER_CLASS;fsfw/src/fsfw/timemanager/CCSDSTime.h
+0x64a0;FSHLP_SdNotMounted;SD card specified with path string not mounted;160;FILE_SYSTEM_HELPER;bsp_q7s/fs/FilesystemHelper.h
-0x1004;TIM_InvalidDayOfYear;;4;CCSDS_TIME_HELPER_CLASS;fsfw/src/fsfw/timemanager/CCSDSTime.h
+0x64a1;FSHLP_FileNotExists;Specified file does not exist on filesystem;161;FILE_SYSTEM_HELPER;bsp_q7s/fs/FilesystemHelper.h
-0x1005;TIM_TimeDoesNotFitFormat;;5;CCSDS_TIME_HELPER_CLASS;fsfw/src/fsfw/timemanager/CCSDSTime.h
+0x6a00;SDMA_OpOngoing;;0;SD_CARD_MANAGER;bsp_q7s/fs/SdCardManager.h
-0x3701;TSI_BadTimestamp;;1;TIME_STAMPER_IF;fsfw/src/fsfw/timemanager/TimeStampIF.h
+0x6a01;SDMA_AlreadyOn;;1;SD_CARD_MANAGER;bsp_q7s/fs/SdCardManager.h
-0x3c00;LPIF_PoolEntryNotFound;;0;LOCAL_POOL_OWNER_IF;fsfw/src/fsfw/datapoollocal/localPoolDefinitions.h
+0x6a02;SDMA_AlreadyMounted;;2;SD_CARD_MANAGER;bsp_q7s/fs/SdCardManager.h
-0x3c01;LPIF_PoolEntryTypeConflict;;1;LOCAL_POOL_OWNER_IF;fsfw/src/fsfw/datapoollocal/localPoolDefinitions.h
+0x6a03;SDMA_AlreadyOff;;3;SD_CARD_MANAGER;bsp_q7s/fs/SdCardManager.h
-0x3e00;HKM_QueueOrDestinationInvalid;;0;HOUSEKEEPING_MANAGER;fsfw/src/fsfw/datapoollocal/LocalDataPoolManager.h
+0x6a0a;SDMA_StatusFileNexists;;10;SD_CARD_MANAGER;bsp_q7s/fs/SdCardManager.h
-0x3e01;HKM_WrongHkPacketType;;1;HOUSEKEEPING_MANAGER;fsfw/src/fsfw/datapoollocal/LocalDataPoolManager.h
+0x6a0b;SDMA_StatusFileFormatInvalid;;11;SD_CARD_MANAGER;bsp_q7s/fs/SdCardManager.h
-0x3e02;HKM_ReportingStatusUnchanged;;2;HOUSEKEEPING_MANAGER;fsfw/src/fsfw/datapoollocal/LocalDataPoolManager.h
+0x6a0c;SDMA_MountError;;12;SD_CARD_MANAGER;bsp_q7s/fs/SdCardManager.h
-0x3e03;HKM_PeriodicHelperInvalid;;3;HOUSEKEEPING_MANAGER;fsfw/src/fsfw/datapoollocal/LocalDataPoolManager.h
+0x6a0d;SDMA_UnmountError;;13;SD_CARD_MANAGER;bsp_q7s/fs/SdCardManager.h
-0x3e04;HKM_PoolobjectNotFound;;4;HOUSEKEEPING_MANAGER;fsfw/src/fsfw/datapoollocal/LocalDataPoolManager.h
+0x6a0e;SDMA_SystemCallError;;14;SD_CARD_MANAGER;bsp_q7s/fs/SdCardManager.h
-0x3e05;HKM_DatasetNotFound;;5;HOUSEKEEPING_MANAGER;fsfw/src/fsfw/datapoollocal/LocalDataPoolManager.h
+0x6a0f;SDMA_PopenCallError;;15;SD_CARD_MANAGER;bsp_q7s/fs/SdCardManager.h
-0x2901;TC_InvalidTargetState;;1;THERMAL_COMPONENT_IF;fsfw/src/fsfw/thermal/ThermalComponentIF.h
-0x29f1;TC_AboveOperationalLimit;;241;THERMAL_COMPONENT_IF;fsfw/src/fsfw/thermal/ThermalComponentIF.h
-0x29f2;TC_BelowOperationalLimit;;242;THERMAL_COMPONENT_IF;fsfw/src/fsfw/thermal/ThermalComponentIF.h
-0x2001;CSB_ExecutionComplete;;1;COMMAND_SERVICE_BASE;fsfw/src/fsfw/tmtcservices/CommandingServiceBase.h
-0x2002;CSB_NoStepMessage;;2;COMMAND_SERVICE_BASE;fsfw/src/fsfw/tmtcservices/CommandingServiceBase.h
-0x2003;CSB_ObjectBusy;;3;COMMAND_SERVICE_BASE;fsfw/src/fsfw/tmtcservices/CommandingServiceBase.h
-0x2004;CSB_Busy;;4;COMMAND_SERVICE_BASE;fsfw/src/fsfw/tmtcservices/CommandingServiceBase.h
-0x2005;CSB_InvalidTc;;5;COMMAND_SERVICE_BASE;fsfw/src/fsfw/tmtcservices/CommandingServiceBase.h
-0x2006;CSB_InvalidObject;;6;COMMAND_SERVICE_BASE;fsfw/src/fsfw/tmtcservices/CommandingServiceBase.h
-0x2007;CSB_InvalidReply;;7;COMMAND_SERVICE_BASE;fsfw/src/fsfw/tmtcservices/CommandingServiceBase.h
-0x4c00;SPPA_NoPacketFound;;0;SPACE_PACKET_PARSER;fsfw/src/fsfw/tmtcservices/SpacePacketParser.h
-0x4c01;SPPA_SplitPacket;;1;SPACE_PACKET_PARSER;fsfw/src/fsfw/tmtcservices/SpacePacketParser.h
-0x1d01;ATC_ActivityStarted;;1;ACCEPTS_TELECOMMANDS_IF;fsfw/src/fsfw/tmtcservices/AcceptsTelecommandsIF.h
-0x1d02;ATC_InvalidSubservice;;2;ACCEPTS_TELECOMMANDS_IF;fsfw/src/fsfw/tmtcservices/AcceptsTelecommandsIF.h
-0x1d03;ATC_IllegalApplicationData;;3;ACCEPTS_TELECOMMANDS_IF;fsfw/src/fsfw/tmtcservices/AcceptsTelecommandsIF.h
-0x1d04;ATC_SendTmFailed;;4;ACCEPTS_TELECOMMANDS_IF;fsfw/src/fsfw/tmtcservices/AcceptsTelecommandsIF.h
-0x1d05;ATC_Timeout;;5;ACCEPTS_TELECOMMANDS_IF;fsfw/src/fsfw/tmtcservices/AcceptsTelecommandsIF.h
 0x6b00;SCBU_KeyNotFound;;0;SCRATCH_BUFFER;bsp_q7s/memory/scratchApi.h
-0x64a0;FSHLP_SdNotMounted;SD card specified with path string not mounted;160;FILE_SYSTEM_HELPER;bsp_q7s/memory/FilesystemHelper.h
-0x64a1;FSHLP_FileNotExists;Specified file does not exist on filesystem;161;FILE_SYSTEM_HELPER;bsp_q7s/memory/FilesystemHelper.h
-0x6a00;SDMA_OpOngoing;;0;SD_CARD_MANAGER;bsp_q7s/memory/SdCardManager.h
-0x6a01;SDMA_AlreadyOn;;1;SD_CARD_MANAGER;bsp_q7s/memory/SdCardManager.h
-0x6a02;SDMA_AlreadyMounted;;2;SD_CARD_MANAGER;bsp_q7s/memory/SdCardManager.h
-0x6a03;SDMA_AlreadyOff;;3;SD_CARD_MANAGER;bsp_q7s/memory/SdCardManager.h
-0x6a0a;SDMA_StatusFileNexists;;10;SD_CARD_MANAGER;bsp_q7s/memory/SdCardManager.h
-0x6a0b;SDMA_StatusFileFormatInvalid;;11;SD_CARD_MANAGER;bsp_q7s/memory/SdCardManager.h
-0x6a0c;SDMA_MountError;;12;SD_CARD_MANAGER;bsp_q7s/memory/SdCardManager.h
-0x6a0d;SDMA_UnmountError;;13;SD_CARD_MANAGER;bsp_q7s/memory/SdCardManager.h
-0x6a0e;SDMA_SystemCallError;;14;SD_CARD_MANAGER;bsp_q7s/memory/SdCardManager.h
-0x6a0f;SDMA_PopenCallError;;15;SD_CARD_MANAGER;bsp_q7s/memory/SdCardManager.h

generators/events/event_parser.py

@@ -60,7 +60,7 @@ FILE_SEPARATOR = ";"
 SUBSYSTEM_DEFINITION_DESTINATIONS = [
     f"{FSFW_CONFIG_ROOT}/events/subsystemIdRanges.h",
     f"{OBSW_ROOT_DIR}/fsfw/src/fsfw/events/fwSubsystemIdRanges.h",
-    f"{OBSW_ROOT_DIR}/common/config/commonSubsystemIds.h",
+    f"{OBSW_ROOT_DIR}/common/config/eive/eventSubsystemIds.h",
 ]
 SUBSYSTEM_DEFS_DEST_AS_PATH = [Path(x) for x in SUBSYSTEM_DEFINITION_DESTINATIONS]
 

generators/events/translateEvents.cpp

@@ -1,7 +1,7 @@
 /**
- * @brief    Auto-generated event translation file. Contains 216 translations.
+ * @brief    Auto-generated event translation file. Contains 217 translations.
  * @details
- * Generated on: 2022-08-24 16:44:18
+ * Generated on: 2022-09-27 09:32:46
  */
 #include "translateEvents.h"
 
@@ -75,6 +75,7 @@ const char *OVERWRITING_HEALTH_STRING = "OVERWRITING_HEALTH";
 const char *TRYING_RECOVERY_STRING = "TRYING_RECOVERY";
 const char *RECOVERY_STEP_STRING = "RECOVERY_STEP";
 const char *RECOVERY_DONE_STRING = "RECOVERY_DONE";
+const char *HANDLE_PACKET_FAILED_STRING = "HANDLE_PACKET_FAILED";
 const char *RF_AVAILABLE_STRING = "RF_AVAILABLE";
 const char *RF_LOST_STRING = "RF_LOST";
 const char *BIT_LOCK_STRING = "BIT_LOCK";
@@ -360,6 +361,8 @@ const char *translateEvents(Event event) {
       return RECOVERY_STEP_STRING;
     case (7512):
       return RECOVERY_DONE_STRING;
+    case (7600):
+      return HANDLE_PACKET_FAILED_STRING;
     case (7900):
       return RF_AVAILABLE_STRING;
     case (7901):

generators/objects/objects.py

@@ -51,7 +51,7 @@ OBJECTS_PATH = Path(f"{FSFW_CONFIG_ROOT}/objects/systemObjectList.h")
 FRAMEWORK_OBJECT_PATH = Path(
     f"{OBSW_ROOT_DIR}/fsfw/src/fsfw/objectmanager/frameworkObjects.h"
 )
-COMMON_OBJECTS_PATH = Path(f"{OBSW_ROOT_DIR}/common/config/commonObjects.h")
+COMMON_OBJECTS_PATH = Path(f"{OBSW_ROOT_DIR}/common/config/eive/objects.h")
 OBJECTS_DEFINITIONS = [OBJECTS_PATH, FRAMEWORK_OBJECT_PATH, COMMON_OBJECTS_PATH]
 
 SQL_DELETE_OBJECTS_CMD = """

generators/objects/translateObjects.cpp

@@ -1,8 +1,8 @@
 /**
  * @brief  Auto-generated object translation file.
  * @details
- * Contains 133 translations.
+ * Contains 135 translations.
- * Generated on: 2022-08-24 16:44:18
+ * Generated on: 2022-09-27 09:32:46
  */
 #include "translateObjects.h"
 
@@ -136,6 +136,8 @@ const char *ACS_BOARD_ASS_STRING = "ACS_BOARD_ASS";
 const char *SUS_BOARD_ASS_STRING = "SUS_BOARD_ASS";
 const char *TCS_BOARD_ASS_STRING = "TCS_BOARD_ASS";
 const char *RW_ASS_STRING = "RW_ASS";
+const char *CFDP_HANDLER_STRING = "CFDP_HANDLER";
+const char *CFDP_DISTRIBUTOR_STRING = "CFDP_DISTRIBUTOR";
 const char *TM_FUNNEL_STRING = "TM_FUNNEL";
 const char *CCSDS_IP_CORE_BRIDGE_STRING = "CCSDS_IP_CORE_BRIDGE";
 const char *NO_OBJECT_STRING = "NO_OBJECT";
@@ -402,6 +404,10 @@ const char *translateObject(object_id_t object) {
       return TCS_BOARD_ASS_STRING;
     case 0x73000004:
       return RW_ASS_STRING;
+    case 0x73000005:
+      return CFDP_HANDLER_STRING;
+    case 0x73000006:
+      return CFDP_DISTRIBUTOR_STRING;
     case 0x73000100:
       return TM_FUNNEL_STRING;
     case 0x73500000:

generators/returnvalues/returnvalues_parser.py

@@ -43,7 +43,7 @@ BSP_PATH = f"{OBSW_ROOT_DIR}/{BSP_DIR_NAME}"
 
 INTERFACE_DEFINITION_FILES = [
     f"{OBSW_ROOT_DIR}/fsfw/src/fsfw/returnvalues/FwClassIds.h",
-    f"{OBSW_ROOT_DIR}/common/config/commonClassIds.h",
+    f"{OBSW_ROOT_DIR}/common/config/eive/resultClassIds.h",
     f"{FSFW_CONFIG_ROOT}/returnvalues/classIds.h",
 ]
 RETURNVALUE_SOURCES = [

linux/devices/GPSHyperionLinuxController.h

@@ -1,7 +1,7 @@
 #ifndef MISSION_DEVICES_GPSHYPERIONHANDLER_H_
 #define MISSION_DEVICES_GPSHYPERIONHANDLER_H_
 
-#include "commonSubsystemIds.h"
+#include "eive/eventSubsystemIds.h"
 #include "fsfw/FSFW.h"
 #include "fsfw/controller/ExtendedControllerBase.h"
 #include "fsfw/devicehandlers/DeviceHandlerBase.h"

linux/devices/ploc/PlocMPSoCHelper.cpp

@@ -5,7 +5,7 @@
 
 #include "OBSWConfig.h"
 #ifdef XIPHOS_Q7S
-#include "bsp_q7s/memory/FilesystemHelper.h"
+#include "bsp_q7s/fs/FilesystemHelper.h"
 #endif
 
 #include "mission/utility/Timestamp.h"

linux/devices/ploc/PlocMPSoCHelper.h

@@ -12,7 +12,7 @@
 #include "fsfw_hal/linux/uart/UartComIF.h"
 #include "linux/devices/devicedefinitions/PlocMPSoCDefinitions.h"
 #ifdef XIPHOS_Q7S
-#include "bsp_q7s/memory/SdCardManager.h"
+#include "bsp_q7s/fs/SdCardManager.h"
 #endif
 
 /**

linux/devices/ploc/PlocMemoryDumper.h

@@ -5,7 +5,7 @@
 #include <linux/devices/devicedefinitions/PlocSupervisorDefinitions.h>
 
 #include "OBSWConfig.h"
-#include "bsp_q7s/memory/SdCardManager.h"
+#include "bsp_q7s/fs/SdCardManager.h"
 #include "fsfw/action/ActionHelper.h"
 #include "fsfw/action/CommandActionHelper.h"
 #include "fsfw/action/CommandsActionsIF.h"

linux/devices/ploc/PlocSupervisorHandler.cpp

@@ -1,6 +1,6 @@
 #include "PlocSupervisorHandler.h"
 
-#include <fsfw/memory/HasFileSystemIF.h>
+#include <fsfw/filesystem/HasFileSystemIF.h>
 
 #include <filesystem>
 #include <fstream>

linux/devices/ploc/PlocSupervisorHandler.h

@@ -3,7 +3,7 @@
 
 #include "OBSWConfig.h"
 #include "PlocSupvHelper.h"
-#include "bsp_q7s/memory/SdCardManager.h"
+#include "bsp_q7s/fs/SdCardManager.h"
 #include "devices/powerSwitcherList.h"
 #include "fsfw/devicehandlers/DeviceHandlerBase.h"
 #include "fsfw/timemanager/Countdown.h"

linux/devices/ploc/PlocSupvHelper.cpp

@@ -8,8 +8,8 @@
 
 #include "OBSWConfig.h"
 #ifdef XIPHOS_Q7S
-#include "bsp_q7s/memory/FilesystemHelper.h"
+#include "bsp_q7s/fs/FilesystemHelper.h"
-#include "bsp_q7s/memory/SdCardManager.h"
+#include "bsp_q7s/fs/SdCardManager.h"
 #endif
 
 #include "fsfw/tasks/TaskFactory.h"

linux/devices/ploc/PlocSupvHelper.h

@@ -13,7 +13,7 @@
 #include "linux/devices/devicedefinitions/PlocSupervisorDefinitions.h"
 
 #ifdef XIPHOS_Q7S
-#include "bsp_q7s/memory/SdCardManager.h"
+#include "bsp_q7s/fs/SdCardManager.h"
 #endif
 
 /**

linux/devices/startracker/StrHelper.cpp

@@ -4,6 +4,7 @@
 #include <fstream>
 
 #include "OBSWConfig.h"
+#include "eive/definitions.h"
 #include "fsfw/timemanager/Countdown.h"
 #include "linux/devices/devicedefinitions/StarTrackerDefinitions.h"
 #include "mission/utility/Filenaming.h"
@@ -541,15 +542,14 @@ ReturnValue_t StrHelper::checkReplyPosition(uint32_t expectedPosition) {
 
 #ifdef XIPHOS_Q7S
 ReturnValue_t StrHelper::checkPath(std::string name) {
-  if (name.substr(0, sizeof(SdCardManager::SD_0_MOUNT_POINT)) ==
+  if (name.substr(0, sizeof(config::SD_0_MOUNT_POINT)) == std::string(config::SD_0_MOUNT_POINT)) {
-      std::string(SdCardManager::SD_0_MOUNT_POINT)) {
+    if (!sdcMan->isSdCardUsable(sd::SLOT_0)) {
-    if (!sdcMan->isSdCardMounted(sd::SLOT_0)) {
       sif::warning << "StrHelper::checkPath: SD card 0 not mounted" << std::endl;
       return SD_NOT_MOUNTED;
     }
-  } else if (name.substr(0, sizeof(SdCardManager::SD_1_MOUNT_POINT)) ==
+  } else if (name.substr(0, sizeof(config::SD_1_MOUNT_POINT)) ==
-             std::string(SdCardManager::SD_1_MOUNT_POINT)) {
+             std::string(config::SD_1_MOUNT_POINT)) {
-    if (!sdcMan->isSdCardMounted(sd::SLOT_0)) {
+    if (!sdcMan->isSdCardUsable(sd::SLOT_0)) {
       sif::warning << "StrHelper::checkPath: SD card 1 not mounted" << std::endl;
       return SD_NOT_MOUNTED;
     }

linux/devices/startracker/StrHelper.h

@@ -7,7 +7,7 @@
 #include "OBSWConfig.h"
 
 #ifdef XIPHOS_Q7S
-#include "bsp_q7s/memory/SdCardManager.h"
+#include "bsp_q7s/fs/SdCardManager.h"
 #endif
 
 #include "fsfw/devicehandlers/CookieIF.h"

linux/fsfwconfig/events/subsystemIdRanges.h

@@ -3,7 +3,7 @@
 
 #include <cstdint>
 
-#include "common/config/commonSubsystemIds.h"
+#include "eive/eventSubsystemIds.h"
 #include "fsfw/events/fwSubsystemIdRanges.h"
 
 /**

linux/fsfwconfig/events/translateEvents.cpp

@@ -1,7 +1,7 @@
 /**
- * @brief    Auto-generated event translation file. Contains 216 translations.
+ * @brief    Auto-generated event translation file. Contains 217 translations.
  * @details
- * Generated on: 2022-08-24 16:44:18
+ * Generated on: 2022-09-27 09:32:46
  */
 #include "translateEvents.h"
 
@@ -75,6 +75,7 @@ const char *OVERWRITING_HEALTH_STRING = "OVERWRITING_HEALTH";
 const char *TRYING_RECOVERY_STRING = "TRYING_RECOVERY";
 const char *RECOVERY_STEP_STRING = "RECOVERY_STEP";
 const char *RECOVERY_DONE_STRING = "RECOVERY_DONE";
+const char *HANDLE_PACKET_FAILED_STRING = "HANDLE_PACKET_FAILED";
 const char *RF_AVAILABLE_STRING = "RF_AVAILABLE";
 const char *RF_LOST_STRING = "RF_LOST";
 const char *BIT_LOCK_STRING = "BIT_LOCK";
@@ -360,6 +361,8 @@ const char *translateEvents(Event event) {
       return RECOVERY_STEP_STRING;
     case (7512):
       return RECOVERY_DONE_STRING;
+    case (7600):
+      return HANDLE_PACKET_FAILED_STRING;
     case (7900):
       return RF_AVAILABLE_STRING;
     case (7901):

linux/fsfwconfig/objects/systemObjectList.h

@@ -5,7 +5,7 @@
 
 #include <cstdint>
 
-#include "commonObjects.h"
+#include "eive/objects.h"
 
 // The objects will be instantiated in the ID order
 // For naming scheme see flight manual

linux/fsfwconfig/objects/translateObjects.cpp

@@ -1,8 +1,8 @@
 /**
  * @brief  Auto-generated object translation file.
  * @details
- * Contains 133 translations.
+ * Contains 135 translations.
- * Generated on: 2022-08-24 16:44:18
+ * Generated on: 2022-09-27 09:32:46
  */
 #include "translateObjects.h"
 
@@ -136,6 +136,8 @@ const char *ACS_BOARD_ASS_STRING = "ACS_BOARD_ASS";
 const char *SUS_BOARD_ASS_STRING = "SUS_BOARD_ASS";
 const char *TCS_BOARD_ASS_STRING = "TCS_BOARD_ASS";
 const char *RW_ASS_STRING = "RW_ASS";
+const char *CFDP_HANDLER_STRING = "CFDP_HANDLER";
+const char *CFDP_DISTRIBUTOR_STRING = "CFDP_DISTRIBUTOR";
 const char *TM_FUNNEL_STRING = "TM_FUNNEL";
 const char *CCSDS_IP_CORE_BRIDGE_STRING = "CCSDS_IP_CORE_BRIDGE";
 const char *NO_OBJECT_STRING = "NO_OBJECT";
@@ -402,6 +404,10 @@ const char *translateObject(object_id_t object) {
       return TCS_BOARD_ASS_STRING;
     case 0x73000004:
       return RW_ASS_STRING;
+    case 0x73000005:
+      return CFDP_HANDLER_STRING;
+    case 0x73000006:
+      return CFDP_DISTRIBUTOR_STRING;
     case 0x73000100:
       return TM_FUNNEL_STRING;
     case 0x73500000:

linux/fsfwconfig/returnvalues/classIds.h

@@ -1,9 +1,10 @@
 #ifndef FSFWCONFIG_RETURNVALUES_CLASSIDS_H_
 #define FSFWCONFIG_RETURNVALUES_CLASSIDS_H_
 
-#include <common/config/commonClassIds.h>
 #include <fsfw/returnvalues/FwClassIds.h>
 
+#include "eive/resultClassIds.h"
+
 /**
  * Source IDs starts at 73 for now
  * Framework IDs for ReturnValues run from 0 to 56

linux/utility/utility.cpp

@@ -8,9 +8,9 @@
 #include "fsfw/serviceinterface/ServiceInterface.h"
 #include "fsfw/timemanager/Clock.h"
 
-void utility::handleSystemError(int retcode, std::string function) {
+void utility::handleSystemError(int retcode, std::string context) {
 #if OBSW_VERBOSE_LEVEL >= 1
-  sif::warning << function << ": System call failed with code " << retcode << ": "
+  sif::warning << context << ": System call failed with code " << retcode << ": "
                << strerror(retcode) << std::endl;
 #endif
 }

mission/CMakeLists.txt

@@ -6,3 +6,4 @@ add_subdirectory(memory)
 add_subdirectory(tmtc)
 add_subdirectory(system)
 add_subdirectory(csp)
+add_subdirectory(cfdp)

mission/cfdp/CMakeLists.txt

@@ -0,0 +1 @@
+

mission/cfdp/Config.h

@@ -0,0 +1,57 @@
+#ifndef MISSION_CFDP_CONFIG_H_
+#define MISSION_CFDP_CONFIG_H_
+
+#include "fsfw/cfdp.h"
+
+namespace cfdp {
+
+class EiveUserHandler : public cfdp::UserBase {
+ public:
+  explicit EiveUserHandler(HasFileSystemIF& vfs) : cfdp::UserBase(vfs) {}
+  virtual ~EiveUserHandler() = default;
+
+  void transactionIndication(const cfdp::TransactionId& id) override {}
+  void eofSentIndication(const cfdp::TransactionId& id) override {}
+  void transactionFinishedIndication(const cfdp::TransactionFinishedParams& params) override {
+    sif::info << "File transaction finished for transaction with " << params.id << std::endl;
+  }
+  void metadataRecvdIndication(const cfdp::MetadataRecvdParams& params) override {
+    sif::info << "Metadata received for transaction with " << params.id << std::endl;
+  }
+  void fileSegmentRecvdIndication(const cfdp::FileSegmentRecvdParams& params) override {}
+  void reportIndication(const cfdp::TransactionId& id, cfdp::StatusReportIF& report) override {}
+  void suspendedIndication(const cfdp::TransactionId& id, cfdp::ConditionCode code) override {}
+  void resumedIndication(const cfdp::TransactionId& id, size_t progress) override {}
+  void faultIndication(const cfdp::TransactionId& id, cfdp::ConditionCode code,
+                       size_t progress) override {}
+  void abandonedIndication(const cfdp::TransactionId& id, cfdp::ConditionCode code,
+                           size_t progress) override {}
+  void eofRecvIndication(const cfdp::TransactionId& id) override {
+    sif::info << "EOF PDU received for transaction with " << id << std::endl;
+  }
+};
+
+class EiveFaultHandler : public cfdp::FaultHandlerBase {
+ public:
+  void noticeOfSuspensionCb(cfdp::TransactionId& id, cfdp::ConditionCode code) override {
+    sif::warning << "Notice of suspension detected for transaction " << id
+                 << " with condition code: " << cfdp::getConditionCodeString(code) << std::endl;
+  }
+  void noticeOfCancellationCb(cfdp::TransactionId& id, cfdp::ConditionCode code) override {
+    sif::warning << "Notice of suspension detected for transaction " << id
+                 << " with condition code: " << cfdp::getConditionCodeString(code) << std::endl;
+  }
+  void abandonCb(cfdp::TransactionId& id, cfdp::ConditionCode code) override {
+    sif::warning << "Transaction " << id
+                 << " was abandoned, condition code : " << cfdp::getConditionCodeString(code)
+                 << std::endl;
+  }
+  void ignoreCb(cfdp::TransactionId& id, cfdp::ConditionCode code) override {
+    sif::warning << "Fault ignored for transaction " << id
+                 << ", condition code: " << cfdp::getConditionCodeString(code) << std::endl;
+  }
+};
+
+}  // namespace cfdp
+
+#endif /* MISSION_CFDP_CONFIG_H_ */

mission/controller/AcsController.h

@@ -1,10 +1,10 @@
 #ifndef MISSION_CONTROLLER_ACSCONTROLLER_H_
 #define MISSION_CONTROLLER_ACSCONTROLLER_H_
 
-#include <commonObjects.h>
 #include <fsfw/controller/ExtendedControllerBase.h>
 
 #include "controllerdefinitions/AcsCtrlDefinitions.h"
+#include "eive/objects.h"
 #include "fsfw_hal/devicehandlers/MgmLIS3MDLHandler.h"
 #include "fsfw_hal/devicehandlers/MgmRM3100Handler.h"
 #include "mission/devices/devicedefinitions/IMTQHandlerDefinitions.h"

mission/core/GenericFactory.cpp

@@ -1,8 +1,12 @@
 #include "GenericFactory.h"
 
+#include <fsfw/cfdp/CfdpDistributor.h>
+#include <fsfw/cfdp/handler/CfdpHandler.h>
+#include <fsfw/cfdp/handler/RemoteConfigTableIF.h>
 #include <fsfw/events/EventManager.h>
 #include <fsfw/health/HealthTable.h>
 #include <fsfw/internalerror/InternalErrorReporter.h>
+#include <fsfw/ipc/QueueFactory.h>
 #include <fsfw/pus/CService200ModeCommanding.h>
 #include <fsfw/pus/CService201HealthCommanding.h>
 #include <fsfw/pus/Service17Test.h>
@@ -14,16 +18,17 @@
 #include <fsfw/pus/Service8FunctionManagement.h>
 #include <fsfw/pus/Service9TimeManagement.h>
 #include <fsfw/storagemanager/PoolManager.h>
-#include <fsfw/tcdistribution/CCSDSDistributor.h>
+#include <fsfw/tcdistribution/CcsdsDistributor.h>
 #include <fsfw/tcdistribution/PusDistributor.h>
 #include <fsfw/timemanager/CdsShortTimeStamper.h>
+#include <fsfw_hal/host/HostFilesystem.h>
 #include <mission/tmtc/TmFunnel.h>
 
 #include "OBSWConfig.h"
 #include "eive/definitions.h"
 #include "fsfw/pus/Service11TelecommandScheduling.h"
+#include "mission/cfdp/Config.h"
 #include "objects/systemObjectList.h"
-#include "tmtc/apid.h"
 #include "tmtc/pusIds.h"
 
 #if OBSW_ADD_TCPIP_BRIDGE == 1
@@ -46,6 +51,19 @@
 #define OBSW_TM_TO_PTME 0
 #endif
 
+namespace cfdp {
+
+PacketInfoList<64> PACKET_LIST;
+LostSegmentsList<128> LOST_SEGMENTS;
+EntityId REMOTE_CFDP_ID(UnsignedByteField<uint16_t>(config::EIVE_GROUND_CFDP_ENTITY_ID));
+RemoteEntityCfg GROUND_REMOTE_CFG(REMOTE_CFDP_ID);
+OneRemoteConfigProvider REMOTE_CFG_PROVIDER(GROUND_REMOTE_CFG);
+HostFilesystem HOST_FS;
+EiveUserHandler USER_HANDLER(HOST_FS);
+EiveFaultHandler EIVE_FAULT_HANDLER;
+
+}  // namespace cfdp
+
 void ObjectFactory::produceGenericObjects(HealthTableIF** healthTable_) {
   // Framework objects
   new EventManager(objects::EVENT_MANAGER);
@@ -56,17 +74,18 @@ void ObjectFactory::produceGenericObjects(HealthTableIF** healthTable_) {
   new InternalErrorReporter(objects::INTERNAL_ERROR_REPORTER);
   new VerificationReporter();
   auto* timeStamper = new CdsShortTimeStamper(objects::TIME_STAMPER);
-
+  StorageManagerIF* tcStore;
+  StorageManagerIF* tmStore;
   {
-    PoolManager::LocalPoolConfig poolCfg = {{300, 16},  {300, 32},   {200, 64},
+    PoolManager::LocalPoolConfig poolCfg = {{200, 16},  {200, 32},   {150, 64},
-                                            {200, 128}, {100, 1024}, {10, 2048}};
+                                            {100, 128}, {100, 1024}, {100, 2048}};
-    new PoolManager(objects::TC_STORE, poolCfg);
+    tcStore = new PoolManager(objects::TC_STORE, poolCfg);
   }
 
   {
     PoolManager::LocalPoolConfig poolCfg = {{300, 16},  {300, 32},   {100, 64},
-                                            {100, 128}, {100, 1024}, {10, 2048}};
+                                            {100, 128}, {100, 1024}, {100, 2048}};
-    new PoolManager(objects::TM_STORE, poolCfg);
+    tmStore = new PoolManager(objects::TM_STORE, poolCfg);
   }
 
   {
@@ -75,40 +94,42 @@ void ObjectFactory::produceGenericObjects(HealthTableIF** healthTable_) {
     new PoolManager(objects::IPC_STORE, poolCfg);
   }
 
-  auto* ccsdsDistrib = new CCSDSDistributor(apid::EIVE_OBSW, objects::CCSDS_PACKET_DISTRIBUTOR);
+  auto* ccsdsDistrib =
-  new PusDistributor(apid::EIVE_OBSW, objects::PUS_PACKET_DISTRIBUTOR, ccsdsDistrib);
+      new CcsdsDistributor(config::EIVE_PUS_APID, objects::CCSDS_PACKET_DISTRIBUTOR);
+  new PusDistributor(config::EIVE_PUS_APID, objects::PUS_PACKET_DISTRIBUTOR, ccsdsDistrib);
 
   uint8_t vc = 0;
 #if OBSW_TM_TO_PTME == 1
   vc = config::LIVE_TM;
 #endif
   // Every TM packet goes through this funnel
-  new TmFunnel(objects::TM_FUNNEL, *timeStamper, 50, vc);
+  auto* funnel = new TmFunnel(objects::TM_FUNNEL, *timeStamper, 50, vc);
 
   // PUS service stack
-  new Service1TelecommandVerification(objects::PUS_SERVICE_1_VERIFICATION, apid::EIVE_OBSW,
+  new Service1TelecommandVerification(objects::PUS_SERVICE_1_VERIFICATION, config::EIVE_PUS_APID,
                                       pus::PUS_SERVICE_1, objects::TM_FUNNEL, 20);
-  new Service2DeviceAccess(objects::PUS_SERVICE_2_DEVICE_ACCESS, apid::EIVE_OBSW,
+  new Service2DeviceAccess(objects::PUS_SERVICE_2_DEVICE_ACCESS, config::EIVE_PUS_APID,
                            pus::PUS_SERVICE_2, 3, 10);
-  new Service3Housekeeping(objects::PUS_SERVICE_3_HOUSEKEEPING, apid::EIVE_OBSW,
+  new Service3Housekeeping(objects::PUS_SERVICE_3_HOUSEKEEPING, config::EIVE_PUS_APID,
                            pus::PUS_SERVICE_3);
   new Service5EventReporting(
-      PsbParams(objects::PUS_SERVICE_5_EVENT_REPORTING, apid::EIVE_OBSW, pus::PUS_SERVICE_5), 15,
+      PsbParams(objects::PUS_SERVICE_5_EVENT_REPORTING, config::EIVE_PUS_APID, pus::PUS_SERVICE_5),
-      45);
+      15, 45);
-  new Service8FunctionManagement(objects::PUS_SERVICE_8_FUNCTION_MGMT, apid::EIVE_OBSW,
+  new Service8FunctionManagement(objects::PUS_SERVICE_8_FUNCTION_MGMT, config::EIVE_PUS_APID,
                                  pus::PUS_SERVICE_8, 16, 60);
   new Service9TimeManagement(
-      PsbParams(objects::PUS_SERVICE_9_TIME_MGMT, apid::EIVE_OBSW, pus::PUS_SERVICE_9));
+      PsbParams(objects::PUS_SERVICE_9_TIME_MGMT, config::EIVE_PUS_APID, pus::PUS_SERVICE_9));
 
   new Service11TelecommandScheduling<common::OBSW_MAX_SCHEDULED_TCS>(
-      PsbParams(objects::PUS_SERVICE_11_TC_SCHEDULER, apid::EIVE_OBSW, pus::PUS_SERVICE_11),
+      PsbParams(objects::PUS_SERVICE_11_TC_SCHEDULER, config::EIVE_PUS_APID, pus::PUS_SERVICE_11),
       ccsdsDistrib);
-  new Service17Test(PsbParams(objects::PUS_SERVICE_17_TEST, apid::EIVE_OBSW, pus::PUS_SERVICE_17));
+  new Service17Test(
-  new Service20ParameterManagement(objects::PUS_SERVICE_20_PARAMETERS, apid::EIVE_OBSW,
+      PsbParams(objects::PUS_SERVICE_17_TEST, config::EIVE_PUS_APID, pus::PUS_SERVICE_17));
+  new Service20ParameterManagement(objects::PUS_SERVICE_20_PARAMETERS, config::EIVE_PUS_APID,
                                    pus::PUS_SERVICE_20);
-  new CService200ModeCommanding(objects::PUS_SERVICE_200_MODE_MGMT, apid::EIVE_OBSW,
+  new CService200ModeCommanding(objects::PUS_SERVICE_200_MODE_MGMT, config::EIVE_PUS_APID,
                                 pus::PUS_SERVICE_200, 8);
-  new CService201HealthCommanding(objects::PUS_SERVICE_201_HEALTH, apid::EIVE_OBSW,
+  new CService201HealthCommanding(objects::PUS_SERVICE_201_HEALTH, config::EIVE_PUS_APID,
                                   pus::PUS_SERVICE_201);
 #if OBSW_ADD_TCPIP_BRIDGE == 1
 #if OBSW_USE_TMTC_TCP_BRIDGE == 0
@@ -120,7 +141,7 @@ void ObjectFactory::produceGenericObjects(HealthTableIF** healthTable_) {
   auto tmtcBridge = new TcpTmTcBridge(objects::TMTC_BRIDGE, objects::CCSDS_PACKET_DISTRIBUTOR);
   auto tcpServer = new TcpTmTcServer(objects::TMTC_POLLING_TASK, objects::TMTC_BRIDGE);
   // TCP is stream based. Use packet ID as start marker when parsing for space packets
-  tcpServer->setSpacePacketParsingOptions({common::PUS_PACKET_ID});
+  tcpServer->setSpacePacketParsingOptions({common::PUS_PACKET_ID, common::CFDP_PACKET_ID});
   sif::info << "Created TCP server for TMTC commanding with listener port "
             << tcpServer->getTcpPort() << std::endl;
 #if OBSW_TCP_SERVER_WIRETAPPING == 1
@@ -129,4 +150,25 @@ void ObjectFactory::produceGenericObjects(HealthTableIF** healthTable_) {
 #endif /* OBSW_USE_TMTC_TCP_BRIDGE == 0 */
   tmtcBridge->setMaxNumberOfPacketsStored(300);
 #endif /* OBSW_ADD_TCPIP_BRIDGE == 1 */
+
+#if OBSW_ADD_CFDP_COMPONENTS == 1
+  using namespace cfdp;
+  MessageQueueIF* cfdpMsgQueue = QueueFactory::instance()->createMessageQueue(32);
+  CfdpDistribCfg distribCfg(objects::CFDP_DISTRIBUTOR, *tcStore, cfdpMsgQueue);
+  new CfdpDistributor(distribCfg);
+
+  auto* msgQueue = QueueFactory::instance()->createMessageQueue(32);
+  FsfwHandlerParams params(objects::CFDP_HANDLER, HOST_FS, *funnel, *tcStore, *tmStore, *msgQueue);
+  cfdp::IndicationCfg indicationCfg;
+  UnsignedByteField<uint16_t> apid(config::EIVE_LOCAL_CFDP_ENTITY_ID);
+  cfdp::EntityId localId(apid);
+  GROUND_REMOTE_CFG.defaultChecksum = cfdp::ChecksumType::CRC_32;
+  CfdpHandlerCfg cfdpCfg(localId, indicationCfg, USER_HANDLER, EIVE_FAULT_HANDLER, PACKET_LIST,
+                         LOST_SEGMENTS, REMOTE_CFG_PROVIDER);
+  auto* cfdpHandler = new CfdpHandler(params, cfdpCfg);
+  // All CFDP packets arrive wrapped inside CCSDS space packets
+  CcsdsDistributorIF::DestInfo info("CFDP Destination", config::EIVE_CFDP_APID,
+                                    cfdpHandler->getRequestQueue(), true);
+  ccsdsDistrib->registerApplication(info);
+#endif
 }

mission/devices/GomspaceDeviceHandler.cpp

@@ -1,6 +1,5 @@
 #include "GomspaceDeviceHandler.h"
 
-#include <common/config/commonObjects.h>
 #include <fsfw/datapool/PoolReadGuard.h>
 #include <fsfw/globalfunctions/arrayprinter.h>
 
@@ -8,6 +7,7 @@
 
 #include "devicedefinitions/GomSpacePackets.h"
 #include "devicedefinitions/powerDefinitions.h"
+#include "eive/objects.h"
 
 using namespace GOMSPACE;
 

mission/devices/P60DockHandler.h

@@ -4,7 +4,7 @@
 #include <mission/devices/devicedefinitions/GomspaceDefinitions.h>
 
 #include "GomspaceDeviceHandler.h"
-#include "commonSubsystemIds.h"
+#include "eive/eventSubsystemIds.h"
 
 /**
  * @brief   Device handler for the P60Dock. The P60Dock serves as carrier for the ACU, PDU1 and

mission/devices/PayloadPcduHandler.cpp

@@ -492,7 +492,7 @@ void PayloadPcduHandler::checkAdcValues() {
 void PayloadPcduHandler::checkJsonFileInit() {
   if (not jsonFileInitComplete) {
     sd::SdCard activeSd = sdcMan->getActiveSdCard();
-    if (sdcMan->isSdCardMounted(activeSd)) {
+    if (sdcMan->isSdCardUsable(activeSd)) {
       params.initialize(sdcMan->getCurrentMountPrefix());
       jsonFileInitComplete = true;
     }

mission/devices/devicedefinitions/SpBase.h

@@ -39,7 +39,7 @@ class SpTcBase {
   }
 
   void updateSpFields() {
-    spParams.creator.setDataLen(spParams.dataFieldLen - 1);
+    spParams.creator.setDataLenField(spParams.dataFieldLen - 1);
     spParams.creator.setPacketType(ccsds::PacketType::TC);
   }
 

mission/devices/devicedefinitions/SyrlinksDefinitions.h

@@ -1,8 +1,7 @@
 #ifndef MISSION_DEVICES_DEVICEDEFINITIONS_SYRLINKSDEFINITIONS_H_
 #define MISSION_DEVICES_DEVICEDEFINITIONS_SYRLINKSDEFINITIONS_H_
 
-#include <commonSubsystemIds.h>
+#include "eive/eventSubsystemIds.h"
-
 #include "fsfw/devicehandlers/DeviceHandlerBase.h"
 
 namespace syrlinks {

mission/devices/devicedefinitions/powerDefinitions.h

@@ -1,9 +1,10 @@
 #ifndef MISSION_DEVICES_DEVICEDEFINITIONS_POWERDEFINITIONS_H_
 #define MISSION_DEVICES_DEVICEDEFINITIONS_POWERDEFINITIONS_H_
 
-#include <common/config/commonSubsystemIds.h>
 #include <fsfw/events/Event.h>
 
+#include "eive/eventSubsystemIds.h"
+
 namespace power {
 
 static constexpr uint8_t SUBSYSTEM_ID = SUBSYSTEM_ID::PCDU_HANDLER;

mission/memory/NVMParameterBase.cpp

@@ -2,7 +2,7 @@
 
 #include <fstream>
 
-#include "fsfw/memory/HasFileSystemIF.h"
+#include "fsfw/filesystem/HasFileSystemIF.h"
 #include "fsfw/serviceinterface/ServiceInterface.h"
 
 NVMParameterBase::NVMParameterBase(std::string fullName) : fullName(fullName) {}

mission/memory/SdCardMountedIF.h

@@ -9,7 +9,7 @@ class SdCardMountedIF {
  public:
   virtual ~SdCardMountedIF(){};
   virtual std::string getCurrentMountPrefix() const = 0;
-  virtual bool isSdCardMounted(sd::SdCard sdCard) = 0;
+  virtual bool isSdCardUsable(sd::SdCard sdCard) = 0;
   virtual sd::SdCard getPreferredSdCard() const = 0;
   virtual void setActiveSdCard(sd::SdCard sdCard) = 0;
   virtual sd::SdCard getActiveSdCard() const = 0;

mission/system/AcsBoardAssembly.h

@@ -1,13 +1,13 @@
 #ifndef MISSION_SYSTEM_ACSBOARDASSEMBLY_H_
 #define MISSION_SYSTEM_ACSBOARDASSEMBLY_H_
 
-#include <common/config/commonSubsystemIds.h>
 #include <devices/powerSwitcherList.h>
 #include <fsfw/objectmanager/frameworkObjects.h>
 #include <fsfw_hal/common/gpio/gpioDefinitions.h>
 
 #include "DualLaneAssemblyBase.h"
 #include "DualLanePowerStateMachine.h"
+#include "eive/eventSubsystemIds.h"
 
 struct AcsBoardHelper {
   AcsBoardHelper(object_id_t mgm0Id, object_id_t mgm1Id, object_id_t mgm2Id, object_id_t mgm3Id,

mission/system/fdir/AcsBoardFdir.cpp

@@ -1,6 +1,6 @@
 #include "AcsBoardFdir.h"
 
-#include <common/config/commonObjects.h>
+#include "eive/objects.h"
 
 AcsBoardFdir::AcsBoardFdir(object_id_t sensorId)
     : DeviceHandlerFailureIsolation(sensorId, objects::ACS_BOARD_ASS) {}

mission/system/fdir/RtdFdir.cpp

@@ -1,6 +1,6 @@
 #include "RtdFdir.h"
 
-#include <common/config/commonObjects.h>
+#include "eive/objects.h"
 
 RtdFdir::RtdFdir(object_id_t sensorId)
     : DeviceHandlerFailureIsolation(sensorId, objects::TCS_BOARD_ASS) {}

mission/system/fdir/SusFdir.cpp

@@ -1,6 +1,6 @@
 #include "SusFdir.h"
 
-#include <common/config/commonObjects.h>
+#include "eive/objects.h"
 
 SusFdir::SusFdir(object_id_t sensorId)
     : DeviceHandlerFailureIsolation(sensorId, objects::SUS_BOARD_ASS) {}

mission/tmtc/CCSDSHandler.cpp

@@ -203,9 +203,9 @@ ReturnValue_t CCSDSHandler::getParameter(uint8_t domainId, uint8_t uniqueIdentif
   return returnvalue::OK;
 }
 
-uint16_t CCSDSHandler::getIdentifier() { return 0; }
+uint32_t CCSDSHandler::getIdentifier() const { return 0; }
 
-MessageQueueId_t CCSDSHandler::getRequestQueue() {
+MessageQueueId_t CCSDSHandler::getRequestQueue() const {
   // Forward packets directly to TC distributor
   return tcDistributorQueueId;
 }
@@ -345,3 +345,5 @@ void CCSDSHandler::disableTransmit() {
   forwardLinkstate();
   transmitterCountdown.setTimeout(0);
 }
+
+const char* CCSDSHandler::getName() const { return "CCSDS Handler"; }

mission/tmtc/CCSDSHandler.h

@@ -72,8 +72,9 @@ class CCSDSHandler : public SystemObject,
                              ParameterWrapper* parameterWrapper, const ParameterWrapper* newValues,
                              uint16_t startAtIndex);
 
-  uint16_t getIdentifier() override;
+  uint32_t getIdentifier() const override;
-  MessageQueueId_t getRequestQueue() override;
+  MessageQueueId_t getRequestQueue() const override;
+  const char* getName() const override;
 
   virtual ReturnValue_t executeAction(ActionId_t actionId, MessageQueueId_t commandedBy,
                                       const uint8_t* data, size_t size);

mission/tmtc/TmFunnel.cpp

@@ -121,3 +121,5 @@ ReturnValue_t TmFunnel::initialize() {
 
   return SystemObject::initialize();
 }
+
+const char* TmFunnel::getName() const { return "TM Funnel"; }

mission/tmtc/TmFunnel.h

@@ -28,9 +28,10 @@ class TmFunnel : public AcceptsTelemetryIF, public ExecutableObjectIF, public Sy
            uint8_t reportReceptionVc = 0);
   virtual ~TmFunnel();
 
-  virtual MessageQueueId_t getReportReceptionQueue(uint8_t virtualChannel = 0) override;
+  const char* getName() const override;
-  virtual ReturnValue_t performOperation(uint8_t operationCode = 0) override;
+  MessageQueueId_t getReportReceptionQueue(uint8_t virtualChannel = 0) override;
-  virtual ReturnValue_t initialize() override;
+  ReturnValue_t performOperation(uint8_t operationCode = 0) override;
+  ReturnValue_t initialize() override;
 
  protected:
   static object_id_t downlinkDestination;

mission/tmtc/VirtualChannel.cpp

@@ -12,6 +12,7 @@ VirtualChannel::VirtualChannel(uint8_t vcId, uint32_t tmQueueDepth, object_id_t
   auto mqArgs = MqArgs(ownerId, reinterpret_cast<void*>(vcId));
   tmQueue = QueueFactory::instance()->createMessageQueue(
       tmQueueDepth, MessageQueueMessage::MAX_MESSAGE_SIZE, &mqArgs);
+  vcName = "VC " + vcId;
 }
 
 ReturnValue_t VirtualChannel::initialize() {
@@ -65,3 +66,5 @@ void VirtualChannel::setPtmeObject(PtmeIF* ptme_) {
 }
 
 void VirtualChannel::setLinkState(bool linkIsUp_) { linkIsUp = linkIsUp_; }
+
+const char* VirtualChannel::getName() const { return vcName.c_str(); }

mission/tmtc/VirtualChannel.h

@@ -42,11 +42,13 @@ class VirtualChannel : public AcceptsTelemetryIF {
    *          to ground station is down.
    */
   void setLinkState(bool linkIsUp_);
+  const char* getName() const override;
 
  private:
   PtmeIF* ptme = nullptr;
   MessageQueueIF* tmQueue = nullptr;
   uint8_t vcId = 0;
+  std::string vcName;
 
   bool linkIsUp = false;
 

scripts/create-sw-update.sh

@@ -0,0 +1,34 @@
+#!/bin/bash
+
+cmake --build . -j
+source create-version-file.sh
+
+if [ ! -f eive-obsw-stripped ]; then
+	echo "No file eive-obsw-stripped found. Please ensure you are in the "
+	echo "build folder and the OBSW was built properly"
+	exit 1
+fi
+
+if [ ! -f obsw_version.txt ]; then
+	echo "No OBSW version file found."
+	echo "You can use the create-version-file.sh script to create it"
+	exit 1
+fi
+
+mkdir update-archive
+cp eive-obsw-stripped update-archive
+cp obsw_version.txt update-archive
+
+cd update-archive
+
+sudo chown root:root eive-obsw-stripped
+sudo chown root:root obsw_version.txt
+
+cmd="tar -cJvf eive-sw-update.tar.xz eive-obsw-stripped obsw_version.txt"
+echo "Running command ${cmd} to generate compressed SW update archive."
+eval ${cmd}
+cp eive-sw-update.tar.xz ..
+cd ..
+rm -rf update-archive
+
+echo "Generated eive-sw-update.tar.xz update archive."

scripts/create-version-file.sh

@@ -0,0 +1,7 @@
+#!/bin/bash
+obsw_version_filename="obsw_version.txt"
+version_cmd="git describe --tags --always --exclude docker_*"
+version_tag=$(${version_cmd})
+echo "-I- Running ${version_cmd} to retrieve OBSW version and store it into ${obsw_version_filename}"
+echo "-I- Detected version tag ${version_tag}"
+echo ${version_tag} > ${obsw_version_filename}

scripts/q7s-cp.py

@@ -97,10 +97,12 @@ def build_cmd(args):
             target = f"/tmp"
         else:
             target = args.target
+    # accepted_key_rsa_args = "-o HostKeyAlgorithms=+ssh-rsa -o PubkeyAcceptedKeyTypes=+ssh-rsa"
+    accepted_key_rsa_args = ""
     if args.invert:
-        cmd += f"{port_args} {address}:{args.source} {target}"
+        cmd += f"{port_args} {accepted_key_rsa_args} {address}:{args.source} {target}"
     else:
-        cmd += f"{port_args} {args.source} {address}:{target}"
+        cmd += f"{port_args} {accepted_key_rsa_args} {args.source} {address}:{target}"
     return cmd
 
 

tmtc

@@ -1 +1 @@
-Subproject commit 603b7e8574d74ba60692115133cde3cd8b8bd423
+Subproject commit f8e8f9a125bb9b919da2fceeeb4b143aff5bf6ed

unittest/rebootLogic/src/CoreController.cpp

@@ -21,7 +21,7 @@ CoreController::CoreController() {
 
 void CoreController::performRebootFileHandling(bool recreateFile) {
   using namespace std;
-  std::string path = sdcMan->getCurrentMountPrefix(sdInfo.pref) + REBOOT_FILE;
+  std::string path = sdcMan->getCurrentMountPrefix(sdInfo.active) + REBOOT_FILE;
   if (not std::filesystem::exists(path) or recreateFile) {
 #if OBSW_VERBOSE_LEVEL >= 1
     sif::info << "CoreController::performRebootFileHandling: Recreating reboot file" << std::endl;
@@ -400,7 +400,7 @@ bool CoreController::parseRebootFile(std::string path, RebootFile &rf) {
 }
 
 void CoreController::resetRebootCount(xsc::Chip tgtChip, xsc::Copy tgtCopy) {
-  std::string path = sdcMan->getCurrentMountPrefix(sdInfo.pref) + REBOOT_FILE;
+  std::string path = sdcMan->getCurrentMountPrefix(sdInfo.active) + REBOOT_FILE;
   // Disable the reboot file mechanism
   parseRebootFile(path, rebootFile);
   if (tgtChip == xsc::ALL_CHIP and tgtCopy == xsc::ALL_COPY) {
@@ -427,7 +427,7 @@ void CoreController::resetRebootCount(xsc::Chip tgtChip, xsc::Copy tgtCopy) {
 }
 
 void CoreController::rewriteRebootFile(RebootFile file) {
-  std::string path = sdcMan->getCurrentMountPrefix(sdInfo.pref) + REBOOT_FILE;
+  std::string path = sdcMan->getCurrentMountPrefix(sdInfo.active) + REBOOT_FILE;
   std::ofstream rebootFile(path);
   if (rebootFile.is_open()) {
     // Initiate reboot file first. Reboot handling will be on on initialization
@@ -450,7 +450,7 @@ ReturnValue_t CoreController::executeAction(ActionId_t actionId, MessageQueueId_
       if (size < 1) {
         return HasActionsIF::INVALID_PARAMETERS;
       }
-      std::string path = sdcMan->getCurrentMountPrefix(sdInfo.pref) + REBOOT_FILE;
+      std::string path = sdcMan->getCurrentMountPrefix(sdInfo.active) + REBOOT_FILE;
       // Disable the reboot file mechanism
       parseRebootFile(path, rebootFile);
       if (data[0] == 0) {
@@ -490,7 +490,7 @@ ReturnValue_t CoreController::executeAction(ActionId_t actionId, MessageQueueId_
       if (size < 1) {
         return HasActionsIF::INVALID_PARAMETERS;
       }
-      std::string path = sdcMan->getCurrentMountPrefix(sdInfo.pref) + REBOOT_FILE;
+      std::string path = sdcMan->getCurrentMountPrefix(sdInfo.active) + REBOOT_FILE;
       // Disable the reboot file mechanism
       parseRebootFile(path, rebootFile);
       rebootFile.maxCount = data[0];
@@ -504,7 +504,7 @@ ReturnValue_t CoreController::executeAction(ActionId_t actionId, MessageQueueId_
 }
 
 void CoreController::setRebootMechanismLock(bool lock, xsc::Chip tgtChip, xsc::Copy tgtCopy) {
-  std::string path = sdcMan->getCurrentMountPrefix(sdInfo.pref) + REBOOT_FILE;
+  std::string path = sdcMan->getCurrentMountPrefix(sdInfo.active) + REBOOT_FILE;
   // Disable the reboot file mechanism
   parseRebootFile(path, rebootFile);
   if (tgtChip == xsc::CHIP_0) {

unittest/rebootLogic/src/CoreController.h

@@ -66,9 +66,9 @@ class CoreController {
   void rewriteRebootFile(RebootFile file);
 
  private:
-  struct SdInfo {
+  struct SdFsmParams {
-    sd::SdCard pref = sd::SdCard::NONE;
+    sd::SdCard active = sd::SdCard::NONE;
-    sd::SdState prefState = sd::SdState::OFF;
+    sd::SdState activeState = sd::SdState::OFF;
     sd::SdCard other = sd::SdCard::NONE;
     sd::SdState otherState = sd::SdState::OFF;
   } sdInfo;