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
+7 -7
View File
@@ -79,14 +79,14 @@ void menuProcFunctionSwitches(uint8_t event);
void menuProcStatistic(uint8_t event);
void menuProcDebug(uint8_t event);
#if defined(NAVIGATION_RE1)
#if defined(ROTARY_ENCODERS)
extern int8_t scrollRE;
extern int16_t p1valdiff;
#define IS_RE1_EVT_TYPE(event, type) (event==type(BTN_REa))
#define IS_RE1_EVT(event) ((event&0x0f)==BTN_REa)
#define IS_RE_NAVIGATION_EVT_TYPE(event, type) (g_eeGeneral.reNavigation && event==type(BTN_REa + g_eeGeneral.reNavigation - 1))
#define IS_RE_NAVIGATION_EVT(event) (g_eeGeneral.reNavigation && (event&EVT_KEY_MASK)==(BTN_REa + g_eeGeneral.reNavigation - 1))
#else
#define IS_RE1_EVT_TYPE(event, type) (0)
#define IS_RE1_EVT(event) (0)
#define IS_RE_NAVIGATION_EVT_TYPE(event, type) (0)
#define IS_RE_NAVIGATION_EVT(event) (0)
#if defined(NAVIGATION_POT1)
extern int16_t p1valdiff;
#else
@@ -111,7 +111,7 @@ int8_t checkIncDecGen(uint8_t event, int8_t i_val, int8_t i_min, int8_t i_max);
#define CHECK_INCDEC_GENVAR( event, var, min, max) \
var = checkIncDecGen(event,var,min,max)
#ifdef NAVIGATION_RE1
#if defined(ROTARY_ENCODERS)
extern int8_t *s_inflight_value;
extern const pm_char *s_inflight_label;
extern int8_t s_inflight_min;
@@ -136,7 +136,7 @@ void check_rotary_encoder();
#endif
// Menus related stuff ...
#ifdef NAVIGATION_RE1
#if defined(ROTARY_ENCODERS)
extern int8_t m_posVert;
#else
extern uint8_t m_posVert;