From 5ec4dd499c1e9de86d2982913dbf9dbf4ad4c8b6 Mon Sep 17 00:00:00 2001 From: bsongis Date: Fri, 20 Feb 2015 19:41:05 +0100 Subject: [PATCH] Rotary encoder now running in the right directions --- radio/src/gui/Taranis/menus.h | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/radio/src/gui/Taranis/menus.h b/radio/src/gui/Taranis/menus.h index 68a3005ec..5201e5de9 100755 --- a/radio/src/gui/Taranis/menus.h +++ b/radio/src/gui/Taranis/menus.h @@ -355,17 +355,22 @@ void menuChannelsView(uint8_t event); #define KEY_MOVE_UP KEY_PLUS #define KEY_MOVE_DOWN KEY_MINUS + #if defined(REV9E) - #define CURSOR_MOVED_LEFT(event) (EVT_KEY_MASK(event) == KEY_MINUS) - #define CURSOR_MOVED_RIGHT(event) (EVT_KEY_MASK(event) == KEY_PLUS) + #define CURSOR_MOVED_LEFT(event) (EVT_KEY_MASK(event) == KEY_MINUS) + #define CURSOR_MOVED_RIGHT(event) (EVT_KEY_MASK(event) == KEY_PLUS) + #define CASE_EVT_ROTARY_MOVE_RIGHT CASE_EVT_ROTARY_RIGHT + #define CASE_EVT_ROTARY_MOVE_LEFT CASE_EVT_ROTARY_LEFT + #define IS_ROTARY_MOVE_RIGHT IS_ROTARY_RIGHT + #define IS_ROTARY_MOVE_LEFT IS_ROTARY_LEFT #else - #define CURSOR_MOVED_LEFT(event) (EVT_KEY_MASK(event) == KEY_PLUS) - #define CURSOR_MOVED_RIGHT(event) (EVT_KEY_MASK(event) == KEY_MINUS) + #define CURSOR_MOVED_LEFT(event) (EVT_KEY_MASK(event) == KEY_PLUS) + #define CURSOR_MOVED_RIGHT(event) (EVT_KEY_MASK(event) == KEY_MINUS) + #define CASE_EVT_ROTARY_MOVE_RIGHT CASE_EVT_ROTARY_LEFT + #define CASE_EVT_ROTARY_MOVE_LEFT CASE_EVT_ROTARY_RIGHT + #define IS_ROTARY_MOVE_RIGHT IS_ROTARY_LEFT + #define IS_ROTARY_MOVE_LEFT IS_ROTARY_RIGHT #endif -#define CASE_EVT_ROTARY_MOVE_RIGHT CASE_EVT_ROTARY_LEFT -#define CASE_EVT_ROTARY_MOVE_LEFT CASE_EVT_ROTARY_RIGHT -#define IS_ROTARY_MOVE_RIGHT IS_ROTARY_LEFT -#define IS_ROTARY_MOVE_LEFT IS_ROTARY_RIGHT #define REPEAT_LAST_CURSOR_MOVE() { if (CURSOR_MOVED_LEFT(event) || CURSOR_MOVED_RIGHT(event)) putEvent(event); else m_posHorz = 0; } #define MOVE_CURSOR_FROM_HERE() if (m_posHorz > 0) REPEAT_LAST_CURSOR_MOVE()