[ersky9x] rotary encoders inversion

RE1 and RE2 renamed as REa and REb (will be needed for Flight Phases uses)
This commit is contained in:
bsongis
2012-07-11 13:21:03 +00:00
parent d1425e77a9
commit 95170b5930
18 changed files with 80 additions and 72 deletions
+17 -17
View File
@@ -269,13 +269,13 @@ void menuProcModelSelect(uint8_t event)
}
break;
#if defined(ROTARY_ENCODERS)
case EVT_KEY_BREAK(BTN_RE1):
case EVT_KEY_BREAK(BTN_RE2):
case EVT_KEY_BREAK(BTN_REa):
case EVT_KEY_BREAK(BTN_REb):
if (navigationRotaryEncoder(_event))
s_editMode = (s_editMode == 0 && sub == g_eeGeneral.currModel) ? -1 : 0;
break;
case EVT_KEY_LONG(BTN_RE1):
case EVT_KEY_LONG(BTN_RE2):
case EVT_KEY_LONG(BTN_REa):
case EVT_KEY_LONG(BTN_REb):
if (!navigationRotaryEncoder(_event))
break;
#endif
@@ -518,13 +518,13 @@ void EditName(uint8_t x, uint8_t y, char *name, uint8_t size, uint8_t event, boo
if (next<size-1) next++;
break;
#if defined(ROTARY_ENCODERS)
case EVT_KEY_LONG(BTN_RE1):
case EVT_KEY_LONG(BTN_RE2):
case EVT_KEY_LONG(BTN_REa):
case EVT_KEY_LONG(BTN_REb):
if (!navigationRotaryEncoder(event))
break;
if (v==0) {
s_editMode = 0;
killEvents(BTN_RE1);
killEvents(BTN_REa);
break;
}
// no break
@@ -914,8 +914,8 @@ void menuProcPhasesAll(uint8_t event)
switch (event) {
#if defined(ROTARY_ENCODERS)
case EVT_KEY_BREAK(BTN_RE1):
case EVT_KEY_BREAK(BTN_RE2):
case EVT_KEY_BREAK(BTN_REa):
case EVT_KEY_BREAK(BTN_REb):
if (!navigationRotaryEncoder(event))
break;
// no break
@@ -1120,8 +1120,8 @@ void menuProcCurveOne(uint8_t event)
#endif
break;
#if defined(ROTARY_ENCODERS)
case EVT_KEY_BREAK(BTN_RE1):
case EVT_KEY_BREAK(BTN_RE2):
case EVT_KEY_BREAK(BTN_REa):
case EVT_KEY_BREAK(BTN_REb):
if (!navigationRotaryEncoder(event))
break;
#endif
@@ -1714,10 +1714,10 @@ void menuProcExpoMix(uint8_t expo, uint8_t _event_)
}
// no break
#if defined(ROTARY_ENCODERS)
case EVT_KEY_BREAK(BTN_RE1):
case EVT_KEY_BREAK(BTN_RE2):
case EVT_KEY_LONG(BTN_RE1):
case EVT_KEY_LONG(BTN_RE2):
case EVT_KEY_BREAK(BTN_REa):
case EVT_KEY_BREAK(BTN_REb):
case EVT_KEY_LONG(BTN_REa):
case EVT_KEY_LONG(BTN_REb):
if (sub == 0)
break;
#endif
@@ -2099,8 +2099,8 @@ void menuProcCurvesAll(uint8_t event)
switch (event) {
#if defined(ROTARY_ENCODERS)
case EVT_KEY_BREAK(BTN_RE1):
case EVT_KEY_BREAK(BTN_RE2):
case EVT_KEY_BREAK(BTN_REa):
case EVT_KEY_BREAK(BTN_REb):
if (!navigationRotaryEncoder(event))
break;
#endif