Mirror/opentx
1
0
Fork 0
mirror of https://github.com/opentx/opentx.git synced 2025-07-26 01:35:21 +03:00
Code Issues Wiki Activity

Merge branch 'bsongis/Issue660' into next

Browse source 
Conflicts:
	companion/src/firmwares/opentx/opentxinterface.cpp
This commit is contained in:
Andre Bernet 2014-05-02 14:44:24 +02:00
commit 1a43b6d353
15 changed files with 458 additions and 337 deletions
Download patch file Download diff file Expand all files Collapse all files

9
radio/src/opentx.cpp
View file

@ -2827,8 +2827,13 @@ uint16_t anaIn(uint8_t chan)
return *p;
#else
static const pm_char crossAna[] PROGMEM = {3,1,2,0,4,5,6,7};
volatile uint16_t *p = &s_anaFilt[pgm_read_byte(crossAna+chan)];
return *p;
uint16_t temp = s_anaFilt[pgm_read_byte(crossAna+chan)];
#if defined(FRSKY_STICKS)
if (chan < NUM_STICKS && (g_eeGeneral.stickReverse & (1 << chan))) {
temp = 2048 - temp;
}
#endif
return temp;
#endif
}