Merge branch 'irini' into scex-additions

CMakeLists.txt

@@ -382,10 +382,8 @@ add_subdirectory(${TEST_PATH})
 add_subdirectory(${UNITTEST_PATH})
 
 # This should have already been downloaded by the FSFW Still include it to be
-# safe
+# safe find_package(etl ${FSFW_ETL_LIB_MAJOR_VERSION} CONFIG QUIET) Not
-# find_package(etl ${FSFW_ETL_LIB_MAJOR_VERSION} CONFIG QUIET)
+# installed, so use FetchContent to download and provide etl if(NOT etl_FOUND)
-# Not installed, so use FetchContent to download and provide etl
-# if(NOT etl_FOUND)
 message(
   STATUS
     "No ETL installation was found with find_package. Installing and providing "

bsp_linux_board/InitMission.cpp

@@ -82,28 +82,28 @@ void initmission::initTasks() {
   PeriodicTaskIF* scexDevHandler = factory->createPeriodicTask(
       "SCEX_DEV", 35, PeriodicTaskIF::MINIMUM_STACK_SIZE * 2, 0.5, missedDeadlineFunc);
   result = scexDevHandler->addComponent(objects::SCEX, DeviceHandlerIF::PERFORM_OPERATION);
-  if (result != HasReturnvaluesIF::RETURN_OK) {
+  if (result != returnvalue::OK) {
     initmission::printAddObjectError("SCEX_DEV", objects::SCEX);
   }
   result = scexDevHandler->addComponent(objects::SCEX, DeviceHandlerIF::SEND_WRITE);
-  if (result != HasReturnvaluesIF::RETURN_OK) {
+  if (result != returnvalue::OK) {
     initmission::printAddObjectError("SCEX_DEV", objects::SCEX);
   }
   result = scexDevHandler->addComponent(objects::SCEX, DeviceHandlerIF::GET_WRITE);
-  if (result != HasReturnvaluesIF::RETURN_OK) {
+  if (result != returnvalue::OK) {
     initmission::printAddObjectError("SCEX_DEV", objects::SCEX);
   }
   result = scexDevHandler->addComponent(objects::SCEX, DeviceHandlerIF::SEND_READ);
-  if (result != HasReturnvaluesIF::RETURN_OK) {
+  if (result != returnvalue::OK) {
     initmission::printAddObjectError("SCEX_DEV", objects::SCEX);
   }
   result = scexDevHandler->addComponent(objects::SCEX, DeviceHandlerIF::GET_READ);
 
-  result = HasReturnvaluesIF::RETURN_OK;
+  result = returnvalue::OK;
   PeriodicTaskIF* scexReaderTask = factory->createPeriodicTask(
       "SCEX_UART_READER", 20, PeriodicTaskIF::MINIMUM_STACK_SIZE, 2.0, missedDeadlineFunc);
   result = scexReaderTask->addComponent(objects::SCEX_UART_READER);
-  if (result != HasReturnvaluesIF::RETURN_OK) {
+  if (result != returnvalue::OK) {
     initmission::printAddObjectError("SCEX_UART_READER", objects::SCEX_UART_READER);
   }
 #endif
@@ -229,9 +229,9 @@ void initmission::createPstTasks(TaskFactory& factory,
   FixedTimeslotTaskIF* spiPst = factory.createFixedTimeslotTask(
       "SPI_PST", 70, PeriodicTaskIF::MINIMUM_STACK_SIZE * 4, 1.0, missedDeadlineFunc);
   result = pst::pstSpi(spiPst);
-  if (result != HasReturnvaluesIF::RETURN_OK) {
+  if (result != returnvalue::OK) {
     if (result != FixedTimeslotTaskIF::SLOT_LIST_EMPTY) {
-      sif::error << "InitMission::initTasks: Creating PST failed!" << std::endl;
+      sif::error << "InitMission::createPstTasks: Creating PST failed!" << std::endl;
     }
   } else {
     taskVec.push_back(spiPst);
@@ -269,7 +269,7 @@ void initmission::createTestTasks(TaskFactory& factory,
   PeriodicTaskIF* scexReaderTask = factory.createPeriodicTask(
       "SCEX_UART_READER", 20, PeriodicTaskIF::MINIMUM_STACK_SIZE, 2.0, missedDeadlineFunc);
   result = scexReaderTask->addComponent(objects::SCEX_UART_READER);
-  if (result != HasReturnvaluesIF::RETURN_OK) {
+  if (result != returnvalue::OK) {
     initmission::printAddObjectError("SCEX_UART_READER", objects::SCEX_UART_READER);
   }
   taskVec.push_back(scexReaderTask);

bsp_linux_board/ObjectFactory.cpp

@@ -47,8 +47,8 @@
 #include "fsfw_hal/linux/spi/SpiCookie.h"
 
 void Factory::setStaticFrameworkObjectIds() {
-  PusServiceBase::packetSource = objects::PUS_PACKET_DISTRIBUTOR;
+  PusServiceBase::PUS_DISTRIBUTOR = objects::PUS_PACKET_DISTRIBUTOR;
-  PusServiceBase::packetDestination = objects::TM_FUNNEL;
+  PusServiceBase::PACKET_DESTINATION = objects::TM_FUNNEL;
 
   CommandingServiceBase::defaultPacketSource = objects::PUS_PACKET_DISTRIBUTOR;
   CommandingServiceBase::defaultPacketDestination = objects::TM_FUNNEL;
@@ -56,9 +56,6 @@ void Factory::setStaticFrameworkObjectIds() {
   TmFunnel::downlinkDestination = objects::TMTC_BRIDGE;
   // No storage object for now.
   TmFunnel::storageDestination = objects::NO_OBJECT;
-
-  VerificationReporter::messageReceiver = objects::PUS_SERVICE_1_VERIFICATION;
-  TmPacketBase::timeStamperId = objects::TIME_STAMPER;
 }
 
 void ObjectFactory::produce(void* args) {

bsp_linux_board/RPiSdCardManager.cpp

@@ -0,0 +1,23 @@
+#include "RPiSdCardManager.h"
+
+RPiSdCardManager::RPiSdCardManager(const std::string& prefix):prefix(prefix) {
+
+}
+
+const std::string& RPiSdCardManager::getCurrentMountPrefix() const {
+	return prefix;
+}
+
+bool RPiSdCardManager::isSdCardMounted(sd::SdCard sdCard) {
+	return true;
+}
+
+std::optional<sd::SdCard> RPiSdCardManager::getPreferredSdCard() const {
+  return std::nullopt;
+}
+
+void RPiSdCardManager::setActiveSdCard(sd::SdCard sdCard) {}
+
+std::optional<sd::SdCard> RPiSdCardManager::getActiveSdCard() const {
+  return std::nullopt;
+}

bsp_linux_board/RPiSdCardManager.h

@@ -0,0 +1,19 @@
+#ifndef BSP_LINUX_BOARD_RPISDCARDMANAGER_H_
+#define BSP_LINUX_BOARD_RPISDCARDMANAGER_H_
+#include <mission/memory/SdCardMountedIF.h>
+
+class RPiSdCardManager: public SdCardMountedIF {
+public:
+  RPiSdCardManager(const std::string& prefix);
+  const std::string& getCurrentMountPrefix() const override;
+  bool isSdCardMounted(sd::SdCard sdCard) override;
+  std::optional<sd::SdCard> getPreferredSdCard() const override;
+  void setActiveSdCard(sd::SdCard sdCard) override;
+  std::optional<sd::SdCard> getActiveSdCard() const override;
+private:
+  std::string prefix;
+};
+
+
+
+#endif /* BSP_LINUX_BOARD_RPISDCARDMANAGER_H_ */

bsp_q7s/core/CoreController.cpp

@@ -139,7 +139,11 @@ ReturnValue_t CoreController::initialize() {
 
 ReturnValue_t CoreController::initializeAfterTaskCreation() {
   ReturnValue_t result = returnvalue::OK;
-  sdInfo.pref = sdcMan->getPreferredSdCard();
+  auto sdCard = sdcMan->getPreferredSdCard();
+  if(not sdCard) {
+    return returnvalue::FAILED;
+  }
+  sdInfo.pref = sdCard.value();
   sdcMan->setActiveSdCard(sdInfo.pref);
   currMntPrefix = sdcMan->getCurrentMountPrefix();
   if (BLOCKING_SD_INIT) {
@@ -337,7 +341,11 @@ ReturnValue_t CoreController::sdStateMachine() {
   if (sdInfo.state == SdStates::SET_STATE_SELF) {
     if (not sdInfo.commandExecuted) {
       result = sdcMan->getSdCardsStatus(sdInfo.currentState);
-      sdInfo.pref = sdcMan->getPreferredSdCard();
+      auto sdCard = sdcMan->getPreferredSdCard();
+      if(not sdCard) {
+        return returnvalue::FAILED;
+      }
+      sdInfo.pref = sdCard.value();
       updateSdInfoOther();
       if (sdInfo.pref != sd::SdCard::SLOT_0 and sdInfo.pref != sd::SdCard::SLOT_1) {
         sif::warning << "Preferred SD card invalid. Setting to card 0.." << std::endl;
@@ -384,6 +392,7 @@ ReturnValue_t CoreController::sdStateMachine() {
       if (nonBlockingOpChecking(SdStates::DETERMINE_OTHER, 5, "Mounting SD card")) {
         sdInfo.prefState = sd::SdState::MOUNTED;
         currentStateSetter(sdInfo.pref, sd::SdState::MOUNTED);
+        sdcMan->setActiveSdCard(sdInfo.pref);
       }
     }
   }

bsp_q7s/memory/FileSystemHandler.cpp

@@ -71,8 +71,8 @@ void FileSystemHandler::fileSystemHandlerLoop() {
 void FileSystemHandler::fileSystemCheckup() {
   SdCardManager::SdStatePair statusPair;
   sdcMan->getSdCardsStatus(statusPair);
-  sd::SdCard preferredSdCard = sdcMan->getPreferredSdCard();
+  auto preferredSdCard = sdcMan->getPreferredSdCard();
-  if ((preferredSdCard == sd::SdCard::SLOT_0) and (statusPair.first == sd::SdState::MOUNTED)) {
+  if (preferredSdCard and (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)) {
@@ -90,7 +90,7 @@ void FileSystemHandler::fileSystemCheckup() {
     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);
+    ReturnValue_t result = sdcMan->sanitizeState(&statusPair, preferredSdCard.value());
     if (result != returnvalue::OK) {
       // Oh no.
       triggerEvent(SdCardManager::SANITIZATION_FAILED, 0, 0);
@@ -108,7 +108,11 @@ ReturnValue_t FileSystemHandler::initialize() {
                << std::endl;
   }
   sdcMan = SdCardManager::instance();
-  sd::SdCard preferredSdCard = sdcMan->getPreferredSdCard();
+  auto sdCard = sdcMan->getPreferredSdCard();
+  if(not sdCard) {
+    return returnvalue::FAILED;
+  }
+  sd::SdCard preferredSdCard = sdCard.value();
   if (preferredSdCard == sd::SdCard::SLOT_0) {
     currentMountPrefix = SdCardManager::SD_0_MOUNT_POINT;
   } else if (preferredSdCard == sd::SdCard::SLOT_1) {

bsp_q7s/memory/SdCardManager.cpp

@@ -300,11 +300,6 @@ ReturnValue_t SdCardManager::sanitizeState(SdStatePair* statusPair, sd::SdCard p
     blocking = true;
     resetNonBlockingState = true;
   }
-  if (prefSdCard == sd::SdCard::NONE) {
-    result = getPreferredSdCard();
-    if (result != returnvalue::OK) {
-    }
-  }
   if (statusPair == nullptr) {
     sdStatusPtr = std::make_unique<SdStatePair>();
     statusPair = sdStatusPtr.get();
@@ -379,7 +374,7 @@ void SdCardManager::processSdStatusLine(std::pair<sd::SdState, sd::SdState>& act
   idx++;
 }
 
-sd::SdCard SdCardManager::getPreferredSdCard() const {
+std::optional<sd::SdCard> SdCardManager::getPreferredSdCard() const {
   MutexGuard mg(mutex);
   auto res = mg.getLockResult();
   if (res != returnvalue::OK) {
@@ -412,13 +407,9 @@ ReturnValue_t SdCardManager::updateSdCardStateFile() {
   return result;
 }
 
-std::string SdCardManager::getCurrentMountPrefix() const {
+const std::string& SdCardManager::getCurrentMountPrefix() const {
   MutexGuard mg(mutex);
-  if (sdInfo.active == sd::SdCard::SLOT_0) {
+  return currentPrefix;
-    return SD_0_MOUNT_POINT;
-  } else {
-    return SD_1_MOUNT_POINT;
-  }
 }
 
 SdCardManager::OpStatus SdCardManager::checkCurrentOp(Operations& currentOp) {
@@ -552,6 +543,17 @@ ReturnValue_t SdCardManager::performFsck(sd::SdCard sdcard, bool printOutput, in
   return result;
 }
 
-void SdCardManager::setActiveSdCard(sd::SdCard sdCard) { sdInfo.active = sdCard; }
+void SdCardManager::setActiveSdCard(sd::SdCard sdCard) {
+  MutexGuard mg(mutex);
+  sdInfo.active = sdCard;
+  if (sdInfo.active == sd::SdCard::SLOT_0) {
+    currentPrefix = SD_0_MOUNT_POINT;
+  } else {
+    currentPrefix = SD_1_MOUNT_POINT;
+  }
+}
 
-sd::SdCard SdCardManager::getActiveSdCard() const { return sdInfo.active; }
+std::optional<sd::SdCard> SdCardManager::getActiveSdCard() const {
+  MutexGuard mg(mutex);
+  return sdInfo.active;
+}

bsp_q7s/memory/SdCardManager.h

@@ -92,7 +92,7 @@ class SdCardManager : public SystemObject, public SdCardMountedIF {
    * @param sdCard
    * @return
    */
-  sd::SdCard getPreferredSdCard() const override;
+  std::optional<sd::SdCard> getPreferredSdCard() const override;
 
   /**
    * Switch on the specified SD card.
@@ -159,7 +159,7 @@ class SdCardManager : public SystemObject, public SdCardMountedIF {
    * mounted
    * @return
    */
-  sd::SdCard getActiveSdCard() const override;
+  std::optional<sd::SdCard> getActiveSdCard() const override;
 
   /**
    * Unmount the specified SD card. This is recommended before switching it off. The SD card
@@ -188,7 +188,7 @@ class SdCardManager : public SystemObject, public SdCardMountedIF {
    * @param prefSdCardPtr
    * @return
    */
-  std::string getCurrentMountPrefix() const override;
+  const std::string& getCurrentMountPrefix() const override;
 
   OpStatus checkCurrentOp(Operations& currentOp);
 

generators/bsp_q7s_events.csv

@@ -215,4 +215,6 @@ Event ID (dec); Event ID (hex); Name; Severity; Description; File Path
 13701;0x3585;REBOOT_SW;MEDIUM; Software reboot occurred. Can also be a systemd reboot. P1: Current Chip, P2: Current Copy;bsp_q7s/core/CoreController.h
 13702;0x3586;REBOOT_MECHANISM_TRIGGERED;MEDIUM;The reboot mechanism was triggered. P1: First 16 bits: Last Chip, Last 16 bits: Last Copy, P2: Each byte is the respective reboot count for the slots;bsp_q7s/core/CoreController.h
 13703;0x3587;REBOOT_HW;MEDIUM;;bsp_q7s/core/CoreController.h
-13800;0x35e8;EXPERIMENT_TIMEDOUT;LOW;;mission/devices/devicedefinitions/ScexDefinitions.h
+13800;0x35e8;MISSING_PACKET;LOW;;mission/devices/devicedefinitions/ScexDefinitions.h
+13801;0x35e9;EXPERIMENT_TIMEDOUT;LOW;;mission/devices/devicedefinitions/ScexDefinitions.h
+13802;0x35ea;MULTI_PACKET_COMMAND_DONE;INFO;;mission/devices/devicedefinitions/ScexDefinitions.h

generators/bsp_q7s_returnvalues.csv

@@ -1,6 +1,6 @@
 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
 0x58a0;SUSS_ErrorUnlockMutex;;160;SUS_HANDLER;mission/devices/SusHandler.h
 0x58a1;SUSS_ErrorLockMutex;;161;SUS_HANDLER;mission/devices/SusHandler.h
@@ -361,8 +361,9 @@ Full ID (hex); Name; Description; Unique ID; Subsytem Name; File Path
 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
+0x4204;PUS11_InvalidRelativeTime;;4;PUS_SERVICE_11;fsfw/src/fsfw/pus/Service11TelecommandScheduling.h
 0x3401;DC_NoReplyReceived;;1;DEVICE_COMMUNICATION_IF;fsfw/src/fsfw/devicehandlers/DeviceCommunicationIF.h
 0x3402;DC_ProtocolError;;2;DEVICE_COMMUNICATION_IF;fsfw/src/fsfw/devicehandlers/DeviceCommunicationIF.h
 0x3403;DC_Nullpointer;;3;DEVICE_COMMUNICATION_IF;fsfw/src/fsfw/devicehandlers/DeviceCommunicationIF.h

generators/events/translateEvents.cpp

@@ -1,7 +1,7 @@
 /**
- * @brief    Auto-generated event translation file. Contains 217 translations.
+ * @brief    Auto-generated event translation file. Contains 219 translations.
  * @details
- * Generated on: 2022-08-24 16:53:50
+ * Generated on: 2022-08-31 16:07:07
  */
 #include "translateEvents.h"
 
@@ -217,7 +217,9 @@ const char *ALLOC_FAILURE_STRING = "ALLOC_FAILURE";
 const char *REBOOT_SW_STRING = "REBOOT_SW";
 const char *REBOOT_MECHANISM_TRIGGERED_STRING = "REBOOT_MECHANISM_TRIGGERED";
 const char *REBOOT_HW_STRING = "REBOOT_HW";
+const char *MISSING_PACKET_STRING = "MISSING_PACKET";
 const char *EXPERIMENT_TIMEDOUT_STRING = "EXPERIMENT_TIMEDOUT";
+const char *MULTI_PACKET_COMMAND_DONE_STRING = "MULTI_PACKET_COMMAND_DONE";
 
 const char *translateEvents(Event event) {
   switch ((event & 0xFFFF)) {
@@ -646,7 +648,11 @@ const char *translateEvents(Event event) {
     case (13703):
       return REBOOT_HW_STRING;
     case (13800):
+      return MISSING_PACKET_STRING;
+    case (13801):
       return EXPERIMENT_TIMEDOUT_STRING;
+    case (13802):
+      return MULTI_PACKET_COMMAND_DONE_STRING;
     default:
       return "UNKNOWN_EVENT";
   }

generators/objects/translateObjects.cpp

@@ -2,7 +2,7 @@
  * @brief  Auto-generated object translation file.
  * @details
  * Contains 135 translations.
- * Generated on: 2022-08-24 16:53:50
+ * Generated on: 2022-08-31 16:07:07
  */
 #include "translateObjects.h"
 

linux/devices/ScexUartReader.cpp

@@ -34,7 +34,6 @@ ReturnValue_t ScexUartReader::performOperation(uint8_t operationCode) {
   lock->unlockMutex();
   while (true) {
     semaphore->acquire();
-    sif::info << "task was started" << std::endl;
     int bytesRead = 0;
     while (true) {
       bytesRead = read(serialPort, reinterpret_cast<void *>(recBuf.data()),
@@ -42,7 +41,6 @@ ReturnValue_t ScexUartReader::performOperation(uint8_t operationCode) {
       if (bytesRead == 0) {
         MutexGuard mg(lock);
         if (state == States::FINISH) {
-          sif::debug << "finish detected" << std::endl;
           state = States::IDLE;
           break;
         }
@@ -66,8 +64,6 @@ ReturnValue_t ScexUartReader::performOperation(uint8_t operationCode) {
         }
       }
     };
-    // task block comes here
-    sif::info << "task was stopped" << std::endl;
   }
   return OK;
 }
@@ -135,7 +131,6 @@ ReturnValue_t ScexUartReader::sendMessage(CookieIF *cookie, const uint8_t *sendD
     sif::warning << "ScexUartReader::sendMessage: Encoding failed" << std::endl;
     return FAILED;
   }
-  arrayprinter::print(cmdbuf.data(), encodedLen);
   size_t bytesWritten = write(serialPort, cmdbuf.data(), encodedLen);
   if (bytesWritten != encodedLen) {
     sif::warning << "ScexUartReader::sendMessage: Sending ping command to solar experiment failed"

linux/fsfwconfig/events/translateEvents.cpp

@@ -1,7 +1,7 @@
 /**
- * @brief    Auto-generated event translation file. Contains 217 translations.
+ * @brief    Auto-generated event translation file. Contains 219 translations.
  * @details
- * Generated on: 2022-08-24 16:53:50
+ * Generated on: 2022-08-31 16:07:07
  */
 #include "translateEvents.h"
 
@@ -217,7 +217,9 @@ const char *ALLOC_FAILURE_STRING = "ALLOC_FAILURE";
 const char *REBOOT_SW_STRING = "REBOOT_SW";
 const char *REBOOT_MECHANISM_TRIGGERED_STRING = "REBOOT_MECHANISM_TRIGGERED";
 const char *REBOOT_HW_STRING = "REBOOT_HW";
+const char *MISSING_PACKET_STRING = "MISSING_PACKET";
 const char *EXPERIMENT_TIMEDOUT_STRING = "EXPERIMENT_TIMEDOUT";
+const char *MULTI_PACKET_COMMAND_DONE_STRING = "MULTI_PACKET_COMMAND_DONE";
 
 const char *translateEvents(Event event) {
   switch ((event & 0xFFFF)) {
@@ -646,7 +648,11 @@ const char *translateEvents(Event event) {
     case (13703):
       return REBOOT_HW_STRING;
     case (13800):
+      return MISSING_PACKET_STRING;
+    case (13801):
       return EXPERIMENT_TIMEDOUT_STRING;
+    case (13802):
+      return MULTI_PACKET_COMMAND_DONE_STRING;
     default:
       return "UNKNOWN_EVENT";
   }

linux/fsfwconfig/objects/translateObjects.cpp

@@ -2,7 +2,7 @@
  * @brief  Auto-generated object translation file.
  * @details
  * Contains 135 translations.
- * Generated on: 2022-08-24 16:53:50
+ * Generated on: 2022-08-31 16:07:07
  */
 #include "translateObjects.h"
 

mission/devices/PayloadPcduHandler.cpp

@@ -491,8 +491,8 @@ void PayloadPcduHandler::checkAdcValues() {
 
 void PayloadPcduHandler::checkJsonFileInit() {
   if (not jsonFileInitComplete) {
-    sd::SdCard activeSd = sdcMan->getActiveSdCard();
+    auto activeSd = sdcMan->getActiveSdCard();
-    if (sdcMan->isSdCardMounted(activeSd)) {
+    if (activeSd and sdcMan->isSdCardMounted(activeSd.value())) {
       params.initialize(sdcMan->getCurrentMountPrefix());
       jsonFileInitComplete = true;
     }

mission/devices/ScexDeviceHandler.cpp

@@ -4,6 +4,7 @@
 #include <mission/memory/SdCardMountedIF.h>
 
 #include <algorithm>
+#include <ctime>
 #include <iostream>
 #include <random>
 
@@ -26,13 +27,9 @@ void ScexDeviceHandler::doStartUp() {
 
 void ScexDeviceHandler::doShutDown() { setMode(_MODE_POWER_DOWN); }
 
-ReturnValue_t ScexDeviceHandler::buildNormalDeviceCommand(DeviceCommandId_t* id) {
+ReturnValue_t ScexDeviceHandler::buildNormalDeviceCommand(DeviceCommandId_t* id) { return OK; }
-  return OK;
-}
 
-ReturnValue_t ScexDeviceHandler::buildTransitionDeviceCommand(DeviceCommandId_t* id) {
+ReturnValue_t ScexDeviceHandler::buildTransitionDeviceCommand(DeviceCommandId_t* id) { return OK; }
-  return OK;
-}
 
 ReturnValue_t ScexDeviceHandler::buildCommandFromCommand(DeviceCommandId_t deviceCommand,
                                                          const uint8_t* commandData,
@@ -88,8 +85,17 @@ ReturnValue_t ScexDeviceHandler::buildCommandFromCommand(DeviceCommandId_t devic
       finishCountdown.setTimeout(LONG_CD);
       // countdown starten
       finishCountdown.resetTimer();
+      if (debugMode) {
+        uint32_t remainingMillis = finishCountdown.getRemainingMillis();
+
+        sif::info << "ScexDeviceHandler::buildCommandFromCommand: RemainingMillis: "
+                  << remainingMillis << std::endl;
+      }
+
       prepareScexCmd(cmdTyped, {cmdBuf.data(), cmdBuf.size()}, rawPacketLen,
                      {commandData + 1, commandDataLen - 1}, tempCheck);
+      updatePeriodicReply(true, deviceCommand);
+      actionHelper.finish(true, getCommanderQueueId(deviceCommand), deviceCommand, OK);
       break;
     }
     case (ONE_CELL): {
@@ -98,6 +104,8 @@ ReturnValue_t ScexDeviceHandler::buildCommandFromCommand(DeviceCommandId_t devic
       finishCountdown.resetTimer();
       prepareScexCmd(cmdTyped, {cmdBuf.data(), cmdBuf.size()}, rawPacketLen,
                      {commandData + 1, commandDataLen - 1}, tempCheck);
+      updatePeriodicReply(true, deviceCommand);
+      actionHelper.finish(true, getCommanderQueueId(deviceCommand), deviceCommand, OK);
       break;
     }
     case (ALL_CELLS_CMD): {
@@ -106,6 +114,8 @@ ReturnValue_t ScexDeviceHandler::buildCommandFromCommand(DeviceCommandId_t devic
       finishCountdown.resetTimer();
       prepareScexCmd(cmdTyped, {cmdBuf.data(), cmdBuf.size()}, rawPacketLen,
                      {commandData + 1, commandDataLen - 1}, tempCheck);
+      actionHelper.finish(true, getCommanderQueueId(deviceCommand), deviceCommand, OK);
+      updatePeriodicReply(true, deviceCommand);
       break;
     }
     default: {
@@ -123,12 +133,12 @@ void ScexDeviceHandler::fillCommandAndReplyMap() {
   insertInCommandAndReplyMap(scex::Cmds::TEMP_CMD, 3);
   insertInCommandAndReplyMap(scex::Cmds::EXP_STATUS_CMD, 3);
 
-  insertInCommandAndReplyMap(scex::Cmds::ALL_CELLS_CMD, 0, nullptr, 0, false, false,
+  insertInCommandAndReplyMap(scex::Cmds::ALL_CELLS_CMD, 0, nullptr, 0, true, false,
                              scex::Cmds::ALL_CELLS_CMD, &finishCountdown);
-  insertInCommandAndReplyMap(scex::Cmds::ONE_CELL, 0, nullptr, 0, false, false,
+  insertInCommandAndReplyMap(scex::Cmds::ONE_CELL, 0, nullptr, 0, true, false, scex::Cmds::ONE_CELL,
-      scex::Cmds::ONE_CELL, &finishCountdown);
+                             &finishCountdown);
-  insertInCommandAndReplyMap(scex::Cmds::FRAM, 0, nullptr, 0, false, false,
+  insertInCommandAndReplyMap(scex::Cmds::FRAM, 0, nullptr, 0, true, false, scex::Cmds::FRAM,
-      scex::Cmds::FRAM, &finishCountdown);
+                             &finishCountdown);
 
   insertInReplyMap(scex::Cmds::ERROR_REPLY, 3);
 }
@@ -140,58 +150,88 @@ ReturnValue_t ScexDeviceHandler::scanForReply(const uint8_t* start, size_t remai
 
   if (result == ScexHelper::INVALID_CRC) {
     sif::warning << "ScexDeviceHandler::scanForReply: CRC invalid" << std::endl;
+    *foundLen = remainingSize;
+  } else {
+    result = handleValidReply(remainingSize, foundId, foundLen);
+  }
   return result;
+}
+
+ReturnValue_t ScexDeviceHandler::handleValidReply(size_t remSize, DeviceCommandId_t* foundId,
+                                                  size_t* foundLen) {
+  using namespace scex;
+  ReturnValue_t result = OK;
+
+  switch (helper.getCmd()) {
+    case (FRAM): {
+      if (debugMode) {
+        uint32_t remainingMillis = finishCountdown.getRemainingMillis();
+
+        sif::info << "ScexDeviceHandler::handleValidReply: RemMillis: " << remainingMillis
+                  << std::endl;
+      }
+      result = APERIODIC_REPLY;
+      break;
+    }
+    case (ONE_CELL): {
+      result = APERIODIC_REPLY;
+      break;
+    }
+    case (ALL_CELLS_CMD): {
+      result = APERIODIC_REPLY;
+      break;
+    }
+    default: {
+      break;
+    }
   }
   *foundId = helper.getCmd();
-  *foundLen = remainingSize;
+  *foundLen = remSize;
-
+  return result;
-  return OK;
 }
 
 ReturnValue_t ScexDeviceHandler::interpretDeviceReply(DeviceCommandId_t id, const uint8_t* packet) {
-  // cmd auswertung (in file reinschreiben)
   using namespace scex;
 
   ReturnValue_t status = OK;
   auto oneFileHandler = [&](std::string cmdName) {
-    fileId = random_string(6);
+    fileId = date_time_string();
     std::ostringstream oss("/tmp/scex-", std::ostringstream::ate);
     oss << cmdName << fileId << ".bin";
     fileName = oss.str();
-    std::cout << fileName << std::endl;
     ofstream out(fileName, ofstream::binary);
     if (out.bad()) {
       sif::error << "ScexDeviceHandler::interpretDeviceReply: Could not open file " << fileName
                  << std::endl;
       return FAILED;
     }
-    if (debugMode) {
     out << helper;
-    }
     return OK;
   };
   auto multiFileHandler = [&](std::string cmdName) {
     if ((helper.getPacketCounter() == 1) or (not fileNameSet)) {
-
+      fileId = date_time_string();
-      fileId = random_string(6);
       std::ostringstream oss("/tmp/scex-", std::ostringstream::ate);
       oss << cmdName << fileId << ".bin";
       fileName = oss.str();
       fileNameSet = true;
       ofstream out(fileName, ofstream::binary);
       if (out.bad()) {
-        sif::error << "ScexDeviceHandler::interpretDeviceReply: Could not open file " << fileName
+        sif::error << "ScexDeviceHandler::handleValidReply: Could not open file " << fileName
                    << std::endl;
         return FAILED;
       }
+      out << helper;
     } else {
       ofstream out(fileName,
                    ofstream::binary | ofstream::app);  // append
-      if (debugMode) {
+      if (out.bad()) {
+        sif::error << "ScexDeviceHandler::handleValidReply: Could not open file " << fileName
+                   << std::endl;
+        return FAILED;
+      }
       out << helper;
     }
-    }
-
     return OK;
   };
   switch (id) {
@@ -220,7 +260,7 @@ ReturnValue_t ScexDeviceHandler::interpretDeviceReply(DeviceCommandId_t id, cons
       break;
     }
     case (ALL_CELLS_CMD): {
-      status = multiFileHandler("all_cell_");
+      status = multiFileHandler("multi_cell_");
       break;
     }
     default:
@@ -231,27 +271,34 @@ ReturnValue_t ScexDeviceHandler::interpretDeviceReply(DeviceCommandId_t id, cons
     reader.finish();
     commandActive = false;
     if (id != PING) {
-      sif::info << "Reader is finished" << std::endl;
       fileNameSet = false;
     }
+    if (id == FRAM or id == ALL_CELLS_CMD or id == ONE_CELL) {
+      triggerEvent(MULTI_PACKET_COMMAND_DONE, id);
+      updatePeriodicReply(false, id);
+    }
+  }
+  if (debugMode) {
+    uint32_t remainingMillis = finishCountdown.getRemainingMillis();
+    sif::info << __FILE__ << __func__ << "(" << __LINE__ << ") RemMillis: " << remainingMillis
+              << std::endl;
   }
-
   return status;
 }
 
 void ScexDeviceHandler::performOperationHook() {
+  uint32_t remainingMillis = finishCountdown.getRemainingMillis();
   if (commandActive and finishCountdown.hasTimedOut()) {
     triggerEvent(scex::EXPERIMENT_TIMEDOUT, currCmd, 0);
     reader.finish();
-    sif::warning << "ScexDeviceHandler::performOperationHook: Reader timeout" << std::endl;
+    sif::warning << "ScexDeviceHandler::scanForReply: Reader timeout; RemMillis: "
+                 << remainingMillis << std::endl;
     fileNameSet = false;
     commandActive = false;
   }
 }
 
-uint32_t ScexDeviceHandler::getTransitionDelayMs(Mode_t modeFrom, Mode_t modeTo) {
+uint32_t ScexDeviceHandler::getTransitionDelayMs(Mode_t modeFrom, Mode_t modeTo) { return OK; }
-  return OK;
-}
 
 ReturnValue_t ScexDeviceHandler::getSwitches(const uint8_t** switches, uint8_t* numberOfSwitches) {
   return OK;
@@ -262,23 +309,36 @@ ReturnValue_t ScexDeviceHandler::initializeLocalDataPool(localpool::DataPool& lo
   return OK;
 }
 
-std::string ScexDeviceHandler::random_string(std::string::size_type length) {
+std::string ScexDeviceHandler::date_time_string() {
-  static auto& chrs =
+  using namespace std;
-      "0123456789"
+  string date_time;
-      "abcdefghijklmnopqrstuvwxyz"
+  Clock::TimeOfDay_t tod;
-      "ABCDEFGHIJKLMNOPQRSTUVWXYZ";
+  Clock::getDateAndTime(&tod);
+  time_t now = time(0);
+  tm* ltm = localtime(&now);
+  ostringstream oss(std::ostringstream::ate);
 
-  thread_local static std::mt19937 rg{std::random_device{}()};
+  //TODO mit tod ersetzen
-  thread_local static std::uniform_int_distribution<std::string::size_type> pick(0,
+  if (ltm->tm_hour < 10) {
-                                                                                 sizeof(chrs) - 2);
+    oss << tod.year << tod.month << ltm->tm_mday << "_0" << ltm->tm_hour;
+  } else {
+    oss << 1900 + ltm->tm_year << 1 + ltm->tm_mon << ltm->tm_mday << "_" << ltm->tm_hour;
+  }
+  if (ltm->tm_min < 10) {
+    oss << 0 << ltm->tm_min;
 
-  std::string s;
+  } else {
+    oss << ltm->tm_min;
+  }
+  if (ltm->tm_sec < 10) {
+    oss << 0 << ltm->tm_sec;
+  } else {
+    oss << ltm->tm_sec;
+  }
 
-  s.reserve(length);
+  date_time = oss.str();
 
-  while (length--) s += chrs[pick(rg)];
+  return date_time;
-
-  return s;
 }
 
 void ScexDeviceHandler::modeChanged() {}

mission/devices/ScexDeviceHandler.h

@@ -5,6 +5,8 @@
 #include <linux/devices/ScexHelper.h>
 #include <linux/devices/ScexUartReader.h>
 
+#include "commonSubsystemIds.h"
+
 class SdCardMountedIF;
 
 class ScexDeviceHandler : public DeviceHandlerBase {
@@ -22,13 +24,13 @@ class ScexDeviceHandler : public DeviceHandlerBase {
   std::string fileName = "";
   bool fileNameSet = false;
   bool commandActive = false;
-  bool debugMode = true;
+  bool debugMode = false;
 
   scex::Cmds currCmd = scex::Cmds::PING;
   SdCardMountedIF *sdcMan = nullptr;
   Countdown finishCountdown = Countdown(LONG_CD);
 
-  std::string random_string(std::string::size_type length);
+  std::string date_time_string();
 
   // DeviceHandlerBase private function implementation
   void doStartUp() override;
@@ -45,6 +47,7 @@ class ScexDeviceHandler : public DeviceHandlerBase {
   ReturnValue_t scanForReply(const uint8_t *start, size_t remainingSize, DeviceCommandId_t *foundId,
                              size_t *foundLen) override;
   ReturnValue_t interpretDeviceReply(DeviceCommandId_t id, const uint8_t *packet) override;
+  ReturnValue_t handleValidReply(size_t remSize, DeviceCommandId_t *foundId, size_t *foundLen);
   uint32_t getTransitionDelayMs(Mode_t modeFrom, Mode_t modeTo) override;
   ReturnValue_t getSwitches(const uint8_t **switches, uint8_t *numberOfSwitches) override;
 

mission/devices/devicedefinitions/ScexDefinitions.h

@@ -14,8 +14,10 @@ namespace scex {
 static constexpr uint8_t SUBSYSTEM_ID = SUBSYSTEM_ID::SCEX_HANDLER;
 
 static constexpr Event MISSING_PACKET = event::makeEvent(SUBSYSTEM_ID, 0, severity::LOW);
-
+static constexpr Event EXPERIMENT_TIMEDOUT = event::makeEvent(SUBSYSTEM_ID, 1, severity::LOW);
-static constexpr Event EXPERIMENT_TIMEDOUT = event::makeEvent(SUBSYSTEM_ID, 0, severity::LOW);
+//! FRAM, One Cell or All cells command finished. P1: Command ID
+static constexpr Event MULTI_PACKET_COMMAND_DONE =
+    event::makeEvent(SUBSYSTEM_ID, 2, severity::INFO);
 
 enum Cmds : DeviceCommandId_t {
   PING = 0b00111,

mission/memory/SdCardMountedIF.h

@@ -2,17 +2,17 @@
 #define MISSION_MEMORY_SDCARDMOUNTERIF_H_
 
 #include <string>
-
+#include <optional>
 #include "definitions.h"
 
 class SdCardMountedIF {
  public:
   virtual ~SdCardMountedIF(){};
-  virtual std::string getCurrentMountPrefix() const = 0;
+  virtual const std::string& getCurrentMountPrefix() const = 0;
   virtual bool isSdCardMounted(sd::SdCard sdCard) = 0;
-  virtual sd::SdCard getPreferredSdCard() const = 0;
+  virtual std::optional<sd::SdCard> getPreferredSdCard() const = 0;
   virtual void setActiveSdCard(sd::SdCard sdCard) = 0;
-  virtual sd::SdCard getActiveSdCard() const = 0;
+  virtual std::optional<sd::SdCard> getActiveSdCard() const = 0;
 
  private:
 };

tmtc

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