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

Makefile option renamed (EXTRA_ROTARY_ENCODERS)

Browse source 
Fixed a bug with option EXTRA_ROTARY_ENCODERS: mixes shifted after REb
30 models when open9x / gruvin9x board
LIMITS min and max range fixed
This commit is contained in:
bsongis 2012-04-15 22:34:39 +00:00
parent d5b386d5db
commit abd4de973b
18 changed files with 200 additions and 137 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/main_views.cpp
View file

@ -163,7 +163,7 @@ void menuMainView(uint8_t event)
killEvents(KEY_DOWN);
break;
#ifdef NAVIGATION_RE1
case EVT_KEY_LONG(BTN_RE1):
case EVT_KEY_LONG(BTN_REa):
killEvents(event);
if (s_inflight_value && !s_warning) {
s_warning = s_inflight_label;
@ -171,7 +171,7 @@ void menuMainView(uint8_t event)
break;
}
// no break
case EVT_KEY_BREAK(BTN_RE1):
case EVT_KEY_BREAK(BTN_REa):
s_warning = NULL;
break;
#endif
@ -289,10 +289,10 @@ void menuMainView(uint8_t event)
for (uint8_t i=0; i<8; i++) {
int16_t val = g_chans512[8+i];
int8_t len = limit((int16_t)0, (int16_t)(((val+1024) * BAR_HEIGHT) / 2048), (int16_t)BAR_HEIGHT);
#if defined(PCBV4) && defined(MOD_EXTRA_ROTARY_ENCODERS)
#if defined(PCBV4) && defined(EXTRA_ROTARY_ENCODERS)
#define V_BAR_W 4
V_BAR(SCREEN_WIDTH/2-V_BAR_W*1+1+V_BAR_W*i, SCREEN_HEIGHT-8, len)
#elif defined(PCBV4) //MOD_EXTRA_ROTARY_ENCODERS
#elif defined(PCBV4) //EXTRA_ROTARY_ENCODERS
#define V_BAR_W 5
V_BAR(SCREEN_WIDTH/2-V_BAR_W*3+5+V_BAR_W*i, SCREEN_HEIGHT-8, len)
#else
@ -304,11 +304,11 @@ void menuMainView(uint8_t event)
for (uint8_t i=0; i<NUM_ROTARY_ENCODERS; i++) {
int16_t val = getRotaryEncoder(i);
int8_t len = limit((int16_t)0, (int16_t)(((val+1024) * BAR_HEIGHT) / 2048), (int16_t)BAR_HEIGHT);
#if defined(MOD_EXTRA_ROTARY_ENCODERS)
#if defined(EXTRA_ROTARY_ENCODERS)
V_BAR(SCREEN_WIDTH/2-V_BAR_W*7+1+V_BAR_W*i, SCREEN_HEIGHT-8, len)
#else //MOD_EXTRA_ROTARY_ENCODERS
#else //EXTRA_ROTARY_ENCODERS
V_BAR(SCREEN_WIDTH/2-V_BAR_W*6+5+V_BAR_W*i, SCREEN_HEIGHT-8, len)
#endif //MOD_EXTRA_ROTARY_ENCODERS
#endif //EXTRA_ROTARY_ENCODERS
}
#endif //PCBV4
for (uint8_t i=0; i<12; i++) {