diff --git a/CHANGELOG.md b/CHANGELOG.md index aca4dffe..3ca7b9a4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -28,6 +28,7 @@ will consitute of a breaking change warranting a new major release: - The STR `AutoThreshold` parameters are now set from the configuration JSON file at STR startup. - The STR handler can now handle the COM error reply and triggers an low severity event accordingly. +- Add SCEX handler for EM. # [v6.1.0] 2023-07-13 diff --git a/CMakeLists.txt b/CMakeLists.txt index 485895cf..a7b5013c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -162,7 +162,7 @@ set(OBSW_ADD_RW ${INIT_VAL} CACHE STRING "Add RW modules") set(OBSW_ADD_SCEX_DEVICE - ${INIT_VAL} + 1 CACHE STRING "Add Solar Cell Experiment module") set(OBSW_SYRLINKS_SIMULATED 0 diff --git a/bsp_q7s/em/emObjectFactory.cpp b/bsp_q7s/em/emObjectFactory.cpp index e5d6abc2..3a1f7ac5 100644 --- a/bsp_q7s/em/emObjectFactory.cpp +++ b/bsp_q7s/em/emObjectFactory.cpp @@ -85,6 +85,9 @@ void ObjectFactory::produce(void* args) { #if OBSW_ADD_STAR_TRACKER == 1 dummyCfg.addStrDummy = false; #endif +#if OBSW_ADD_SCEX_DEVICE == 0 + dummyCfg.addScexDummy = true; +#endif #if OBSW_ADD_BPX_BATTERY_HANDLER == 1 dummyCfg.addBpxBattDummy = false; #endif diff --git a/dummies/helperFactory.cpp b/dummies/helperFactory.cpp index e085dae0..1612db52 100644 --- a/dummies/helperFactory.cpp +++ b/dummies/helperFactory.cpp @@ -242,8 +242,10 @@ void dummy::createDummies(DummyCfg cfg, PowerSwitchIF& pwrSwitcher, GpioIF* gpio power::Switches::PDU2_CH8_PAYLOAD_CAMERA); camSwitcher->connectModeTreeParent(satsystem::payload::SUBSYSTEM); } - auto* scexDummy = new ScexDummy(objects::SCEX, objects::DUMMY_COM_IF, comCookieDummy); - scexDummy->connectModeTreeParent(satsystem::payload::SUBSYSTEM); + if (cfg.addScexDummy) { + auto* scexDummy = new ScexDummy(objects::SCEX, objects::DUMMY_COM_IF, comCookieDummy); + scexDummy->connectModeTreeParent(satsystem::payload::SUBSYSTEM); + } auto* plPcduDummy = new PlPcduDummy(objects::PLPCDU_HANDLER, objects::DUMMY_COM_IF, comCookieDummy); plPcduDummy->connectModeTreeParent(satsystem::payload::SUBSYSTEM); diff --git a/dummies/helperFactory.h b/dummies/helperFactory.h index fb272bb8..bd5993c6 100644 --- a/dummies/helperFactory.h +++ b/dummies/helperFactory.h @@ -31,6 +31,7 @@ struct DummyCfg { bool addTmpDummies = true; Tmp1075Cfg tmp1075Cfg; bool addCamSwitcherDummy = false; + bool addScexDummy = false; }; void createDummies(DummyCfg cfg, PowerSwitchIF& pwrSwitch, GpioIF* gpioIF, bool enableHkSets);