Merge branch 'main' into acs-ptg-ctrl-fixes

CHANGELOG.md

@@ -20,8 +20,7 @@ will consitute of a breaking change warranting a new major release:
 
 ## Fixed
 
-- The dual lane assembly device handlers did not properly set their datasets
-  to invalid on off transitions
+- The dual lane assembly datasets were not marked invalid properly on OFF transitions.
 
 # [v2.0.3] 2023-04-17
 

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

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);
   }

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;