eive/eive-obsw
eive/eive-obsw
13
4
Fork 0
Code Issues 4 Pull Requests 1 Releases 121 Wiki Activity

remove shadowed member variables #396

Merged
muellerr merged 4 commits from bugfix_shadowed_variables_dual_assys into develop 2023-02-23 15:53:30 +01:00
Conversation 0 Commits 4 Files Changed 3 +1 -5
3 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 9f83a49690 - Show all commits

2
fsfw

@ -1 +1 @@
Subproject commit 2efff4d2c5ef82b5b62567ab1bb0ee53aeed6a5a
Subproject commit bd208038dd85a94dce8c763397ad5ac7eae76402

2
mission/system/objects/AcsBoardAssembly.h
View File

@ -108,8 +108,6 @@ class AcsBoardAssembly : public DualLaneAssemblyBase {
static constexpr pcdu::Switches SWITCH_A = pcdu::Switches::PDU1_CH7_ACS_A_SIDE_3V3;
static constexpr pcdu::Switches SWITCH_B = pcdu::Switches::PDU2_CH7_ACS_BOARD_SIDE_B_3V3;
bool tryingOtherSide = false;
bool dualModeErrorSwitch = true;
AcsBoardHelper helper;
GpioIF* gpioIF = nullptr;

2
mission/system/objects/SusAssembly.h
View File

@ -50,8 +50,6 @@ class SusAssembly : public DualLaneAssemblyBase {
SusAssHelper helper;
PowerSwitchIF* pwrSwitcher = nullptr;
bool tryingOtherSide = false;
bool dualModeErrorSwitch = true;
ReturnValue_t initialize() override;
// AssemblyBase overrides