Merge pull request 'Rename RTDs' (#246) from mueller/rename-rtds into develop

Reviewed-on: #246
Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>

CHANGELOG.md

@@ -10,6 +10,12 @@ list yields a list of all related PRs for each release.
 
 # [unreleased]
 
+# [v1.12.0]
+
+## Changed
+
+- Better RTD names denoting their purpose (and location consequently)
+
 # [v1.11.0]
 
 ## Fixed

bsp_hosted/ObjectFactory.cpp

@@ -7,9 +7,9 @@
 #include <objects/systemObjectList.h>
 #include <tmtc/apid.h>
 #include <tmtc/pusIds.h>
-#include "fsfw_tests/integration/task/TestTask.h"
 
 #include "OBSWConfig.h"
+#include "fsfw_tests/integration/task/TestTask.h"
 
 #if OBSW_USE_TMTC_TCP_BRIDGE == 0
 #include "fsfw/osal/common/UdpTcPollingTask.h"

bsp_q7s/boardtest/Q7STestTask.cpp

@@ -156,13 +156,13 @@ void Q7STestTask::testDummyParams() {
   result = param.getValue<int>(DummyParameter::DUMMY_KEY_PARAM_1, test);
   if (result != HasReturnvaluesIF::RETURN_OK) {
     sif::warning << "Q7STestTask::testDummyParams: Key " << DummyParameter::DUMMY_KEY_PARAM_1
-        << " does not exist" << std::endl;
+                 << " does not exist" << std::endl;
   }
   std::string test2;
   result = param.getValue<std::string>(DummyParameter::DUMMY_KEY_PARAM_2, test2);
   if (result != HasReturnvaluesIF::RETURN_OK) {
     sif::warning << "Q7STestTask::testDummyParams: Key " << DummyParameter::DUMMY_KEY_PARAM_1
-        << " does not exist" << std::endl;
+                 << " does not exist" << std::endl;
   }
   sif::info << "Test value (3 expected): " << test << std::endl;
   sif::info << "Test value 2 (\"blirb\" expected): " << test2 << std::endl;
@@ -172,7 +172,7 @@ ReturnValue_t Q7STestTask::initialize() {
   coreController = ObjectManager::instance()->get<CoreController>(objects::CORE_CONTROLLER);
   if (coreController == nullptr) {
     sif::warning << "Q7STestTask::initialize: Could not retrieve CORE_CONTROLLER object"
-        << std::endl;
+                 << std::endl;
   }
   return TestTask::initialize();
 }
@@ -182,14 +182,14 @@ void Q7STestTask::testProtHandler() {
   ReturnValue_t result = HasReturnvaluesIF::RETURN_OK;
   // If any chips are unlocked, lock them here
   result = coreController->setBootCopyProtection(xsc::Chip::ALL_CHIP, xsc::Copy::ALL_COPY, true,
-      opPerformed, true);
+                                                 opPerformed, true);
   if (result != HasReturnvaluesIF::RETURN_OK) {
     sif::warning << "Q7STestTask::testProtHandler: Op failed" << std::endl;
   }
 
   // unlock own copy
   result = coreController->setBootCopyProtection(xsc::Chip::SELF_CHIP, xsc::Copy::SELF_COPY, false,
-      opPerformed, true);
+                                                 opPerformed, true);
   if (result != HasReturnvaluesIF::RETURN_OK) {
     sif::warning << "Q7STestTask::testProtHandler: Op failed" << std::endl;
   }
@@ -203,7 +203,7 @@ void Q7STestTask::testProtHandler() {
 
   // lock own copy
   result = coreController->setBootCopyProtection(xsc::Chip::SELF_CHIP, xsc::Copy::SELF_COPY, true,
-      opPerformed, true);
+                                                 opPerformed, true);
   if (result != HasReturnvaluesIF::RETURN_OK) {
     sif::warning << "Q7STestTask::testProtHandler: Op failed" << std::endl;
   }
@@ -217,7 +217,7 @@ void Q7STestTask::testProtHandler() {
 
   // unlock specific copy
   result = coreController->setBootCopyProtection(xsc::Chip::CHIP_1, xsc::Copy::COPY_1, false,
-      opPerformed, true);
+                                                 opPerformed, true);
   if (result != HasReturnvaluesIF::RETURN_OK) {
     sif::warning << "Q7STestTask::testProtHandler: Op failed" << std::endl;
   }
@@ -231,7 +231,7 @@ void Q7STestTask::testProtHandler() {
 
   // lock specific copy
   result = coreController->setBootCopyProtection(xsc::Chip::CHIP_1, xsc::Copy::COPY_1, true,
-      opPerformed, true);
+                                                 opPerformed, true);
   if (result != HasReturnvaluesIF::RETURN_OK) {
     sif::warning << "Q7STestTask::testProtHandler: Op failed" << std::endl;
   }
@@ -273,7 +273,7 @@ void Q7STestTask::testGpsDaemonShm() {
 }
 
 void Q7STestTask::testGpsDaemonSocket() {
-  if(gpsmmShmPtr == nullptr) {
+  if (gpsmmShmPtr == nullptr) {
     gpsmmShmPtr = new gpsmm("localhost", DEFAULT_GPSD_PORT);
   }
   // The data from the device will generally be read all at once. Therefore, we
@@ -283,7 +283,7 @@ void Q7STestTask::testGpsDaemonSocket() {
       // Opening failed
 #if FSFW_VERBOSE_LEVEL >= 1
       sif::warning << "Q7STestTask::testGpsDaemonSocket: Opening GPSMM failed | "
-          << "Error " << errno << " | " << gps_errstr(errno) << std::endl;
+                   << "Error " << errno << " | " << gps_errstr(errno) << std::endl;
 #endif
 
       gpsNotOpenSwitch = false;
@@ -291,17 +291,16 @@ void Q7STestTask::testGpsDaemonSocket() {
     return;
   }
   // Stopwatch watch;
-  gps_data_t *gps = nullptr;
+  gps_data_t* gps = nullptr;
   gpsmmShmPtr->stream(WATCH_ENABLE | WATCH_JSON);
-  if(not gpsmmShmPtr->waiting(50000000)) {
+  if (not gpsmmShmPtr->waiting(50000000)) {
     return;
   }
   gps = gpsmmShmPtr->read();
   if (gps == nullptr) {
     if (gpsReadFailedSwitch) {
       gpsReadFailedSwitch = false;
-      sif::warning << "Q7STestTask::testGpsDaemonSocket: Reading GPS data failed"
+      sif::warning << "Q7STestTask::testGpsDaemonSocket: Reading GPS data failed" << std::endl;
-          << std::endl;
     }
     return;
   }
@@ -312,8 +311,8 @@ void Q7STestTask::testGpsDaemonSocket() {
     if (noModeSetCntr == 10) {
       // TODO: Trigger event here
       sif::warning << "Q7STestTask::testGpsDaemonSocket: No mode could be "
-          "read for 10 consecutive reads"
+                      "read for 10 consecutive reads"
-          << std::endl;
+                   << std::endl;
       noModeSetCntr = -1;
     }
     return;
@@ -339,7 +338,7 @@ void Q7STestTask::testFileSystemHandlerDirect(FsOpCodes opCode) {
   auto fsHandler = ObjectManager::instance()->get<FileSystemHandler>(objects::FILE_SYSTEM_HANDLER);
   if (fsHandler == nullptr) {
     sif::warning << "Q7STestTask::testFileSystemHandlerDirect: No FS handler running.."
-        << std::endl;
+                 << std::endl;
   }
   FileSystemHandler::FsCommandCfg cfg = {};
   ReturnValue_t result = HasReturnvaluesIF::RETURN_OK;
@@ -366,115 +365,115 @@ void Q7STestTask::testFileSystemHandlerDirect(FsOpCodes opCode) {
   };
 
   switch (opCode) {
-  case (FsOpCodes::CREATE_EMPTY_FILE_IN_TMP): {
+    case (FsOpCodes::CREATE_EMPTY_FILE_IN_TMP): {
-    // No mount prefix, cause file is created in tmp
+      // No mount prefix, cause file is created in tmp
-    cfg.useMountPrefix = false;
+      cfg.useMountPrefix = false;
-    sif::info << "Creating empty file in /tmp folder" << std::endl;
+      sif::info << "Creating empty file in /tmp folder" << std::endl;
-    // Do not delete file, user can check existence in shell
+      // 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);
+      break;
     }
-    result = fsHandler->removeFile("/tmp", "test.txt", &cfg);
+    case (FsOpCodes::REMOVE_TMP_FILE): {
-    if (result == HasReturnvaluesIF::RETURN_OK) {
+      sif::info << "Deleting /tmp/test.txt sample file" << std::endl;
-      sif::info << "File removed successfully" << std::endl;
+      // No mount prefix, cause file is created in tmp
-    } else {
+      cfg.useMountPrefix = false;
-      sif::warning << "File removal failed!" << std::endl;
+      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 == HasReturnvaluesIF::RETURN_OK) {
+        sif::info << "File removed successfully" << std::endl;
+      } else {
+        sif::warning << "File removal failed!" << std::endl;
+      }
+      break;
     }
-    break;
+    case (FsOpCodes::CREATE_DIR_IN_TMP): {
-  }
+      // No mount prefix, cause file is created in tmp
-  case (FsOpCodes::CREATE_DIR_IN_TMP): {
+      cfg.useMountPrefix = false;
-    // No mount prefix, cause file is created in tmp
+      sif::info << "Creating empty file in /tmp folder" << std::endl;
-    cfg.useMountPrefix = false;
+      // Do not delete file, user can check existence in shell
-    sif::info << "Creating empty file in /tmp folder" << std::endl;
+      ReturnValue_t result = fsHandler->createDirectory("/tmp/", "test", false, &cfg);
-    // Do not delete file, user can check existence in shell
+      if (result == HasReturnvaluesIF::RETURN_OK) {
-    ReturnValue_t result = fsHandler->createDirectory("/tmp/", "test", false, &cfg);
+        sif::info << "Directory created successfully" << std::endl;
-    if (result == HasReturnvaluesIF::RETURN_OK) {
+      } else {
-      sif::info << "Directory created successfully" << std::endl;
+        sif::warning << "Directory creation failed!" << std::endl;
-    } else {
+      }
-      sif::warning << "Directory creation failed!" << std::endl;
+      break;
     }
-    break;
+    case (FsOpCodes::REMOVE_EMPTY_DIR_IN_TMP): {
-  }
+      // No mount prefix, cause file is created in tmp
-  case (FsOpCodes::REMOVE_EMPTY_DIR_IN_TMP): {
+      cfg.useMountPrefix = false;
-    // No mount prefix, cause file is created in tmp
+      if (not std::filesystem::exists("/tmp/test")) {
-    cfg.useMountPrefix = false;
+        result = fsHandler->createDirectory("/tmp", "test", false, &cfg);
-    if (not std::filesystem::exists("/tmp/test")) {
+      } else {
-      result = fsHandler->createDirectory("/tmp", "test", false, &cfg);
+        // Delete any leftover files to regular dir removal works
-    } else {
+        std::remove("/tmp/test/*");
-      // Delete any leftover files to regular dir removal works
+      }
-      std::remove("/tmp/test/*");
+      result = fsHandler->removeDirectory("/tmp/", "test", false, &cfg);
+      if (result == HasReturnvaluesIF::RETURN_OK) {
+        sif::info << "Directory removed successfully" << std::endl;
+      } else {
+        sif::warning << "Directory removal failed!" << std::endl;
+      }
+      break;
     }
-    result = fsHandler->removeDirectory("/tmp/", "test", false, &cfg);
+    case (FsOpCodes::REMOVE_FILLED_DIR_IN_TMP): {
-    if (result == HasReturnvaluesIF::RETURN_OK) {
+      result = createNonEmptyTmpDir();
-      sif::info << "Directory removed successfully" << std::endl;
+      if (result != HasReturnvaluesIF::RETURN_OK) {
-    } else {
+        return;
-      sif::warning << "Directory removal failed!" << std::endl;
+      }
+      result = fsHandler->removeDirectory("/tmp/", "test", true, &cfg);
+      if (result == HasReturnvaluesIF::RETURN_OK) {
+        sif::info << "Directory removed recursively successfully" << std::endl;
+      } else {
+        sif::warning << "Recursive directory removal failed!" << std::endl;
+      }
+      break;
     }
-    break;
+    case (FsOpCodes::ATTEMPT_DIR_REMOVAL_NON_EMPTY): {
-  }
+      result = createNonEmptyTmpDir();
-  case (FsOpCodes::REMOVE_FILLED_DIR_IN_TMP): {
+      if (result != HasReturnvaluesIF::RETURN_OK) {
-    result = createNonEmptyTmpDir();
+        return;
-    if (result != HasReturnvaluesIF::RETURN_OK) {
+      }
-      return;
+      result = fsHandler->removeDirectory("/tmp/", "test", false, &cfg);
+      if (result != HasReturnvaluesIF::RETURN_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;
     }
-    result = fsHandler->removeDirectory("/tmp/", "test", true, &cfg);
+    case (FsOpCodes::RENAME_FILE): {
-    if (result == HasReturnvaluesIF::RETURN_OK) {
+      // No mount prefix, cause file is created in tmp
-      sif::info << "Directory removed recursively successfully" << std::endl;
+      cfg.useMountPrefix = false;
-    } else {
+      if (std::filesystem::exists("/tmp/test.txt")) {
-      sif::warning << "Recursive directory removal failed!" << std::endl;
+        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;
     }
-    break;
+    case (FsOpCodes::APPEND_TO_FILE): {
-  }
+      // No mount prefix, cause file is created in tmp
-  case (FsOpCodes::ATTEMPT_DIR_REMOVAL_NON_EMPTY): {
+      cfg.useMountPrefix = false;
-    result = createNonEmptyTmpDir();
+      if (std::filesystem::exists("/tmp/test.txt")) {
-    if (result != HasReturnvaluesIF::RETURN_OK) {
+        fsHandler->removeDirectory("/tmp/", "test", false, &cfg);
-      return;
+      }
+      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);
     }
-    result = fsHandler->removeDirectory("/tmp/", "test", false, &cfg);
-    if (result != HasReturnvaluesIF::RETURN_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);
-  }
   }
 }
 

bsp_q7s/boardtest/Q7STestTask.h

@@ -2,6 +2,7 @@
 #define BSP_Q7S_BOARDTEST_Q7STESTTASK_H_
 
 #include <libgpsmm.h>
+
 #include "test/testtasks/TestTask.h"
 
 class CoreController;

common/config/commonObjects.h

@@ -48,22 +48,22 @@ enum commonObjects: uint32_t {
      * Not yet specified which pt1000 will measure which device/location in the satellite.
      * Therefore object ids are named according to the IC naming of the RTDs in the schematic.
      */
-    RTD_IC_3 = 0x44420016,
+    RTD_0_IC3_PLOC_HEATSPREADER = 0x44420016,
-    RTD_IC_4 = 0x44420017,
+    RTD_1_IC4_PLOC_MISSIONBOARD = 0x44420017,
-    RTD_IC_5 = 0x44420018,
+    RTD_2_IC5_4K_CAMERA = 0x44420018,
-    RTD_IC_6 = 0x44420019,
+    RTD_3_IC6_DAC_HEATSPREADER = 0x44420019,
-    RTD_IC_7 = 0x44420020,
+    RTD_4_IC7_STARTRACKER = 0x44420020,
-    RTD_IC_8 = 0x44420021,
+    RTD_5_IC8_RW1_MX_MY = 0x44420021,
-    RTD_IC_9 = 0x44420022,
+    RTD_6_IC9_DRO = 0x44420022,
-    RTD_IC_10 = 0x44420023,
+    RTD_7_IC10_SCEX = 0x44420023,
-    RTD_IC_11 = 0x44420024,
+    RTD_8_IC11_X8 = 0x44420024,
-    RTD_IC_12 = 0x44420025,
+    RTD_9_IC12_HPA = 0x44420025,
-    RTD_IC_13 = 0x44420026,
+    RTD_10_IC13_PL_TX = 0x44420026,
-    RTD_IC_14 = 0x44420027,
+    RTD_11_IC14_MPA = 0x44420027,
-    RTD_IC_15 = 0x44420028,
+    RTD_12_IC15_ACU = 0x44420028,
-    RTD_IC_16 = 0x44420029,
+    RTD_13_IC16_PLPCDU_HEATSPREADER = 0x44420029,
-    RTD_IC_17 = 0x44420030,
+    RTD_14_IC17_TCS_BOARD = 0x44420030,
-    RTD_IC_18 = 0x44420031,
+    RTD_15_IC18_IMTQ = 0x44420031,
 
     SUS_0 = 0x44120032,
     SUS_1 = 0x44120033,

fsfw

@@ -1 +1 @@
-Subproject commit 80cb0e682fb423b4e7b8f45b66b3b5b7249e0d48
+Subproject commit 43f0841d0a29d344b4329c228452ee109ce03a1f

linux/ObjectFactory.cpp

@@ -250,11 +250,22 @@ void ObjectFactory::createRtdComponents(std::string spiDev, GpioIF* gpioComIF,
       {addresses::RTD_IC_17, gpioIds::RTD_IC_17},
       {addresses::RTD_IC_18, gpioIds::RTD_IC_18},
   }};
-  std::array<object_id_t, NUMBER_RTDS> rtdIds = {
+  std::array<object_id_t, NUMBER_RTDS> rtdIds = {objects::RTD_0_IC3_PLOC_HEATSPREADER,
-      objects::RTD_IC_3,  objects::RTD_IC_4,  objects::RTD_IC_5,  objects::RTD_IC_6,
+                                                 objects::RTD_1_IC4_PLOC_MISSIONBOARD,
-      objects::RTD_IC_7,  objects::RTD_IC_8,  objects::RTD_IC_9,  objects::RTD_IC_10,
+                                                 objects::RTD_2_IC5_4K_CAMERA,
-      objects::RTD_IC_11, objects::RTD_IC_12, objects::RTD_IC_13, objects::RTD_IC_14,
+                                                 objects::RTD_3_IC6_DAC_HEATSPREADER,
-      objects::RTD_IC_15, objects::RTD_IC_16, objects::RTD_IC_17, objects::RTD_IC_18};
+                                                 objects::RTD_4_IC7_STARTRACKER,
+                                                 objects::RTD_5_IC8_RW1_MX_MY,
+                                                 objects::RTD_6_IC9_DRO,
+                                                 objects::RTD_7_IC10_SCEX,
+                                                 objects::RTD_8_IC11_X8,
+                                                 objects::RTD_9_IC12_HPA,
+                                                 objects::RTD_10_IC13_PL_TX,
+                                                 objects::RTD_11_IC14_MPA,
+                                                 objects::RTD_12_IC15_ACU,
+                                                 objects::RTD_13_IC16_PLPCDU_HEATSPREADER,
+                                                 objects::RTD_14_IC17_TCS_BOARD,
+                                                 objects::RTD_15_IC18_IMTQ};
   std::array<SpiCookie*, NUMBER_RTDS> rtdCookies = {};
   std::array<Max31865PT1000Handler*, NUMBER_RTDS> rtds = {};
   RtdFdir* rtdFdir = nullptr;

linux/boardtest/LibgpiodTest.cpp

@@ -29,8 +29,8 @@ ReturnValue_t LibgpiodTest::performPeriodicAction() {
         sif::warning << "LibgpiodTest::performPeriodicAction: Failed to read gpio " << std::endl;
         return RETURN_FAILED;
       } else {
-        sif::debug << "LibgpiodTest::performPeriodicAction: MIO 0 state = " <<
+        sif::debug << "LibgpiodTest::performPeriodicAction: MIO 0 state = "
-            static_cast<int>(gpioState) << std::endl;
+                   << static_cast<int>(gpioState) << std::endl;
       }
       break;
     }

linux/fsfwconfig/pollingsequence/pollingSequenceFactory.cpp

@@ -44,22 +44,30 @@ ReturnValue_t pst::pstSpi(FixedTimeslotTaskIF *thisSequence) {
   thisSequence->addSlot(objects::TMP1075_HANDLER_2, length * 0, DeviceHandlerIF::PERFORM_OPERATION);
 #endif
 #if OBSW_ADD_RTD_DEVICES == 1
-  thisSequence->addSlot(objects::RTD_IC_3, length * 0, DeviceHandlerIF::PERFORM_OPERATION);
+  thisSequence->addSlot(objects::RTD_0_IC3_PLOC_HEATSPREADER, length * 0,
-  thisSequence->addSlot(objects::RTD_IC_4, length * 0, DeviceHandlerIF::PERFORM_OPERATION);
+                        DeviceHandlerIF::PERFORM_OPERATION);
-  thisSequence->addSlot(objects::RTD_IC_5, length * 0, DeviceHandlerIF::PERFORM_OPERATION);
+  thisSequence->addSlot(objects::RTD_1_IC4_PLOC_MISSIONBOARD, length * 0,
-  thisSequence->addSlot(objects::RTD_IC_6, length * 0, DeviceHandlerIF::PERFORM_OPERATION);
+                        DeviceHandlerIF::PERFORM_OPERATION);
-  thisSequence->addSlot(objects::RTD_IC_7, length * 0, DeviceHandlerIF::PERFORM_OPERATION);
+  thisSequence->addSlot(objects::RTD_2_IC5_4K_CAMERA, length * 0,
-  thisSequence->addSlot(objects::RTD_IC_8, length * 0, DeviceHandlerIF::PERFORM_OPERATION);
+                        DeviceHandlerIF::PERFORM_OPERATION);
-  thisSequence->addSlot(objects::RTD_IC_9, length * 0, DeviceHandlerIF::PERFORM_OPERATION);
+  thisSequence->addSlot(objects::RTD_3_IC6_DAC_HEATSPREADER, length * 0,
-  thisSequence->addSlot(objects::RTD_IC_10, length * 0, DeviceHandlerIF::PERFORM_OPERATION);
+                        DeviceHandlerIF::PERFORM_OPERATION);
-  thisSequence->addSlot(objects::RTD_IC_11, length * 0, DeviceHandlerIF::PERFORM_OPERATION);
+  thisSequence->addSlot(objects::RTD_4_IC7_STARTRACKER, length * 0,
-  thisSequence->addSlot(objects::RTD_IC_12, length * 0, DeviceHandlerIF::PERFORM_OPERATION);
+                        DeviceHandlerIF::PERFORM_OPERATION);
-  thisSequence->addSlot(objects::RTD_IC_13, length * 0, DeviceHandlerIF::PERFORM_OPERATION);
+  thisSequence->addSlot(objects::RTD_5_IC8_RW1_MX_MY, length * 0,
-  thisSequence->addSlot(objects::RTD_IC_14, length * 0, DeviceHandlerIF::PERFORM_OPERATION);
+                        DeviceHandlerIF::PERFORM_OPERATION);
-  thisSequence->addSlot(objects::RTD_IC_15, length * 0, DeviceHandlerIF::PERFORM_OPERATION);
+  thisSequence->addSlot(objects::RTD_6_IC9_DRO, length * 0, DeviceHandlerIF::PERFORM_OPERATION);
-  thisSequence->addSlot(objects::RTD_IC_16, length * 0, DeviceHandlerIF::PERFORM_OPERATION);
+  thisSequence->addSlot(objects::RTD_7_IC10_SCEX, length * 0, DeviceHandlerIF::PERFORM_OPERATION);
-  thisSequence->addSlot(objects::RTD_IC_17, length * 0, DeviceHandlerIF::PERFORM_OPERATION);
+  thisSequence->addSlot(objects::RTD_8_IC11_X8, length * 0, DeviceHandlerIF::PERFORM_OPERATION);
-  thisSequence->addSlot(objects::RTD_IC_18, length * 0, DeviceHandlerIF::PERFORM_OPERATION);
+  thisSequence->addSlot(objects::RTD_9_IC12_HPA, length * 0, DeviceHandlerIF::PERFORM_OPERATION);
+  thisSequence->addSlot(objects::RTD_10_IC13_PL_TX, length * 0, DeviceHandlerIF::PERFORM_OPERATION);
+  thisSequence->addSlot(objects::RTD_11_IC14_MPA, length * 0, DeviceHandlerIF::PERFORM_OPERATION);
+  thisSequence->addSlot(objects::RTD_12_IC15_ACU, length * 0, DeviceHandlerIF::PERFORM_OPERATION);
+  thisSequence->addSlot(objects::RTD_13_IC16_PLPCDU_HEATSPREADER, length * 0,
+                        DeviceHandlerIF::PERFORM_OPERATION);
+  thisSequence->addSlot(objects::RTD_14_IC17_TCS_BOARD, length * 0,
+                        DeviceHandlerIF::PERFORM_OPERATION);
+  thisSequence->addSlot(objects::RTD_15_IC18_IMTQ, length * 0, DeviceHandlerIF::PERFORM_OPERATION);
 #endif /* OBSW_ADD_RTD_DEVICES */
 
 #if OBSW_ADD_TMP_DEVICES == 1
@@ -67,22 +75,26 @@ ReturnValue_t pst::pstSpi(FixedTimeslotTaskIF *thisSequence) {
   thisSequence->addSlot(objects::TMP1075_HANDLER_2, length * 0.2, DeviceHandlerIF::SEND_WRITE);
 #endif
 #if OBSW_ADD_RTD_DEVICES == 1
-  thisSequence->addSlot(objects::RTD_IC_3, length * 0.2, DeviceHandlerIF::SEND_WRITE);
+  thisSequence->addSlot(objects::RTD_0_IC3_PLOC_HEATSPREADER, length * 0.2,
-  thisSequence->addSlot(objects::RTD_IC_4, length * 0.2, DeviceHandlerIF::SEND_WRITE);
+                        DeviceHandlerIF::SEND_WRITE);
-  thisSequence->addSlot(objects::RTD_IC_5, length * 0.2, DeviceHandlerIF::SEND_WRITE);
+  thisSequence->addSlot(objects::RTD_1_IC4_PLOC_MISSIONBOARD, length * 0.2,
-  thisSequence->addSlot(objects::RTD_IC_6, length * 0.2, DeviceHandlerIF::SEND_WRITE);
+                        DeviceHandlerIF::SEND_WRITE);
-  thisSequence->addSlot(objects::RTD_IC_7, length * 0.2, DeviceHandlerIF::SEND_WRITE);
+  thisSequence->addSlot(objects::RTD_2_IC5_4K_CAMERA, length * 0.2, DeviceHandlerIF::SEND_WRITE);
-  thisSequence->addSlot(objects::RTD_IC_8, length * 0.2, DeviceHandlerIF::SEND_WRITE);
+  thisSequence->addSlot(objects::RTD_3_IC6_DAC_HEATSPREADER, length * 0.2,
-  thisSequence->addSlot(objects::RTD_IC_9, length * 0.2, DeviceHandlerIF::SEND_WRITE);
+                        DeviceHandlerIF::SEND_WRITE);
-  thisSequence->addSlot(objects::RTD_IC_10, length * 0.2, DeviceHandlerIF::SEND_WRITE);
+  thisSequence->addSlot(objects::RTD_4_IC7_STARTRACKER, length * 0.2, DeviceHandlerIF::SEND_WRITE);
-  thisSequence->addSlot(objects::RTD_IC_11, length * 0.2, DeviceHandlerIF::SEND_WRITE);
+  thisSequence->addSlot(objects::RTD_5_IC8_RW1_MX_MY, length * 0.2, DeviceHandlerIF::SEND_WRITE);
-  thisSequence->addSlot(objects::RTD_IC_12, length * 0.2, DeviceHandlerIF::SEND_WRITE);
+  thisSequence->addSlot(objects::RTD_6_IC9_DRO, length * 0.2, DeviceHandlerIF::SEND_WRITE);
-  thisSequence->addSlot(objects::RTD_IC_13, length * 0.2, DeviceHandlerIF::SEND_WRITE);
+  thisSequence->addSlot(objects::RTD_7_IC10_SCEX, length * 0.2, DeviceHandlerIF::SEND_WRITE);
-  thisSequence->addSlot(objects::RTD_IC_14, length * 0.2, DeviceHandlerIF::SEND_WRITE);
+  thisSequence->addSlot(objects::RTD_8_IC11_X8, length * 0.2, DeviceHandlerIF::SEND_WRITE);
-  thisSequence->addSlot(objects::RTD_IC_15, length * 0.2, DeviceHandlerIF::SEND_WRITE);
+  thisSequence->addSlot(objects::RTD_9_IC12_HPA, length * 0.2, DeviceHandlerIF::SEND_WRITE);
-  thisSequence->addSlot(objects::RTD_IC_16, length * 0.2, DeviceHandlerIF::SEND_WRITE);
+  thisSequence->addSlot(objects::RTD_10_IC13_PL_TX, length * 0.2, DeviceHandlerIF::SEND_WRITE);
-  thisSequence->addSlot(objects::RTD_IC_17, length * 0.2, DeviceHandlerIF::SEND_WRITE);
+  thisSequence->addSlot(objects::RTD_11_IC14_MPA, length * 0.2, DeviceHandlerIF::SEND_WRITE);
-  thisSequence->addSlot(objects::RTD_IC_18, length * 0.2, DeviceHandlerIF::SEND_WRITE);
+  thisSequence->addSlot(objects::RTD_12_IC15_ACU, length * 0.2, DeviceHandlerIF::SEND_WRITE);
+  thisSequence->addSlot(objects::RTD_13_IC16_PLPCDU_HEATSPREADER, length * 0.2,
+                        DeviceHandlerIF::SEND_WRITE);
+  thisSequence->addSlot(objects::RTD_14_IC17_TCS_BOARD, length * 0.2, DeviceHandlerIF::SEND_WRITE);
+  thisSequence->addSlot(objects::RTD_15_IC18_IMTQ, length * 0.2, DeviceHandlerIF::SEND_WRITE);
 #endif /* OBSW_ADD_RTD_DEVICES */
 
 #if OBSW_ADD_TMP_DEVICES == 1
@@ -90,22 +102,26 @@ ReturnValue_t pst::pstSpi(FixedTimeslotTaskIF *thisSequence) {
   thisSequence->addSlot(objects::TMP1075_HANDLER_2, length * 0.4, DeviceHandlerIF::GET_WRITE);
 #endif
 #if OBSW_ADD_RTD_DEVICES == 1
-  thisSequence->addSlot(objects::RTD_IC_3, length * 0.4, DeviceHandlerIF::GET_WRITE);
+  thisSequence->addSlot(objects::RTD_0_IC3_PLOC_HEATSPREADER, length * 0.4,
-  thisSequence->addSlot(objects::RTD_IC_4, length * 0.4, DeviceHandlerIF::GET_WRITE);
+                        DeviceHandlerIF::GET_WRITE);
-  thisSequence->addSlot(objects::RTD_IC_5, length * 0.4, DeviceHandlerIF::GET_WRITE);
+  thisSequence->addSlot(objects::RTD_1_IC4_PLOC_MISSIONBOARD, length * 0.4,
-  thisSequence->addSlot(objects::RTD_IC_6, length * 0.4, DeviceHandlerIF::GET_WRITE);
+                        DeviceHandlerIF::GET_WRITE);
-  thisSequence->addSlot(objects::RTD_IC_7, length * 0.4, DeviceHandlerIF::GET_WRITE);
+  thisSequence->addSlot(objects::RTD_2_IC5_4K_CAMERA, length * 0.4, DeviceHandlerIF::GET_WRITE);
-  thisSequence->addSlot(objects::RTD_IC_8, length * 0.4, DeviceHandlerIF::GET_WRITE);
+  thisSequence->addSlot(objects::RTD_3_IC6_DAC_HEATSPREADER, length * 0.4,
-  thisSequence->addSlot(objects::RTD_IC_9, length * 0.4, DeviceHandlerIF::GET_WRITE);
+                        DeviceHandlerIF::GET_WRITE);
-  thisSequence->addSlot(objects::RTD_IC_10, length * 0.4, DeviceHandlerIF::GET_WRITE);
+  thisSequence->addSlot(objects::RTD_4_IC7_STARTRACKER, length * 0.4, DeviceHandlerIF::GET_WRITE);
-  thisSequence->addSlot(objects::RTD_IC_11, length * 0.4, DeviceHandlerIF::GET_WRITE);
+  thisSequence->addSlot(objects::RTD_5_IC8_RW1_MX_MY, length * 0.4, DeviceHandlerIF::GET_WRITE);
-  thisSequence->addSlot(objects::RTD_IC_12, length * 0.4, DeviceHandlerIF::GET_WRITE);
+  thisSequence->addSlot(objects::RTD_6_IC9_DRO, length * 0.4, DeviceHandlerIF::GET_WRITE);
-  thisSequence->addSlot(objects::RTD_IC_13, length * 0.4, DeviceHandlerIF::GET_WRITE);
+  thisSequence->addSlot(objects::RTD_7_IC10_SCEX, length * 0.4, DeviceHandlerIF::GET_WRITE);
-  thisSequence->addSlot(objects::RTD_IC_14, length * 0.4, DeviceHandlerIF::GET_WRITE);
+  thisSequence->addSlot(objects::RTD_8_IC11_X8, length * 0.4, DeviceHandlerIF::GET_WRITE);
-  thisSequence->addSlot(objects::RTD_IC_15, length * 0.4, DeviceHandlerIF::GET_WRITE);
+  thisSequence->addSlot(objects::RTD_9_IC12_HPA, length * 0.4, DeviceHandlerIF::GET_WRITE);
-  thisSequence->addSlot(objects::RTD_IC_16, length * 0.4, DeviceHandlerIF::GET_WRITE);
+  thisSequence->addSlot(objects::RTD_10_IC13_PL_TX, length * 0.4, DeviceHandlerIF::GET_WRITE);
-  thisSequence->addSlot(objects::RTD_IC_17, length * 0.4, DeviceHandlerIF::GET_WRITE);
+  thisSequence->addSlot(objects::RTD_11_IC14_MPA, length * 0.4, DeviceHandlerIF::GET_WRITE);
-  thisSequence->addSlot(objects::RTD_IC_18, length * 0.4, DeviceHandlerIF::GET_WRITE);
+  thisSequence->addSlot(objects::RTD_12_IC15_ACU, length * 0.4, DeviceHandlerIF::GET_WRITE);
+  thisSequence->addSlot(objects::RTD_13_IC16_PLPCDU_HEATSPREADER, length * 0.4,
+                        DeviceHandlerIF::GET_WRITE);
+  thisSequence->addSlot(objects::RTD_14_IC17_TCS_BOARD, length * 0.4, DeviceHandlerIF::GET_WRITE);
+  thisSequence->addSlot(objects::RTD_15_IC18_IMTQ, length * 0.4, DeviceHandlerIF::GET_WRITE);
 #endif /* OBSW_ADD_RTD_DEVICES */
 
 #if OBSW_ADD_TMP_DEVICES == 1
@@ -113,22 +129,26 @@ ReturnValue_t pst::pstSpi(FixedTimeslotTaskIF *thisSequence) {
   thisSequence->addSlot(objects::TMP1075_HANDLER_2, length * 0.6, DeviceHandlerIF::SEND_READ);
 #endif
 #if OBSW_ADD_RTD_DEVICES == 1
-  thisSequence->addSlot(objects::RTD_IC_3, length * 0.6, DeviceHandlerIF::SEND_READ);
+  thisSequence->addSlot(objects::RTD_0_IC3_PLOC_HEATSPREADER, length * 0.6,
-  thisSequence->addSlot(objects::RTD_IC_4, length * 0.6, DeviceHandlerIF::SEND_READ);
+                        DeviceHandlerIF::SEND_READ);
-  thisSequence->addSlot(objects::RTD_IC_5, length * 0.6, DeviceHandlerIF::SEND_READ);
+  thisSequence->addSlot(objects::RTD_1_IC4_PLOC_MISSIONBOARD, length * 0.6,
-  thisSequence->addSlot(objects::RTD_IC_6, length * 0.6, DeviceHandlerIF::SEND_READ);
+                        DeviceHandlerIF::SEND_READ);
-  thisSequence->addSlot(objects::RTD_IC_7, length * 0.6, DeviceHandlerIF::SEND_READ);
+  thisSequence->addSlot(objects::RTD_2_IC5_4K_CAMERA, length * 0.6, DeviceHandlerIF::SEND_READ);
-  thisSequence->addSlot(objects::RTD_IC_8, length * 0.6, DeviceHandlerIF::SEND_READ);
+  thisSequence->addSlot(objects::RTD_3_IC6_DAC_HEATSPREADER, length * 0.6,
-  thisSequence->addSlot(objects::RTD_IC_9, length * 0.6, DeviceHandlerIF::SEND_READ);
+                        DeviceHandlerIF::SEND_READ);
-  thisSequence->addSlot(objects::RTD_IC_10, length * 0.6, DeviceHandlerIF::SEND_READ);
+  thisSequence->addSlot(objects::RTD_4_IC7_STARTRACKER, length * 0.6, DeviceHandlerIF::SEND_READ);
-  thisSequence->addSlot(objects::RTD_IC_11, length * 0.6, DeviceHandlerIF::SEND_READ);
+  thisSequence->addSlot(objects::RTD_5_IC8_RW1_MX_MY, length * 0.6, DeviceHandlerIF::SEND_READ);
-  thisSequence->addSlot(objects::RTD_IC_12, length * 0.6, DeviceHandlerIF::SEND_READ);
+  thisSequence->addSlot(objects::RTD_6_IC9_DRO, length * 0.6, DeviceHandlerIF::SEND_READ);
-  thisSequence->addSlot(objects::RTD_IC_13, length * 0.6, DeviceHandlerIF::SEND_READ);
+  thisSequence->addSlot(objects::RTD_7_IC10_SCEX, length * 0.6, DeviceHandlerIF::SEND_READ);
-  thisSequence->addSlot(objects::RTD_IC_14, length * 0.6, DeviceHandlerIF::SEND_READ);
+  thisSequence->addSlot(objects::RTD_8_IC11_X8, length * 0.6, DeviceHandlerIF::SEND_READ);
-  thisSequence->addSlot(objects::RTD_IC_15, length * 0.6, DeviceHandlerIF::SEND_READ);
+  thisSequence->addSlot(objects::RTD_9_IC12_HPA, length * 0.6, DeviceHandlerIF::SEND_READ);
-  thisSequence->addSlot(objects::RTD_IC_16, length * 0.6, DeviceHandlerIF::SEND_READ);
+  thisSequence->addSlot(objects::RTD_10_IC13_PL_TX, length * 0.6, DeviceHandlerIF::SEND_READ);
-  thisSequence->addSlot(objects::RTD_IC_17, length * 0.6, DeviceHandlerIF::SEND_READ);
+  thisSequence->addSlot(objects::RTD_11_IC14_MPA, length * 0.6, DeviceHandlerIF::SEND_READ);
-  thisSequence->addSlot(objects::RTD_IC_18, length * 0.6, DeviceHandlerIF::SEND_READ);
+  thisSequence->addSlot(objects::RTD_12_IC15_ACU, length * 0.6, DeviceHandlerIF::SEND_READ);
+  thisSequence->addSlot(objects::RTD_13_IC16_PLPCDU_HEATSPREADER, length * 0.6,
+                        DeviceHandlerIF::SEND_READ);
+  thisSequence->addSlot(objects::RTD_14_IC17_TCS_BOARD, length * 0.6, DeviceHandlerIF::SEND_READ);
+  thisSequence->addSlot(objects::RTD_15_IC18_IMTQ, length * 0.6, DeviceHandlerIF::SEND_READ);
 #endif /* OBSW_ADD_RTD_DEVICES */
 
 #if OBSW_ADD_TMP_DEVICES == 1
@@ -136,22 +156,26 @@ ReturnValue_t pst::pstSpi(FixedTimeslotTaskIF *thisSequence) {
   thisSequence->addSlot(objects::TMP1075_HANDLER_2, length * 0.8, DeviceHandlerIF::GET_READ);
 #endif
 #if OBSW_ADD_RTD_DEVICES == 1
-  thisSequence->addSlot(objects::RTD_IC_3, length * 0.8, DeviceHandlerIF::GET_READ);
+  thisSequence->addSlot(objects::RTD_0_IC3_PLOC_HEATSPREADER, length * 0.8,
-  thisSequence->addSlot(objects::RTD_IC_4, length * 0.8, DeviceHandlerIF::GET_READ);
+                        DeviceHandlerIF::GET_READ);
-  thisSequence->addSlot(objects::RTD_IC_5, length * 0.8, DeviceHandlerIF::GET_READ);
+  thisSequence->addSlot(objects::RTD_1_IC4_PLOC_MISSIONBOARD, length * 0.8,
-  thisSequence->addSlot(objects::RTD_IC_6, length * 0.8, DeviceHandlerIF::GET_READ);
+                        DeviceHandlerIF::GET_READ);
-  thisSequence->addSlot(objects::RTD_IC_7, length * 0.8, DeviceHandlerIF::GET_READ);
+  thisSequence->addSlot(objects::RTD_2_IC5_4K_CAMERA, length * 0.8, DeviceHandlerIF::GET_READ);
-  thisSequence->addSlot(objects::RTD_IC_8, length * 0.8, DeviceHandlerIF::GET_READ);
+  thisSequence->addSlot(objects::RTD_3_IC6_DAC_HEATSPREADER, length * 0.8,
-  thisSequence->addSlot(objects::RTD_IC_9, length * 0.8, DeviceHandlerIF::GET_READ);
+                        DeviceHandlerIF::GET_READ);
-  thisSequence->addSlot(objects::RTD_IC_10, length * 0.8, DeviceHandlerIF::GET_READ);
+  thisSequence->addSlot(objects::RTD_4_IC7_STARTRACKER, length * 0.8, DeviceHandlerIF::GET_READ);
-  thisSequence->addSlot(objects::RTD_IC_11, length * 0.8, DeviceHandlerIF::GET_READ);
+  thisSequence->addSlot(objects::RTD_5_IC8_RW1_MX_MY, length * 0.8, DeviceHandlerIF::GET_READ);
-  thisSequence->addSlot(objects::RTD_IC_12, length * 0.8, DeviceHandlerIF::GET_READ);
+  thisSequence->addSlot(objects::RTD_6_IC9_DRO, length * 0.8, DeviceHandlerIF::GET_READ);
-  thisSequence->addSlot(objects::RTD_IC_13, length * 0.8, DeviceHandlerIF::GET_READ);
+  thisSequence->addSlot(objects::RTD_7_IC10_SCEX, length * 0.8, DeviceHandlerIF::GET_READ);
-  thisSequence->addSlot(objects::RTD_IC_14, length * 0.8, DeviceHandlerIF::GET_READ);
+  thisSequence->addSlot(objects::RTD_8_IC11_X8, length * 0.8, DeviceHandlerIF::GET_READ);
-  thisSequence->addSlot(objects::RTD_IC_15, length * 0.8, DeviceHandlerIF::GET_READ);
+  thisSequence->addSlot(objects::RTD_9_IC12_HPA, length * 0.8, DeviceHandlerIF::GET_READ);
-  thisSequence->addSlot(objects::RTD_IC_16, length * 0.8, DeviceHandlerIF::GET_READ);
+  thisSequence->addSlot(objects::RTD_10_IC13_PL_TX, length * 0.8, DeviceHandlerIF::GET_READ);
-  thisSequence->addSlot(objects::RTD_IC_17, length * 0.8, DeviceHandlerIF::GET_READ);
+  thisSequence->addSlot(objects::RTD_11_IC14_MPA, length * 0.8, DeviceHandlerIF::GET_READ);
-  thisSequence->addSlot(objects::RTD_IC_18, length * 0.8, DeviceHandlerIF::GET_READ);
+  thisSequence->addSlot(objects::RTD_12_IC15_ACU, length * 0.8, DeviceHandlerIF::GET_READ);
+  thisSequence->addSlot(objects::RTD_13_IC16_PLPCDU_HEATSPREADER, length * 0.8,
+                        DeviceHandlerIF::GET_READ);
+  thisSequence->addSlot(objects::RTD_14_IC17_TCS_BOARD, length * 0.8, DeviceHandlerIF::GET_READ);
+  thisSequence->addSlot(objects::RTD_15_IC18_IMTQ, length * 0.8, DeviceHandlerIF::GET_READ);
 #endif /* OBSW_ADD_RTD_DEVICES */
 
 #if OBSW_ADD_RAD_SENSORS == 1

tmtc

@@ -1 +1 @@
-Subproject commit 5e9f83cd68c307617b2b05ccc0f9902f5795f8cf
+Subproject commit c5862579348974882e23d39d0a6d9b2844159b99