Merge pull request 'Add SCEX handler for EM' (#743) from add-scex-for-em into main
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #743 Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de>
This commit is contained in:
commit
6ae72db32d
@ -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
|
- The STR `AutoThreshold` parameters are now set from the configuration JSON file at STR
|
||||||
startup.
|
startup.
|
||||||
- The STR handler can now handle the COM error reply and triggers an low severity event accordingly.
|
- 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
|
# [v6.1.0] 2023-07-13
|
||||||
|
|
||||||
|
@ -162,7 +162,7 @@ set(OBSW_ADD_RW
|
|||||||
${INIT_VAL}
|
${INIT_VAL}
|
||||||
CACHE STRING "Add RW modules")
|
CACHE STRING "Add RW modules")
|
||||||
set(OBSW_ADD_SCEX_DEVICE
|
set(OBSW_ADD_SCEX_DEVICE
|
||||||
${INIT_VAL}
|
1
|
||||||
CACHE STRING "Add Solar Cell Experiment module")
|
CACHE STRING "Add Solar Cell Experiment module")
|
||||||
set(OBSW_SYRLINKS_SIMULATED
|
set(OBSW_SYRLINKS_SIMULATED
|
||||||
0
|
0
|
||||||
|
@ -85,6 +85,9 @@ void ObjectFactory::produce(void* args) {
|
|||||||
#if OBSW_ADD_STAR_TRACKER == 1
|
#if OBSW_ADD_STAR_TRACKER == 1
|
||||||
dummyCfg.addStrDummy = false;
|
dummyCfg.addStrDummy = false;
|
||||||
#endif
|
#endif
|
||||||
|
#if OBSW_ADD_SCEX_DEVICE == 0
|
||||||
|
dummyCfg.addScexDummy = true;
|
||||||
|
#endif
|
||||||
#if OBSW_ADD_BPX_BATTERY_HANDLER == 1
|
#if OBSW_ADD_BPX_BATTERY_HANDLER == 1
|
||||||
dummyCfg.addBpxBattDummy = false;
|
dummyCfg.addBpxBattDummy = false;
|
||||||
#endif
|
#endif
|
||||||
|
@ -242,8 +242,10 @@ void dummy::createDummies(DummyCfg cfg, PowerSwitchIF& pwrSwitcher, GpioIF* gpio
|
|||||||
power::Switches::PDU2_CH8_PAYLOAD_CAMERA);
|
power::Switches::PDU2_CH8_PAYLOAD_CAMERA);
|
||||||
camSwitcher->connectModeTreeParent(satsystem::payload::SUBSYSTEM);
|
camSwitcher->connectModeTreeParent(satsystem::payload::SUBSYSTEM);
|
||||||
}
|
}
|
||||||
|
if (cfg.addScexDummy) {
|
||||||
auto* scexDummy = new ScexDummy(objects::SCEX, objects::DUMMY_COM_IF, comCookieDummy);
|
auto* scexDummy = new ScexDummy(objects::SCEX, objects::DUMMY_COM_IF, comCookieDummy);
|
||||||
scexDummy->connectModeTreeParent(satsystem::payload::SUBSYSTEM);
|
scexDummy->connectModeTreeParent(satsystem::payload::SUBSYSTEM);
|
||||||
|
}
|
||||||
auto* plPcduDummy =
|
auto* plPcduDummy =
|
||||||
new PlPcduDummy(objects::PLPCDU_HANDLER, objects::DUMMY_COM_IF, comCookieDummy);
|
new PlPcduDummy(objects::PLPCDU_HANDLER, objects::DUMMY_COM_IF, comCookieDummy);
|
||||||
plPcduDummy->connectModeTreeParent(satsystem::payload::SUBSYSTEM);
|
plPcduDummy->connectModeTreeParent(satsystem::payload::SUBSYSTEM);
|
||||||
|
@ -31,6 +31,7 @@ struct DummyCfg {
|
|||||||
bool addTmpDummies = true;
|
bool addTmpDummies = true;
|
||||||
Tmp1075Cfg tmp1075Cfg;
|
Tmp1075Cfg tmp1075Cfg;
|
||||||
bool addCamSwitcherDummy = false;
|
bool addCamSwitcherDummy = false;
|
||||||
|
bool addScexDummy = false;
|
||||||
};
|
};
|
||||||
|
|
||||||
void createDummies(DummyCfg cfg, PowerSwitchIF& pwrSwitch, GpioIF* gpioIF, bool enableHkSets);
|
void createDummies(DummyCfg cfg, PowerSwitchIF& pwrSwitch, GpioIF* gpioIF, bool enableHkSets);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user