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

[9x stock] Issue #542 - 8 bytes here

Browse Source
This commit is contained in:
Bertrand Songis
2014-01-23 15:00:09 +01:00
parent c1453cc6cb
commit f6ba7e26b7
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/opentx.cpp
+7 -6
View File
@@ -3411,7 +3411,6 @@ void perOut(uint8_t mode, uint8_t tick10ms)
if (md->srcRaw == 0) break;
uint8_t stickIndex = md->srcRaw - MIXSRC_Rud;
#define MIX_SRCRAW (stickIndex + MIXSRC_Rud)
if (!(dirtyChannels & ((bitfield_channels_t)1 << md->destCh))) continue;
@@ -3442,12 +3441,14 @@ void perOut(uint8_t mode, uint8_t tick10ms)
else
#endif
{
v = getValue(MIX_SRCRAW);
if (MIX_SRCRAW>=MIXSRC_CH1 && MIX_SRCRAW<=MIXSRC_LAST_CH && md->destCh != MIX_SRCRAW-MIXSRC_CH1) {
if (dirtyChannels & ((bitfield_channels_t)1 << (MIX_SRCRAW-MIXSRC_CH1)) & (passDirtyChannels|~(((bitfield_channels_t) 1 << md->destCh)-1)))
int8_t srcRaw = MIXSRC_Rud + stickIndex;
v = getValue(srcRaw);
srcRaw -= MIXSRC_CH1;
if (srcRaw>=0 && srcRaw<=MIXSRC_LAST_CH-MIXSRC_CH1 && md->destCh != srcRaw) {
if (dirtyChannels & ((bitfield_channels_t)1 << srcRaw) & (passDirtyChannels|~(((bitfield_channels_t) 1 << md->destCh)-1)))
passDirtyChannels |= (bitfield_channels_t) 1 << md->destCh;
if (MIX_SRCRAW-MIXSRC_CH1 < md->destCh || pass > 0)
v = chans[MIX_SRCRAW-MIXSRC_CH1] >> 8;
if (srcRaw < md->destCh || pass > 0)
v = chans[srcRaw] >> 8;
}
}
if (!mixCondition) {