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

fix(tpro): function switches auto-switch & position matching (#2505)

Browse Source 
* fix(tpro): auto-switch for function switches

Fixes #1488

* fix(tpro): matching function switch UP position
This commit is contained in:
Raphael Coeffic
2022-10-12 12:52:00 +10:00
committed by GitHub
parent d349c281c3
commit e7969e737d
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/switches.cpp
+5 -5
View File
@@ -578,9 +578,9 @@ bool getSwitch(swsrc_t swtch, uint8_t flags)
}
#if defined(FUNCTION_SWITCHES)
else if (cs_idx <= SWSRC_LAST_SWITCH) {
div_t qr = div(cs_idx - 3 * NUM_FUNCTIONS_SWITCHES, 3);
auto value = getFSLogicalState(qr.quot + 1);
result = qr.rem == -2 ? 1 - value : value;
div_t qr = div(cs_idx - SWSRC_FIRST_FUNCTION_SWITCH, 3);
auto value = getFSLogicalState(qr.quot);
result = qr.rem == 0 ? !value : (qr.rem == 2 ? value : false);
}
#endif
#if NUM_XPOTS > 0
@@ -668,8 +668,8 @@ swsrc_t getMovedSwitch()
auto prev = (uint8_t )(bfSingleBitGet(fsswitches_states, i) >> (i));
uint8_t next = getFSLogicalState(i);
if (prev != next) {
switches_states ^= (-next ^ switches_states) & (1 << i);
result = 2 + (3 * (i + NUM_REGULAR_SWITCHES)) + next;
fsswitches_states = (fsswitches_states & ~(1 << i)) | (next << i);
result = SWSRC_FIRST_FUNCTION_SWITCH + i*3 + (next ? 2 : 0);
}
}
}