From 9672d6d6cca3ad7369bb4b06fd91a7f17a0f9db9 Mon Sep 17 00:00:00 2001
From: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date: Wed, 26 Apr 2023 11:11:09 +0200
Subject: [PATCH 1/2] changelog

---
 CHANGELOG.md | 6 ++++++
 tmtc         | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 756b0709..3c5127ae 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,6 +16,12 @@ will consitute of a breaking change warranting a new major release:
 
 # [unreleased]
 
+# [v2.0.4] 2023-04-19
+
+## Fixed
+
+- The dual lane assembly datasets were not marked invalid properly on OFF transitions.
+
 # [v2.0.3] 2023-04-17
 
 - eive-tmtc: v3.1.1
diff --git a/tmtc b/tmtc
index 0c6a9677..5fbd19bb 160000
--- a/tmtc
+++ b/tmtc
@@ -1 +1 @@
-Subproject commit 0c6a9677e1b9b86456efff2e11ba31f99e15ac2a
+Subproject commit 5fbd19bb6cca0790373a809d78f2307adca9d0c8

From 7d630ebcf3894a9a9896d1c3f05548d5ef230333 Mon Sep 17 00:00:00 2001
From: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date: Wed, 26 Apr 2023 17:00:04 +0200
Subject: [PATCH 2/2] EM adaptions

---
 bsp_q7s/em/emObjectFactory.cpp | 3 +++
 dummies/helperFactory.cpp      | 4 +++-
 dummies/helperFactory.h        | 1 +
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/bsp_q7s/em/emObjectFactory.cpp b/bsp_q7s/em/emObjectFactory.cpp
index 05a3fee0..96f541da 100644
--- a/bsp_q7s/em/emObjectFactory.cpp
+++ b/bsp_q7s/em/emObjectFactory.cpp
@@ -57,6 +57,9 @@ void ObjectFactory::produce(void* args) {
 #if OBSW_ADD_GOMSPACE_PCDU == 1
   dummyCfg.addPowerDummies = false;
 #endif
+#if OBSW_ADD_BPX_BATTERY_HANDLER == 1
+  dummyCfg.addBpxBattDummy = false;
+#endif
 #if OBSW_ADD_ACS_BOARD == 1
   dummyCfg.addAcsBoardDummies = false;
 #endif
diff --git a/dummies/helperFactory.cpp b/dummies/helperFactory.cpp
index 98d2ecfa..ff18370a 100644
--- a/dummies/helperFactory.cpp
+++ b/dummies/helperFactory.cpp
@@ -45,7 +45,9 @@
 void dummy::createDummies(DummyCfg cfg, PowerSwitchIF& pwrSwitcher, GpioIF* gpioIF) {
   new ComIFDummy(objects::DUMMY_COM_IF);
   auto* comCookieDummy = new ComCookieDummy();
-  new BpxDummy(objects::BPX_BATT_HANDLER, objects::DUMMY_COM_IF, comCookieDummy);
+  if (cfg.addBpxBattDummy) {
+    new BpxDummy(objects::BPX_BATT_HANDLER, objects::DUMMY_COM_IF, comCookieDummy);
+  }
   if (cfg.addCoreCtrlCfg) {
     new CoreControllerDummy(objects::CORE_CONTROLLER);
   }
diff --git a/dummies/helperFactory.h b/dummies/helperFactory.h
index 2181c79c..dc272650 100644
--- a/dummies/helperFactory.h
+++ b/dummies/helperFactory.h
@@ -9,6 +9,7 @@ namespace dummy {
 struct DummyCfg {
   bool addCoreCtrlCfg = true;
   bool addPowerDummies = true;
+  bool addBpxBattDummy = true;
   bool addSyrlinksDummies = true;
   bool addAcsBoardDummies = true;
   bool addSusDummies = true;