From e5fd62a121b01ba08997ca27add1e2fdfff66b6b Mon Sep 17 00:00:00 2001
From: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date: Mon, 31 Oct 2022 18:45:39 +0100
Subject: [PATCH] some updates for pdec and EM syrlinks tests

---
 bsp_q7s/em/emObjectFactory.cpp | 7 +++++++
 dummies/helpers.cpp            | 4 +++-
 dummies/helpers.h              | 1 +
 linux/obc/PdecHandler.cpp      | 2 --
 tmtc                           | 2 +-
 5 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/bsp_q7s/em/emObjectFactory.cpp b/bsp_q7s/em/emObjectFactory.cpp
index 13ae55d6..36a66584 100644
--- a/bsp_q7s/em/emObjectFactory.cpp
+++ b/bsp_q7s/em/emObjectFactory.cpp
@@ -33,6 +33,9 @@ void ObjectFactory::produce(void* args) {
   // level components.
   dummy::DummyCfg dummyCfg;
   dummyCfg.addCoreCtrlCfg = false;
+#if OBSW_ADD_SYRLINKS == 1
+  dummyCfg.addSyrlinksDummies = false;
+#endif
   dummy::createDummies(dummyCfg);
 
   new CoreController(objects::CORE_CONTROLLER);
@@ -63,6 +66,10 @@ void ObjectFactory::produce(void* args) {
   createImtqComponents(pwrSwitcher);
 #endif
 
+#if OBSW_ADD_SYRLINKS == 1
+  createSyrlinksComponents(pwrSwitcher);
+#endif /* OBSW_ADD_SYRLINKS == 1 */
+
 #if OBSW_ADD_RW == 1
   createReactionWheelComponents(gpioComIF, pwrSwitcher);
 #endif
diff --git a/dummies/helpers.cpp b/dummies/helpers.cpp
index 2b18cffd..495d6f6c 100644
--- a/dummies/helpers.cpp
+++ b/dummies/helpers.cpp
@@ -38,7 +38,9 @@ void dummy::createDummies(DummyCfg cfg) {
   new RwDummy(objects::RW4, objects::DUMMY_COM_IF, comCookieDummy);
   new SaDeplDummy(objects::SOLAR_ARRAY_DEPL_HANDLER);
   new StarTrackerDummy(objects::STAR_TRACKER, objects::DUMMY_COM_IF, comCookieDummy);
-  new SyrlinksDummy(objects::SYRLINKS_HK_HANDLER, objects::DUMMY_COM_IF, comCookieDummy);
+  if (cfg.addSyrlinksDummies) {
+    new SyrlinksDummy(objects::SYRLINKS_HK_HANDLER, objects::DUMMY_COM_IF, comCookieDummy);
+  }
   new ImtqDummy(objects::IMTQ_HANDLER, objects::DUMMY_COM_IF, comCookieDummy);
   if (cfg.addPowerDummies) {
     new AcuDummy(objects::ACU_HANDLER, objects::DUMMY_COM_IF, comCookieDummy);
diff --git a/dummies/helpers.h b/dummies/helpers.h
index 680f97c1..f509f316 100644
--- a/dummies/helpers.h
+++ b/dummies/helpers.h
@@ -5,6 +5,7 @@ namespace dummy {
 struct DummyCfg {
   bool addCoreCtrlCfg = true;
   bool addPowerDummies = true;
+  bool addSyrlinksDummies = true;
   bool addAcsBoardDummies = true;
   bool addSusDummies = true;
   bool addTempSensorDummies = true;
diff --git a/linux/obc/PdecHandler.cpp b/linux/obc/PdecHandler.cpp
index 54f0e1ff..3beb18dd 100644
--- a/linux/obc/PdecHandler.cpp
+++ b/linux/obc/PdecHandler.cpp
@@ -437,7 +437,6 @@ void PdecHandler::handleNewTc() {
   printTC(tcLength);
 #endif /* OBSW_DEBUG_PDEC_HANDLER */
 
-#if OBSW_TC_FROM_PDEC == 1
   store_address_t storeId;
   result = tcStore->addData(&storeId, tcSegment + 1, tcLength - 1);
   if (result != returnvalue::OK) {
@@ -455,7 +454,6 @@ void PdecHandler::handleNewTc() {
     tcStore->deleteData(storeId);
     return;
   }
-#endif /* OBSW_TC_FROM_PDEC == 1 */
 
   return;
 }
diff --git a/tmtc b/tmtc
index 044c600b..f99ca2f8 160000
--- a/tmtc
+++ b/tmtc
@@ -1 +1 @@
-Subproject commit 044c600b1ce13d58781a8d06125619c8cc0080f9
+Subproject commit f99ca2f8d8df6e37f4e50073aa2dbcefff232524