prep v1.26.4

CHANGELOG.md

@@ -17,6 +17,10 @@ change warranting a new major release:
 
 # [unreleased]
 
+# [v1.26.4] 2023-02-10
+
+eive-tmtc: v2.12.3
+
 # [v1.26.3] 2023-02-09
 
 eive-tmtc: v2.12.2

bsp_hosted/scheduling.cpp

@@ -56,26 +56,30 @@ void scheduling::initTasks() {
 
   /* TMTC Distribution */
   PeriodicTaskIF* tmtcDistributor = factory->createPeriodicTask(
-      "DIST", 45, PeriodicTaskIF::MINIMUM_STACK_SIZE, 0.2, missedDeadlineFunc);
+      "DIST", 60, PeriodicTaskIF::MINIMUM_STACK_SIZE, 0.2, missedDeadlineFunc);
   ReturnValue_t result = tmtcDistributor->addComponent(objects::CCSDS_PACKET_DISTRIBUTOR);
   if (result != returnvalue::OK) {
-    sif::error << "Object add component failed" << std::endl;
+    sif::error << "adding CCSDS distributor failed" << std::endl;
   }
   result = tmtcDistributor->addComponent(objects::PUS_PACKET_DISTRIBUTOR);
   if (result != returnvalue::OK) {
-    sif::error << "Object add component failed" << std::endl;
+    sif::error << "adding PUS distributor failed" << std::endl;
   }
   result = tmtcDistributor->addComponent(objects::TM_FUNNEL);
   if (result != returnvalue::OK) {
-    sif::error << "Object add component failed" << std::endl;
+    sif::error << "adding TM funnel failed" << std::endl;
+  }
+  result = tmtcDistributor->addComponent(objects::CFDP_DISTRIBUTOR);
+  if (result != returnvalue::OK) {
+    sif::error << "adding CFDP distributor failed" << std::endl;
   }
   result = tmtcDistributor->addComponent(objects::UDP_TMTC_SERVER);
   if (result != returnvalue::OK) {
-    sif::error << "Add component UDP Unix Bridge failed" << std::endl;
+    sif::error << "adding UDP server failed" << std::endl;
   }
   result = tmtcDistributor->addComponent(objects::TCP_TMTC_SERVER);
   if (result != returnvalue::OK) {
-    sif::error << "Add component UDP Unix Bridge failed" << std::endl;
+    sif::error << "adding TCP server failed" << std::endl;
   }
 
   PeriodicTaskIF* udpPollingTask = factory->createPeriodicTask(
@@ -166,6 +170,15 @@ void scheduling::initTasks() {
     sif::error << "Failed to add dummy pst to fixed timeslot task" << std::endl;
   }
 
+#if OBSW_ADD_CFDP_COMPONENTS == 1
+  PeriodicTaskIF* cfdpTask = factory->createPeriodicTask(
+      "CFDP Handler", 45, PeriodicTaskIF::MINIMUM_STACK_SIZE, 0.4, missedDeadlineFunc);
+  result = cfdpTask->addComponent(objects::CFDP_HANDLER);
+  if (result != returnvalue::OK) {
+    scheduling::printAddObjectError("CFDP Handler", objects::CFDP_HANDLER);
+  }
+#endif
+
 #if OBSW_ADD_PLOC_SUPERVISOR == 1
   PeriodicTaskIF* supvHelperTask = factory->createPeriodicTask(
       "PLOC_SUPV_HELPER", 20, PeriodicTaskIF::MINIMUM_STACK_SIZE, 1.0, missedDeadlineFunc);
@@ -222,6 +235,9 @@ void scheduling::initTasks() {
 #if OBSW_ADD_PLOC_SUPERVISOR == 1 || OBSW_ADD_PLOC_MPSOC == 1
   plTask->startTask();
 #endif
+#if OBSW_ADD_CFDP_COMPONENTS == 1
+  cfdpTask->startTask();
+#endif
 
 #if OBSW_ADD_TEST_CODE == 1
   testTask->startTask();

bsp_q7s/core/ObjectFactory.cpp

@@ -926,7 +926,7 @@ void ObjectFactory::createImtqComponents(PowerSwitchIF* pwrSwitcher) {
   I2cCookie* imtqI2cCookie = new I2cCookie(addresses::IMTQ, IMTQ::MAX_REPLY_SIZE, q7s::I2C_PL_EIVE);
   auto imtqHandler = new ImtqHandler(objects::IMTQ_HANDLER, objects::I2C_COM_IF, imtqI2cCookie,
                                      pcdu::Switches::PDU1_CH3_MGT_5V);
-  imtqHandler->setUpThermalModule(ThermalStateCfg());
+  imtqHandler->enableThermalModule(ThermalStateCfg());
   imtqHandler->setPowerSwitcher(pwrSwitcher);
   imtqHandler->connectModeTreeParent(satsystem::acs::ACS_SUBSYSTEM);
   static_cast<void>(imtqHandler);

dummies/helpers.cpp

@@ -47,7 +47,7 @@ void dummy::createDummies(DummyCfg cfg, PowerSwitchIF& pwrSwitch) {
     new SyrlinksDummy(objects::SYRLINKS_HANDLER, objects::DUMMY_COM_IF, comCookieDummy);
   }
   auto* imtqDummy = new ImtqDummy(objects::IMTQ_HANDLER, objects::DUMMY_COM_IF, comCookieDummy);
-  imtqDummy->setUpThermalModule(ThermalStateCfg());
+  imtqDummy->enableThermalModule(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 14a92b3d89e37d50ccd46b250826cac293185d68
+Subproject commit d302ba71858edfa15834ff8b28d6cce2c2cbbb84

mission/core/GenericFactory.cpp

@@ -175,6 +175,7 @@ void ObjectFactory::produceGenericObjects(HealthTableIF** healthTable_, PusTmFun
 
 #if OBSW_ADD_CFDP_COMPONENTS == 1
   using namespace cfdp;
+
   MessageQueueIF* cfdpMsgQueue = QueueFactory::instance()->createMessageQueue(32);
   CfdpDistribCfg distribCfg(objects::CFDP_DISTRIBUTOR, *tcStore, cfdpMsgQueue);
   new CfdpDistributor(distribCfg);

tmtc

@@ -1 +1 @@
-Subproject commit 841780593ebe35ce01ea95dc5e21b78237f1d861
+Subproject commit 5fa9727375b3c870203bf1bb911de4a1f2298d4e