Merge remote-tracking branch 'origin/develop' into mueller/rtds-update

bsp_q7s/core/CoreController.cpp

@@ -87,6 +87,7 @@ ReturnValue_t CoreController::initializeLocalDataPool(localpool::DataPool &local
   localDataPoolMap.emplace(core::TEMPERATURE, new PoolEntry<float>({0}));
   localDataPoolMap.emplace(core::PS_VOLTAGE, new PoolEntry<float>({0}));
   localDataPoolMap.emplace(core::PL_VOLTAGE, new PoolEntry<float>({0}));
+  poolManager.subscribeForPeriodicPacket(hkSet.getSid(), false, 10.0, false);
   return HasReturnvaluesIF::RETURN_OK;
 }
 

bsp_q7s/core/InitMission.cpp

@@ -135,6 +135,7 @@ void initmission::initTasks() {
 
   PeriodicTaskIF* sysTask = factory->createPeriodicTask(
       "SYS_TASK", 40, PeriodicTaskIF::MINIMUM_STACK_SIZE * 2, 0.4, missedDeadlineFunc);
+  static_cast<void>(sysTask);
 #if OBSW_ADD_ACS_HANDLERS == 1
   result = sysTask->addComponent(objects::ACS_BOARD_ASS);
   if (result != HasReturnvaluesIF::RETURN_OK) {

bsp_q7s/em/emObjectFactory.cpp

@@ -1,3 +1,4 @@
+#include <fsfw/health/HealthTableIF.h>
 #include "OBSWConfig.h"
 #include "bsp_q7s/core/CoreController.h"
 #include "bsp_q7s/core/ObjectFactory.h"
@@ -11,7 +12,8 @@
 
 void ObjectFactory::produce(void* args) {
   ObjectFactory::setStatics();
-  ObjectFactory::produceGenericObjects();
+  HealthTableIF* healthTable = nullptr;
+  ObjectFactory::produceGenericObjects(&healthTable);
 
   LinuxLibgpioIF* gpioComIF = nullptr;
   UartComIF* uartComIF = nullptr;
@@ -31,7 +33,7 @@ void ObjectFactory::produce(void* args) {
 #if OBSW_ADD_ACS_BOARD == 1
   createAcsBoardComponents(gpioComIF, uartComIF, pwrSwitcher);
 #endif
-  createHeaterComponents();
+  createHeaterComponents(gpioComIF, pwrSwitcher, healthTable);
   createSolarArrayDeploymentComponents();
   createPlPcduComponents(gpioComIF, spiMainComIF, pwrSwitcher);
 #if OBSW_ADD_SYRLINKS == 1

bsp_q7s/obsw.cpp

@@ -4,6 +4,7 @@
 #include <iostream>
 
 #include "OBSWConfig.h"
+#include "q7sConfig.h"
 #include "commonConfig.h"
 #include "core/InitMission.h"
 #include "fsfw/tasks/TaskFactory.h"
@@ -11,11 +12,15 @@
 #include "watchdog/definitions.h"
 
 static int OBSW_ALREADY_RUNNING = -2;
-
+#if OBSW_Q7S_EM == 0
+static const char* DEV_STRING = "Xiphos Q7S FM";
+#else
+static const char* DEV_STRING = "Xiphos Q7S EM";
+#endif
 int obsw::obsw() {
   using namespace fsfw;
   std::cout << "-- EIVE OBSW --" << std::endl;
-  std::cout << "-- Compiled for Linux (Xiphos Q7S) --" << std::endl;
+  std::cout << "-- Compiled for Linux (" << DEV_STRING << ") --" << std::endl;
   std::cout << "-- OBSW v" << common::OBSW_VERSION << " | FSFW v" << fsfw::FSFW_VERSION << " --"
             << std::endl;
   std::cout << "-- " << __DATE__ << " " << __TIME__ << " --" << std::endl;

fsfw

@@ -1 +1 @@
-Subproject commit b1e30ae9ff5c89ab6c628758a01d3fd274dd1d37
+Subproject commit e758f0be2e8864c761877a4dcbdf461df52072f7

scripts/install-obsw-yocto.sh

@@ -1,9 +1,16 @@
 #!/bin/bash
 # This is a helper script to install the compiles EIVE OBSW files
 # into the yocto repository to re-generate the mission root filesystem
+build_dir=cmake-build-release-q7s
+if [ ! -z ${1} ]; then
+  if [[ "${1}" == "em" ]]; then
+    echo "-I- Installing EM binaries"
+    build_dir=cmake-build-release-q7s-em
+  fi
+fi
 
 init_dir=$(pwd)
-build_dir=cmake-build-release-q7s
+
 obsw_root=""
 q7s_yocto_dir="q7s-yocto"
 q7s_package_path="q7s-package/${q7s_yocto_dir}"

tmtc

@@ -1 +1 @@
-Subproject commit b185e94cb57feea075d16cd0504ad4574ea646dd
+Subproject commit 881baf7a826c0f185d6a9cb79ffa8a3a2af72114