From c4ed923ae15ae152ae74a441e23d23fc21268fed Mon Sep 17 00:00:00 2001
From: bsongis <bsongis@gmail.com>
Date: Tue, 3 Mar 2015 23:43:19 +0100
Subject: [PATCH] Rotary encoder was going the wrong direction in contextual
 menus

---
 radio/src/gui/Taranis/menus.h             | 7 ++++---
 radio/src/keys.h                          | 9 +++++++--
 radio/src/targets/taranis/board_taranis.h | 4 ++--
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/radio/src/gui/Taranis/menus.h b/radio/src/gui/Taranis/menus.h
index 5201e5de9..96ae98e49 100755
--- a/radio/src/gui/Taranis/menus.h
+++ b/radio/src/gui/Taranis/menus.h
@@ -353,10 +353,9 @@ void menuChannelsView(uint8_t event);
 
 #define LABEL(...) (uint8_t)-1
 
-#define KEY_MOVE_UP    KEY_PLUS
-#define KEY_MOVE_DOWN  KEY_MINUS
-
 #if defined(REV9E)
+  #define KEY_MOVE_UP                KEY_MINUS
+  #define KEY_MOVE_DOWN              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
@@ -364,6 +363,8 @@ void menuChannelsView(uint8_t event);
   #define IS_ROTARY_MOVE_RIGHT       IS_ROTARY_RIGHT
   #define IS_ROTARY_MOVE_LEFT        IS_ROTARY_LEFT
 #else
+  #define KEY_MOVE_UP                KEY_PLUS
+  #define KEY_MOVE_DOWN              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
diff --git a/radio/src/keys.h b/radio/src/keys.h
index 59bd20bf3..2948b943f 100644
--- a/radio/src/keys.h
+++ b/radio/src/keys.h
@@ -201,8 +201,13 @@ enum EnumKeys {
   #define IS_ROTARY_EVENT(evt)  (0)
   #define CASE_EVT_ROTARY_BREAK /*case EVT_KEY_BREAK(KEY_ENTER):*/
   #define CASE_EVT_ROTARY_LONG  /*case EVT_KEY_LONG(KEY_ENTER):*/
-  #define CASE_EVT_ROTARY_LEFT  case EVT_KEY_FIRST(KEY_MOVE_DOWN): case EVT_KEY_REPT(KEY_MOVE_DOWN):
-  #define CASE_EVT_ROTARY_RIGHT case EVT_KEY_FIRST(KEY_MOVE_UP): case EVT_KEY_REPT(KEY_MOVE_UP):
+  #if defined(REV9E)
+    #define CASE_EVT_ROTARY_LEFT  case EVT_KEY_FIRST(KEY_MOVE_UP): case EVT_KEY_REPT(KEY_MOVE_UP):
+    #define CASE_EVT_ROTARY_RIGHT case EVT_KEY_FIRST(KEY_MOVE_DOWN): case EVT_KEY_REPT(KEY_MOVE_DOWN):
+  #else
+    #define CASE_EVT_ROTARY_LEFT  case EVT_KEY_FIRST(KEY_MOVE_DOWN): case EVT_KEY_REPT(KEY_MOVE_DOWN):
+    #define CASE_EVT_ROTARY_RIGHT case EVT_KEY_FIRST(KEY_MOVE_UP): case EVT_KEY_REPT(KEY_MOVE_UP):
+  #endif
 #elif defined(ROTARY_ENCODER_NAVIGATION)
   #define IS_ROTARY_LEFT(evt)   (evt == EVT_ROTARY_LEFT)
   #define IS_ROTARY_RIGHT(evt)  (evt == EVT_ROTARY_RIGHT)
diff --git a/radio/src/targets/taranis/board_taranis.h b/radio/src/targets/taranis/board_taranis.h
index 405302026..2b7d53d62 100644
--- a/radio/src/targets/taranis/board_taranis.h
+++ b/radio/src/targets/taranis/board_taranis.h
@@ -142,8 +142,8 @@ void delay_01us(uint16_t nb);
 
 // SD driver
 #if !defined(SIMU) || defined(SIMU_DISKIO)
-  uint32_t sdIsHC();
-  uint32_t sdGetSpeed();
+  uint32_t sdIsHC(void);
+  uint32_t sdGetSpeed(void);
   #define SD_IS_HC()              (sdIsHC())
   #define SD_GET_SPEED()          (sdGetSpeed())
   #define SD_GET_FREE_BLOCKNR()   (sdGetFreeSectors())