piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

fix(radio): 2POS switch connected to 3POS socket may not behave as expected (#6067)

Browse Source
This commit is contained in:
philmoz
2025-04-11 12:57:31 +10:00
committed by GitHub
parent 31fe413190
commit 071a6ba805
2 changed files with 21 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/switches.cpp
+14 -7
View File
@@ -727,15 +727,22 @@ bool getSwitch(swsrc_t swtch, uint8_t flags)
} else
#endif
{
if (flags & GETSWITCH_MIDPOS_DELAY) {
result = SWITCH_POSITION(cs_idx);
} else {
div_t qr = div(cs_idx, 3);
if (SWITCH_EXISTS(qr.quot)) {
result = switchState(cs_idx);
div_t qr = div(cs_idx, 3);
if (SWITCH_EXISTS(qr.quot)) {
auto sw_cfg = (SwitchConfig)SWITCH_CONFIG(qr.quot);
if (flags & GETSWITCH_MIDPOS_DELAY) {
result = SWITCH_POSITION(cs_idx);
// Handle 2POS switch installed in 3POS slot
if (!result && qr.rem == SWITCH_HW_DOWN && (sw_cfg == SWITCH_2POS || sw_cfg == SWITCH_TOGGLE))
result = SWITCH_POSITION(cs_idx - 1);
} else {
result = false;
result = switchState(cs_idx);
// Handle 2POS switch installed in 3POS slot
if (!result && qr.rem == SWITCH_HW_DOWN && (sw_cfg == SWITCH_2POS || sw_cfg == SWITCH_TOGGLE))
result = switchState(cs_idx - 1);
}
} else {
result = false;
}
}
}
radio/src/tests/mixer.cpp
+7 -4
View File
@@ -810,11 +810,14 @@ TEST_F(MixerTest, DelayOnSwitch)
evalFlightModeMixes(e_perout_mode_normal, 1);
EXPECT_EQ(chans[0], CHANNEL_MAX);
simuSetSwitch(switch_index, 0);
CHECK_DELAY(0, 500);
auto sw_cfg = (SwitchConfig)SWITCH_CONFIG(switch_index);
if (sw_cfg == SWITCH_3POS) {
simuSetSwitch(switch_index, 0);
CHECK_DELAY(0, 500);
evalFlightModeMixes(e_perout_mode_normal, 1);
EXPECT_EQ(chans[0], 0);
evalFlightModeMixes(e_perout_mode_normal, 1);
EXPECT_EQ(chans[0], 0);
}
}
TEST_F(MixerTest, DelayOnSwitch2)