Merge branch 'develop' into mueller/core-controller-remount-sd-handling

bsp_q7s/CMakeLists.txt

@@ -1,20 +1,13 @@
-#simple mode
+# simple mode
 add_executable(${SIMPLE_OBSW_NAME} EXCLUDE_FROM_ALL)
 target_compile_definitions(${SIMPLE_OBSW_NAME} PRIVATE "Q7S_SIMPLE_MODE")
-target_sources(${SIMPLE_OBSW_NAME} PUBLIC
-	main.cpp
-)
-#I think this is unintentional? (produces linker errors for stuff in /linux)
-target_link_libraries(${SIMPLE_OBSW_NAME} PUBLIC
-    ${LIB_FSFW_NAME}
-)
+target_sources(${SIMPLE_OBSW_NAME} PUBLIC main.cpp)
+# I think this is unintentional? (produces linker errors for stuff in /linux)
+target_link_libraries(${SIMPLE_OBSW_NAME} PUBLIC ${LIB_FSFW_NAME})
 target_compile_definitions(${SIMPLE_OBSW_NAME} PRIVATE "Q7S_SIMPLE_MODE")
 add_subdirectory(simple)
 
-target_sources(${OBSW_NAME} PUBLIC
-	main.cpp
-    obsw.cpp
-)
+target_sources(${OBSW_NAME} PUBLIC main.cpp obsw.cpp)
 
 add_subdirectory(boardtest)
 
@@ -23,11 +16,9 @@ add_subdirectory(comIF)
 add_subdirectory(core)
 
 if(EIVE_Q7S_EM)
-    add_subdirectory(em)
+  add_subdirectory(em)
 else()
-    target_sources(${OBSW_NAME} PUBLIC
-        fmObjectFactory.cpp
-    )
+  target_sources(${OBSW_NAME} PUBLIC fmObjectFactory.cpp)
 endif()
 
 add_subdirectory(memory)

bsp_q7s/boardconfig/CMakeLists.txt

@@ -1,12 +1,5 @@
-target_sources(${OBSW_NAME} PRIVATE
-	print.c
-)
+target_sources(${OBSW_NAME} PRIVATE print.c)
 
-target_sources(${SIMPLE_OBSW_NAME} PRIVATE
-	print.c
-)
+target_sources(${SIMPLE_OBSW_NAME} PRIVATE print.c)
 
-
-target_include_directories(${OBSW_NAME} PUBLIC
-	${CMAKE_CURRENT_SOURCE_DIR}
-)
+target_include_directories(${OBSW_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})

bsp_q7s/boardtest/CMakeLists.txt

@@ -1,10 +1,5 @@
-target_sources(${OBSW_NAME} PRIVATE
-    FileSystemTest.cpp
-    Q7STestTask.cpp
-)
+target_sources(${OBSW_NAME} PRIVATE FileSystemTest.cpp Q7STestTask.cpp)
 
 if(EIVE_BUILD_Q7S_SIMPLE_MODE)
-    target_sources(${SIMPLE_OBSW_NAME} PRIVATE
-        FileSystemTest.cpp
-    )
-endif()
+  target_sources(${SIMPLE_OBSW_NAME} PRIVATE FileSystemTest.cpp)
+endif()

bsp_q7s/callbacks/CMakeLists.txt

@@ -1,6 +1,2 @@
-target_sources(${OBSW_NAME} PRIVATE
-	rwSpiCallback.cpp
-	gnssCallback.cpp
-	pcduSwitchCb.cpp
-	q7sGpioCallbacks.cpp
-)
+target_sources(${OBSW_NAME} PRIVATE rwSpiCallback.cpp gnssCallback.cpp
+                                    pcduSwitchCb.cpp q7sGpioCallbacks.cpp)

bsp_q7s/callbacks/rwSpiCallback.cpp

@@ -44,7 +44,8 @@ ReturnValue_t spiCallback(SpiComIF* comIf, SpiCookie* cookie, const uint8_t* sen
   GpioIF* gpioIF = comIf->getGpioInterface();
   MutexIF::TimeoutType timeoutType = MutexIF::TimeoutType::WAITING;
   uint32_t timeoutMs = 0;
-  MutexIF* mutex = comIf->getMutex(&timeoutType, &timeoutMs);
+  cookie->getMutexParams(timeoutType, timeoutMs);
+  MutexIF* mutex = comIf->getCsMutex();
   if (mutex == nullptr or gpioIF == nullptr) {
     sif::debug << "rwSpiCallback::spiCallback: Mutex or GPIO interface invalid" << std::endl;
     return HasReturnvaluesIF::RETURN_FAILED;

bsp_q7s/comIF/CMakeLists.txt

@@ -1,6 +1 @@
-target_sources(${OBSW_NAME} PRIVATE
-)
-
-
-
-
+target_sources(${OBSW_NAME} PRIVATE)

bsp_q7s/core/CMakeLists.txt

@@ -1,9 +1,4 @@
-target_sources(${OBSW_NAME} PRIVATE
-    CoreController.cpp
-    InitMission.cpp
-    ObjectFactory.cpp
-)
+target_sources(${OBSW_NAME} PRIVATE CoreController.cpp InitMission.cpp
+                                    ObjectFactory.cpp)
 
-target_sources(${SIMPLE_OBSW_NAME} PRIVATE
-    InitMission.cpp
-)
+target_sources(${SIMPLE_OBSW_NAME} PRIVATE InitMission.cpp)

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

@@ -132,6 +132,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/CMakeLists.txt

@@ -1,3 +1 @@
-target_sources(${OBSW_NAME} PRIVATE
-    emObjectFactory.cpp
-)
+target_sources(${OBSW_NAME} PRIVATE emObjectFactory.cpp)

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/memory/CMakeLists.txt

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

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;

bsp_q7s/simple/CMakeLists.txt

@@ -1,3 +1 @@
-target_sources(${SIMPLE_OBSW_NAME} PRIVATE
-    simple.cpp
-)
+target_sources(${SIMPLE_OBSW_NAME} PRIVATE simple.cpp)

bsp_q7s/xadc/CMakeLists.txt

@@ -1,3 +1 @@
-target_sources(${OBSW_NAME} PRIVATE
-    Xadc.cpp
-)
+target_sources(${OBSW_NAME} PRIVATE Xadc.cpp)