Merge remote-tracking branch 'origin/develop' into irini

2022-09-27 17:36:19 +02:00
parent fb3214fef9 e381b00a13
commit a1cc5b0ca7
29 changed files with 357 additions and 153 deletions
--- a/bsp_q7s/boardconfig/busConf.h
+++ b/bsp_q7s/boardconfig/busConf.h
@ -15,6 +15,8 @@ static constexpr char UART_PLOC_MPSOC_DEV[] = "/dev/ul-plmpsoc";
 static constexpr char UART_PLOC_SUPERVSIOR_DEV[] = "/dev/ul-plsv";
 static constexpr char UART_SYRLINKS_DEV[] = "/dev/ul-syrlinks";
 static constexpr char UART_STAR_TRACKER_DEV[] = "/dev/ul-str";
+static constexpr char UART_SCEX_DEV[] = "/dev/ul-scex";
+

 static constexpr char UIO_PDEC_REGISTERS[] = "/dev/uio0";
 static constexpr char UIO_PTME[] = "/dev/uio1";
--- a/bsp_q7s/core/CoreController.cpp
+++ b/bsp_q7s/core/CoreController.cpp
@ -140,7 +140,7 @@ ReturnValue_t CoreController::initialize() {
 ReturnValue_t CoreController::initializeAfterTaskCreation() {
  ReturnValue_t result = returnvalue::OK;
  auto sdCard = sdcMan->getPreferredSdCard();
-  if(not sdCard) {
+  if (not sdCard) {
    return returnvalue::FAILED;
  }
  sdInfo.pref = sdCard.value();
@ -342,7 +342,7 @@ ReturnValue_t CoreController::sdStateMachine() {
    if (not sdInfo.commandExecuted) {
      result = sdcMan->getSdCardsStatus(sdInfo.currentState);
      auto sdCard = sdcMan->getPreferredSdCard();
-      if(not sdCard) {
+      if (not sdCard) {
        return returnvalue::FAILED;
      }
      sdInfo.pref = sdCard.value();
--- a/bsp_q7s/core/InitMission.cpp
+++ b/bsp_q7s/core/InitMission.cpp
@ -1,6 +1,7 @@
 #include "bsp_q7s/core/InitMission.h"

 #include <fsfw/devicehandlers/DeviceCommunicationIF.h>
+#include <linux/InitMission.h>

 #include <iostream>
 #include <vector>
@ -242,6 +243,12 @@ void initmission::initTasks() {
    initmission::printAddObjectError("PTME_TEST", objects::CCSDS_IP_CORE_BRIDGE);
  }
 #endif
+#if OBSW_ADD_SCEX_DEVICE == 1
+  PeriodicTaskIF* scexDevHandler;
+  PeriodicTaskIF* scexReaderTask;
+  scheduling::schedulingScex(*factory, scexDevHandler, scexReaderTask);
+#endif
+

  std::vector<PeriodicTaskIF*> pusTasks;
  createPusTasks(*factory, missedDeadlineFunc, pusTasks);
@ -280,8 +287,9 @@ void initmission::initTasks() {

  taskStarter(pstTasks, "PST task vector");
  taskStarter(pusTasks, "PUS task vector");
-#if OBSW_ADD_TEST_CODE == 1
-  taskStarter(testTasks, "Test task vector");
+#if OBSW_ADD_SCEX_DEVICE == 1
+  scexDevHandler->startTask();
+  scexReaderTask->startTask();
 #endif

 #if OBSW_TEST_CCSDS_BRIDGE == 1
@ -304,6 +312,11 @@ void initmission::initTasks() {
 #if OBSW_ADD_PLOC_SUPERVISOR == 1
  supvHelperTask->startTask();
 #endif /* OBSW_ADD_PLOC_SUPERVISOR == 1 */
+
+#if OBSW_ADD_TEST_CODE == 1
+  taskStarter(testTasks, "Test task vector");
+#endif
+
  sif::info << "Tasks started.." << std::endl;
 }

@ -514,23 +527,23 @@ void initmission::createTestTasks(TaskFactory& factory,
 }

 /**
-                   ▄              ▄
-                  ▌▒█           ▄▀▒▌
-                  ▌▒▒█        ▄▀▒▒▒▐
-                 ▐▄▀▒▒▀▀▀▀▄▄▄▀▒▒▒▒▒▐
-               ▄▄▀▒░▒▒▒▒▒▒▒▒▒█▒▒▄█▒▐
-             ▄▀▒▒▒░░░▒▒▒░░░▒▒▒▀██▀▒▌
-            ▐▒▒▒▄▄▒▒▒▒░░░▒▒▒▒▒▒▒▀▄▒▒▌
-            ▌░░▌█▀▒▒▒▒▒▄▀█▄▒▒▒▒▒▒▒█▒▐
-           ▐░░░▒▒▒▒▒▒▒▒▌██▀▒▒░░░▒▒▒▀▄▌
-           ▌░▒▄██▄▒▒▒▒▒▒▒▒▒░░░░░░▒▒▒▒▌
-          ▌▒▀▐▄█▄█▌▄░▀▒▒░░░░░░░░░░▒▒▒▐
-          ▐▒▒▐▀▐▀▒░▄▄▒▄▒▒▒▒▒▒░▒░▒░▒▒▒▒▌
-          ▐▒▒▒▀▀▄▄▒▒▒▄▒▒▒▒▒▒▒▒░▒░▒░▒▒▐
-           ▌▒▒▒▒▒▒▀▀▀▒▒▒▒▒▒░▒░▒░▒░▒▒▒▌
-           ▐▒▒▒▒▒▒▒▒▒▒▒▒▒▒░▒░▒░▒▒▄▒▒▐
-            ▀▄▒▒▒▒▒▒▒▒▒▒▒░▒░▒░▒▄▒▒▒▒▌
-              ▀▄▒▒▒▒▒▒▒▒▒▒▄▄▄▀▒▒▒▒▄▀
-                ▀▄▄▄▄▄▄▀▀▀▒▒▒▒▒▄▄▀
-                   ▒▒▒▒▒▒▒▒▒▒▀▀
+                   â–„              â–„
+                  â–Œâ–’â–ˆ           â–„â–€â–’â–Œ
+                  â–Œâ–’â–’â–ˆ        â–„â–€â–’â–’â–’â–<C3A2>
+                 â–<EFBFBD>â–„â–€â–’â–’â–€â–€â–€â–€â–„â–„â–„â–€â–’â–’â–’â–’â–’â–<EFBFBD>
+               â–„â–„â–€â–’â–‘â–’â–’â–’â–’â–’â–’â–’â–’â–’â–ˆâ–’â–’â–„â–ˆâ–’â–<EFBFBD>
+             â–„â–€â–’â–’â–’â–‘â–‘â–‘â–’â–’â–’â–‘â–‘â–‘â–’â–’â–’â–€â–ˆâ–ˆâ–€â–’â–Œ
+            â–<EFBFBD>â–’â–’â–’â–„â–„â–’â–’â–’â–’â–‘â–‘â–‘â–’â–’â–’â–’â–’â–’â–’â–€â–„â–’â–’â–Œ
+            â–Œâ–‘â–‘â–Œâ–ˆâ–€â–’â–’â–’â–’â–’â–„â–€â–ˆâ–„â–’â–’â–’â–’â–’â–’â–’â–ˆâ–’â–<EFBFBD>
+           â–<EFBFBD>â–‘â–‘â–‘â–’â–’â–’â–’â–’â–’â–’â–’â–Œâ–ˆâ–ˆâ–€â–’â–’â–‘â–‘â–‘â–’â–’â–’â–€â–„â–Œ
+           â–Œâ–‘â–’â–„â–ˆâ–ˆâ–„â–’â–’â–’â–’â–’â–’â–’â–’â–’â–‘â–‘â–‘â–‘â–‘â–‘â–’â–’â–’â–’â–Œ
+          â–Œâ–’â–€â–<EFBFBD>â–„â–ˆâ–„â–ˆâ–Œâ–„â–‘â–€â–’â–’â–‘â–‘â–‘â–‘â–‘â–‘â–‘â–‘â–‘â–‘â–’â–’â–’â–<EFBFBD>
+          â–<EFBFBD>â–’â–’â–<EFBFBD>â–€â–<EFBFBD>â–€â–’â–‘â–„â–„â–’â–„â–’â–’â–’â–’â–’â–’â–‘â–’â–‘â–’â–‘â–’â–’â–’â–’â–Œ
+          â–<EFBFBD>â–’â–’â–’â–€â–€â–„â–„â–’â–’â–’â–„â–’â–’â–’â–’â–’â–’â–’â–’â–‘â–’â–‘â–’â–‘â–’â–’â–<EFBFBD>
+           â–Œâ–’â–’â–’â–’â–’â–’â–€â–€â–€â–’â–’â–’â–’â–’â–’â–‘â–’â–‘â–’â–‘â–’â–‘â–’â–’â–’â–Œ
+           â–<EFBFBD>â–’â–’â–’â–’â–’â–’â–’â–’â–’â–’â–’â–’â–’â–’â–‘â–’â–‘â–’â–‘â–’â–’â–„â–’â–’â–<EFBFBD>
+            â–€â–„â–’â–’â–’â–’â–’â–’â–’â–’â–’â–’â–’â–‘â–’â–‘â–’â–‘â–’â–„â–’â–’â–’â–’â–Œ
+              â–€â–„â–’â–’â–’â–’â–’â–’â–’â–’â–’â–’â–„â–„â–„â–€â–’â–’â–’â–’â–„â–€
+                â–€â–„â–„â–„â–„â–„â–„â–€â–€â–€â–’â–’â–’â–’â–’â–„â–„â–€
+                   â–’â–’â–’â–’â–’â–’â–’â–’â–’â–’â–€â–€
 **/
--- a/bsp_q7s/fmObjectFactory.cpp
+++ b/bsp_q7s/fmObjectFactory.cpp
@ -1,3 +1,4 @@
+#include <mission/devices/devicedefinitions/GomspaceDefinitions.h>
 #include "OBSWConfig.h"
 #include "bsp_q7s/core/CoreController.h"
 #include "bsp_q7s/core/ObjectFactory.h"
@ -56,6 +57,11 @@ void ObjectFactory::produce(void* args) {
 #if OBSW_USE_CCSDS_IP_CORE == 1
  createCcsdsComponents(gpioComIF);
 #endif /* OBSW_USE_CCSDS_IP_CORE == 1 */
+
+#if OBSW_ADD_SCEX_DEVICE == 1
+  createScexComponents(q7s::UART_GNSS_DEV, pwrSwitcher, *SdCardManager::instance(), false,
+		  pcdu::Switches::PDU1_CH5_SOLAR_CELL_EXP_5V);
+#endif
  /* Test Task */
 #if OBSW_ADD_TEST_CODE == 1
  createTestComponents(gpioComIF);
--- a/bsp_q7s/memory/FileSystemHandler.cpp
+++ b/bsp_q7s/memory/FileSystemHandler.cpp
@ -72,7 +72,8 @@ void FileSystemHandler::fileSystemCheckup() {
  SdCardManager::SdStatePair statusPair;
  sdcMan->getSdCardsStatus(statusPair);
  auto preferredSdCard = sdcMan->getPreferredSdCard();
-  if (preferredSdCard and (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)) {
@ -109,7 +110,7 @@ ReturnValue_t FileSystemHandler::initialize() {
  }
  sdcMan = SdCardManager::instance();
  auto sdCard = sdcMan->getPreferredSdCard();
-  if(not sdCard) {
+  if (not sdCard) {
    return returnvalue::FAILED;
  }
  sd::SdCard preferredSdCard = sdCard.value();