Fixes and Updates for EM build #468

Merged
meggert merged 11 commits from bugfixes_em_build into develop 2023-03-14 13:35:07 +01:00
3 changed files with 4 additions and 2 deletions
Showing only changes of commit 870cc1da10 - Show all commits

View File

@ -25,6 +25,7 @@ will consitute of a breaking change warranting a new major release:
- Pointing control of the `AcsController` was still expecting submodes instead of modes.
- Limitation of RW speeds was done before converting them to the correct unit scale.
- The Syrlinks task now has a proper name instead of `MAIN_SPI`.
- Make whole EIVE system initial transition work for the EM.
# [v1.37.0] 2023-03-11

View File

@ -209,7 +209,8 @@ void dummy::createDummies(DummyCfg cfg, PowerSwitchIF& pwrSwitcher, GpioIF* gpio
tmp.second->connectModeTreeParent(satsystem::tcs::SUBSYSTEM);
}
}
auto* camSwitcher = new CamSwitcher(objects::CAM_SWITCHER, pwrSwitcher, power::NO_SWITCH);
auto* camSwitcher =
new CamSwitcher(objects::CAM_SWITCHER, pwrSwitcher, pcdu::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);

2
fsfw

@ -1 +1 @@
Subproject commit 9a8d775eb1a8788ad844215bf2a42d9f707767c0
Subproject commit 8382d61b9206c0259439eeddcad3759f1cd9bd2f