reduced number of errors for hosted build

bsp_hosted/ObjectFactory.cpp

@@ -9,7 +9,6 @@
 #include <objects/systemObjectList.h>
 
 #include "OBSWConfig.h"
-#include "devConf.h"
 #include "fsfw/platform.h"
 #include "fsfw_tests/integration/task/TestTask.h"
 
@@ -22,30 +21,13 @@
 #include "fsfw/osal/common/TcpTmTcServer.h"
 #endif
 
-#include <fsfw/tmtcpacket/pus/tm.h>
-
 #if OBSW_ADD_TEST_CODE == 1
 #include <test/testtasks/TestTask.h>
 #endif
 
 #include <dummies/AcuDummy.h>
-#include <dummies/BpxDummy.h>
-#include <dummies/ComCookieDummy.h>
-#include <dummies/ComIFDummy.h>
 #include <dummies/CoreControllerDummy.h>
-#include <dummies/GyroAdisDummy.h>
-#include <dummies/GyroL3GD20Dummy.h>
-#include <dummies/ImtqDummy.h>
-#include <dummies/MgmLIS3MDLDummy.h>
-#include <dummies/P60DockDummy.h>
-#include <dummies/PduDummy.h>
-#include <dummies/PlPcduDummy.h>
-#include <dummies/RwDummy.h>
-#include <dummies/StarTrackerDummy.h>
-#include <dummies/SusDummy.h>
-#include <dummies/SyrlinksDummy.h>
 
-#include "../dummies/TemperatureSensorInserter.h"
 #include "dummies/helpers.h"
 #include "mission/utility/GlobalConfigHandler.h"
 

bsp_hosted/fsfwconfig/returnvalues/classIds.h

@@ -13,7 +13,7 @@
 namespace CLASS_ID {
 enum {
   CLASS_ID_START = COMMON_CLASS_ID_END,
-  CLASS_ID_END // [EXPORT] : [END]
+  CLASS_ID_END  // [EXPORT] : [END]
 };
 }
 

bsp_hosted/scheduling.cpp

@@ -155,10 +155,10 @@ void scheduling::initTasks() {
   }
 
   // Disabled until more stable
-  //result = thermalTask->addComponent(objects::THERMAL_CONTROLLER);
+  // result = thermalTask->addComponent(objects::THERMAL_CONTROLLER);
-  //if (result != returnvalue::OK) {
+  // if (result != returnvalue::OK) {
-  //  scheduling::printAddObjectError("THERMAL_CONTROLLER", objects::THERMAL_CONTROLLER);
+  //   scheduling::printAddObjectError("THERMAL_CONTROLLER", objects::THERMAL_CONTROLLER);
-  //}
+  // }
 
   FixedTimeslotTaskIF* pstTask = factory->createFixedTimeslotTask(
       "DUMMY_PST", 75, PeriodicTaskIF::MINIMUM_STACK_SIZE * 4, 0.5, missedDeadlineFunc);

dummies/ImtqDummy.cpp

@@ -43,5 +43,5 @@ ReturnValue_t ImtqDummy::initializeLocalDataPool(localpool::DataPool &localDataP
   localDataPoolMap.emplace(IMTQ::ACTUATION_CAL_STATUS, new PoolEntry<uint8_t>({0}));
   localDataPoolMap.emplace(IMTQ::MTM_RAW, new PoolEntry<float>({0.12, 0.76, -0.45}, true));
   localDataPoolMap.emplace(IMTQ::ACTUATION_RAW_STATUS, new PoolEntry<uint8_t>({0}));
-  return returnvalue::OK;
+  return DeviceHandlerBase::initializeLocalDataPool(localDataPoolMap, poolManager);
 }

dummies/TemperatureSensorInserter.cpp

@@ -4,13 +4,14 @@
 
 #include <cmath>
 #include <cstdlib>
+#include <utility>
 
 TemperatureSensorInserter::TemperatureSensorInserter(object_id_t objectId,
-                                                     const Max31865DummyMap& tempSensorDummies_,
+                                                     Max31865DummyMap tempSensorDummies_,
-                                                     const Tmp1075DummyMap& tempTmpSensorDummies_)
+                                                     Tmp1075DummyMap tempTmpSensorDummies_)
     : SystemObject(objects::THERMAL_TEMP_INSERTER),
-      max31865DummyMap(tempSensorDummies_),
+      max31865DummyMap(std::move(tempSensorDummies_)),
-      tmp1075DummyMap(tempTmpSensorDummies_) {}
+      tmp1075DummyMap(std::move(tempTmpSensorDummies_)) {}
 
 ReturnValue_t TemperatureSensorInserter::initialize() {
   if (performTest) {

dummies/TemperatureSensorInserter.h

@@ -10,9 +10,8 @@ class TemperatureSensorInserter : public ExecutableObjectIF, public SystemObject
  public:
   using Max31865DummyMap = std::map<object_id_t, Max31865Dummy*>;
   using Tmp1075DummyMap = std::map<object_id_t, Tmp1075Dummy*>;
-  explicit TemperatureSensorInserter(object_id_t objectId,
+  explicit TemperatureSensorInserter(object_id_t objectId, Max31865DummyMap tempSensorDummies_,
-                                     const Max31865DummyMap& tempSensorDummies_,
+                                     Tmp1075DummyMap tempTmpSensorDummies_);
-                                     const Tmp1075DummyMap& tempTmpSensorDummies_);
 
   ReturnValue_t initialize() override;
 

dummies/helpers.cpp

@@ -46,7 +46,8 @@ void dummy::createDummies(DummyCfg cfg, PowerSwitchIF& pwrSwitch) {
   if (cfg.addSyrlinksDummies) {
     new SyrlinksDummy(objects::SYRLINKS_HANDLER, objects::DUMMY_COM_IF, comCookieDummy);
   }
-  new ImtqDummy(objects::IMTQ_HANDLER, objects::DUMMY_COM_IF, comCookieDummy);
+  auto* imtqDummy = new ImtqDummy(objects::IMTQ_HANDLER, objects::DUMMY_COM_IF, comCookieDummy);
+  imtqDummy->setUpThermalModule(ThermalStateCfg());
   if (cfg.addPowerDummies) {
     new AcuDummy(objects::ACU_HANDLER, objects::DUMMY_COM_IF, comCookieDummy);
     new PduDummy(objects::PDU1_HANDLER, objects::DUMMY_COM_IF, comCookieDummy);

fsfw

@@ -1 +1 @@
-Subproject commit 6ce80ea6c5b7621876422d2c7614096cbca6f302
+Subproject commit 1841f929442d7945fd0c9401de4accc72031003d

mission/controller/ThermalController.cpp

@@ -21,7 +21,7 @@ ThermalController::ThermalController(object_id_t objectId, HeaterHandler& heater
       sensorTemperatures(this),
       susTemperatures(this),
       deviceTemperatures(this),
-      imtqThermalSet(objects::IMTQ_HANDLER),
+      imtqThermalSet(objects::IMTQ_HANDLER, ThermalStateCfg()),
       max31865Set0(objects::RTD_0_IC3_PLOC_HEATSPREADER,
                    EiveMax31855::RtdCommands::EXCHANGE_SET_ID),
       max31865Set1(objects::RTD_1_IC4_PLOC_MISSIONBOARD,