Mirror/opentx
1
0
Fork 0
mirror of https://github.com/opentx/opentx.git synced 2025-07-19 14:25:11 +03:00
Code Issues Wiki Activity

[Taranis] Trainer inputs were not working in mixers

Browse source
This commit is contained in:
bsongis 2015-03-30 21:37:30 +02:00
parent 459837d6f3
commit fe71712b18
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
radio/src/mixer.cpp
View file

@ -653,7 +653,7 @@ void evalFlightModeMixes(uint8_t mode, uint8_t tick10ms)
if (md->srcRaw == 0) break; if (md->srcRaw == 0) break;
uint8_t stickIndex = md->srcRaw - MIXSRC_Rud; mixsrc_t stickIndex = md->srcRaw - MIXSRC_Rud;
if (!(dirtyChannels & ((bitfield_channels_t)1 << md->destCh))) continue; if (!(dirtyChannels & ((bitfield_channels_t)1 << md->destCh))) continue;
@ -709,10 +709,10 @@ void evalFlightModeMixes(uint8_t mode, uint8_t tick10ms)
else else
#endif #endif
{ {
int8_t srcRaw = MIXSRC_Rud + stickIndex; mixsrc_t srcRaw = MIXSRC_Rud + stickIndex;
v = getValue(srcRaw); v = getValue(srcRaw);
srcRaw -= MIXSRC_CH1; srcRaw -= MIXSRC_CH1;
if (srcRaw>=0 && srcRaw<=MIXSRC_LAST_CH-MIXSRC_CH1 && md->destCh != srcRaw) { if (srcRaw<=MIXSRC_LAST_CH-MIXSRC_CH1 && md->destCh != srcRaw) {
if (dirtyChannels & ((bitfield_channels_t)1 << srcRaw) & (passDirtyChannels|~(((bitfield_channels_t) 1 << md->destCh)-1))) if (dirtyChannels & ((bitfield_channels_t)1 << srcRaw) & (passDirtyChannels|~(((bitfield_channels_t) 1 << md->destCh)-1)))
passDirtyChannels |= (bitfield_channels_t) 1 << md->destCh; passDirtyChannels |= (bitfield_channels_t) 1 << md->destCh;
if (srcRaw < md->destCh || pass > 0) if (srcRaw < md->destCh || pass > 0)