merge develop and apply afmt
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
This commit is contained in:
parent
c21dae1afc
commit
e95d25db66
@ -4,9 +4,7 @@
|
|||||||
|
|
||||||
TcsSubsystem::TcsSubsystem(object_id_t objectId, object_id_t parentId, PowerSwitchIF* pwrSwitcher,
|
TcsSubsystem::TcsSubsystem(object_id_t objectId, object_id_t parentId, PowerSwitchIF* pwrSwitcher,
|
||||||
power::Switch_t theSwitch, TcsBoardHelper helper)
|
power::Switch_t theSwitch, TcsBoardHelper helper)
|
||||||
: AssemblyBase(objectId, parentId, 24),
|
: AssemblyBase(objectId, parentId, 24), switcher(pwrSwitcher, theSwitch), helper(helper) {}
|
||||||
switcher(pwrSwitcher, theSwitch),
|
|
||||||
helper(helper) {}
|
|
||||||
|
|
||||||
void TcsSubsystem::performChildOperation() {
|
void TcsSubsystem::performChildOperation() {
|
||||||
switcher.doStateMachine();
|
switcher.doStateMachine();
|
||||||
|
@ -19,6 +19,7 @@ class TcsSubsystem : public AssemblyBase {
|
|||||||
ReturnValue_t initialize() override;
|
ReturnValue_t initialize() override;
|
||||||
|
|
||||||
void performChildOperation() override;
|
void performChildOperation() override;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
static constexpr uint8_t NUMBER_RTDS = 16;
|
static constexpr uint8_t NUMBER_RTDS = 16;
|
||||||
PowerSwitcher switcher;
|
PowerSwitcher switcher;
|
||||||
|
2
tmtc
2
tmtc
@ -1 +1 @@
|
|||||||
Subproject commit c2bdb2326b14fd05e6360e05c3820bd44d75a9cc
|
Subproject commit 46c327101e24d61452ddb1cd3dd09cab87674abb
|
Loading…
x
Reference in New Issue
Block a user