From 9f83a4969084e483030da420476fca391be73e1b Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Thu, 23 Feb 2023 11:46:30 +0100 Subject: [PATCH 1/2] remove shadowed member variables --- fsfw | 2 +- mission/system/objects/AcsBoardAssembly.h | 2 -- mission/system/objects/SusAssembly.h | 2 -- 3 files changed, 1 insertion(+), 5 deletions(-) diff --git a/fsfw b/fsfw index 2efff4d2..bd208038 160000 --- a/fsfw +++ b/fsfw @@ -1 +1 @@ -Subproject commit 2efff4d2c5ef82b5b62567ab1bb0ee53aeed6a5a +Subproject commit bd208038dd85a94dce8c763397ad5ac7eae76402 diff --git a/mission/system/objects/AcsBoardAssembly.h b/mission/system/objects/AcsBoardAssembly.h index 1fe3336d..0c25396f 100644 --- a/mission/system/objects/AcsBoardAssembly.h +++ b/mission/system/objects/AcsBoardAssembly.h @@ -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; diff --git a/mission/system/objects/SusAssembly.h b/mission/system/objects/SusAssembly.h index 673e91f5..e95803df 100644 --- a/mission/system/objects/SusAssembly.h +++ b/mission/system/objects/SusAssembly.h @@ -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 From ba9268aae6facfe45256c00702ba4d29cc763e78 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Thu, 23 Feb 2023 11:49:13 +0100 Subject: [PATCH 2/2] changelog --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3a29477a..7433bb7c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -39,6 +39,8 @@ will consitute of a breaking change warranting a new major release: - Usage of floats as iterators and using them to calculate a uint8_t index in `SusConverter` - Removed unused variables in the `AcsController` +- Remove shadowing variables inside ACS assembly classes. + PR: https://egit.irs.uni-stuttgart.de/eive/eive-obsw/issues/385 # [v1.30.0]