400bytes flash saved in GeneralMenus + ModelMenus

On V4.1 board both Rotary Encoder may be used for navigation
TX/RX RSSI set to 0 when no telemetry received since too long
This commit is contained in:
bsongis
2012-04-20 17:03:16 +00:00
parent f33c110340
commit 9bc18d1888
17 changed files with 569 additions and 483 deletions
+12 -8
View File
@@ -140,7 +140,7 @@ void menuMainView(uint8_t event)
if(s_timerState[0]==TMR_BEEPING) {
s_timerState[0] = TMR_STOPPED;
}
#ifdef NAVIGATION_RE1
#if defined(ROTARY_ENCODERS)
else if (s_warning) {
s_warning = NULL;
}
@@ -162,16 +162,20 @@ void menuMainView(uint8_t event)
killEvents(KEY_UP);
killEvents(KEY_DOWN);
break;
#ifdef NAVIGATION_RE1
#if defined(ROTARY_ENCODERS)
case EVT_KEY_LONG(BTN_REa):
killEvents(event);
if (s_inflight_value && !s_warning) {
s_warning = s_inflight_label;
s_editMode = 1;
break;
case EVT_KEY_LONG(BTN_REb):
if (navigationRotaryEncoder(event)) {
killEvents(event);
if (s_inflight_value && !s_warning) {
s_warning = s_inflight_label;
s_editMode = 1;
break;
}
}
// no break
case EVT_KEY_BREAK(BTN_REa):
case EVT_KEY_BREAK(BTN_REb):
s_warning = NULL;
break;
#endif
@@ -323,7 +327,7 @@ void menuMainView(uint8_t event)
// lcd_outdezNAtt(33+11*FW, FH*6, s_timerVal_10ms[1], LEADING0, 2); // 1/100s
}
#ifdef NAVIGATION_RE1
#if defined(ROTARY_ENCODERS)
check_rotary_encoder();
if (s_warning) {
int8_t value = (((uint8_t)(*s_inflight_value)) >> s_inflight_bitshift) - s_inflight_shift;