From 2953346b6b75d7bbdb02472dd9041a86e9304adb Mon Sep 17 00:00:00 2001
From: Bertrand Songis <bsongis@gmail.com>
Date: Fri, 12 Jun 2015 14:17:06 +0200
Subject: [PATCH] Refactoring

---
 radio/src/gui/9X/navigation.cpp             | 5 +++++
 radio/src/gui/Taranis/navigation.cpp        | 5 +++++
 radio/src/targets/gruvin9x/board_gruvin9x.h | 4 ----
 radio/src/targets/mega2560/board_mega2560.h | 4 ----
 radio/src/targets/sky9x/board_sky9x.h       | 8 ++------
 radio/src/targets/stock/board_stock.h       | 8 ++------
 radio/src/targets/taranis/board_taranis.h   | 8 ++------
 7 files changed, 16 insertions(+), 26 deletions(-)

diff --git a/radio/src/gui/9X/navigation.cpp b/radio/src/gui/9X/navigation.cpp
index 73a5c337c..bdd543e56 100755
--- a/radio/src/gui/9X/navigation.cpp
+++ b/radio/src/gui/9X/navigation.cpp
@@ -69,6 +69,11 @@ int8_t checkIncDecMovedSwitch(int8_t val)
 
 int8_t  checkIncDec_Ret;
 
+#define DBLKEYS_PRESSED_RGT_LFT(in) ((in & (KEYS_GPIO_PIN_RIGHT + KEYS_GPIO_PIN_LEFT)) == (KEYS_GPIO_PIN_RIGHT + KEYS_GPIO_PIN_LEFT))
+#define DBLKEYS_PRESSED_UP_DWN(in)  ((in & (KEYS_GPIO_PIN_UP + KEYS_GPIO_PIN_DOWN)) == (KEYS_GPIO_PIN_UP + KEYS_GPIO_PIN_DOWN))
+#define DBLKEYS_PRESSED_RGT_UP(in)  ((in & (KEYS_GPIO_PIN_RIGHT + KEYS_GPIO_PIN_UP))  == (KEYS_GPIO_PIN_RIGHT + KEYS_GPIO_PIN_UP))
+#define DBLKEYS_PRESSED_LFT_DWN(in) ((in & (KEYS_GPIO_PIN_LEFT + KEYS_GPIO_PIN_DOWN)) == (KEYS_GPIO_PIN_LEFT + KEYS_GPIO_PIN_DOWN))
+
 #if defined(CPUARM)
 INIT_STOPS(stops100, 3, -100, 0, 100)
 INIT_STOPS(stops1000, 3, -1000, 0, 1000)
diff --git a/radio/src/gui/Taranis/navigation.cpp b/radio/src/gui/Taranis/navigation.cpp
index 725a92cc8..5b6b3ef17 100755
--- a/radio/src/gui/Taranis/navigation.cpp
+++ b/radio/src/gui/Taranis/navigation.cpp
@@ -109,6 +109,11 @@ void onLongEnterPress(const char *result)
   }  
 }
 
+#define DBLKEYS_PRESSED_RGT_LFT(in) ((in & ((2<<KEY_PLUS) + (2<<KEY_MINUS))) == ((2<<KEY_PLUS) + (2<<KEY_MINUS)))
+#define DBLKEYS_PRESSED_UP_DWN(in)  ((in & ((2<<KEY_MENU) + (2<<KEY_PAGE))) == ((2<<KEY_MENU) + (2<<KEY_PAGE)))
+#define DBLKEYS_PRESSED_RGT_UP(in)  ((in & ((2<<KEY_ENTER) + (2<<KEY_MINUS))) == ((2<<KEY_ENTER) + (2<<KEY_MINUS)))
+#define DBLKEYS_PRESSED_LFT_DWN(in) ((in & ((2<<KEY_PAGE) + (2<<KEY_EXIT))) == ((2<<KEY_PAGE) + (2<<KEY_EXIT)))
+
 int checkIncDec(unsigned int event, int val, int i_min, int i_max, unsigned int i_flags, IsValueAvailable isValueAvailable, const CheckIncDecStops &stops)
 {
   int newval = val;
diff --git a/radio/src/targets/gruvin9x/board_gruvin9x.h b/radio/src/targets/gruvin9x/board_gruvin9x.h
index cc7ae81dd..1b94273de 100644
--- a/radio/src/targets/gruvin9x/board_gruvin9x.h
+++ b/radio/src/targets/gruvin9x/board_gruvin9x.h
@@ -146,10 +146,6 @@ void sdPoll10ms();
 // Keys driver
 #define TRIMS_PRESSED()            (~PINJ)
 #define KEYS_PRESSED()             (~PINL) // used only for DBLKEYS code.
-#define DBLKEYS_PRESSED_RGT_LFT(i) ((in & (KEYS_GPIO_PIN_RIGHT + KEYS_GPIO_PIN_LEFT)) == (KEYS_GPIO_PIN_RIGHT + KEYS_GPIO_PIN_LEFT))
-#define DBLKEYS_PRESSED_UP_DWN(i)  ((in & (KEYS_GPIO_PIN_UP + KEYS_GPIO_PIN_DOWN)) == (KEYS_GPIO_PIN_UP + KEYS_GPIO_PIN_DOWN))
-#define DBLKEYS_PRESSED_RGT_UP(i)  ((in & (KEYS_GPIO_PIN_RIGHT + KEYS_GPIO_PIN_UP))  == (KEYS_GPIO_PIN_RIGHT + KEYS_GPIO_PIN_UP))
-#define DBLKEYS_PRESSED_LFT_DWN(i) ((in & (KEYS_GPIO_PIN_LEFT + KEYS_GPIO_PIN_DOWN)) == (KEYS_GPIO_PIN_LEFT + KEYS_GPIO_PIN_DOWN))
 
 // LCD driver
 #define PORTA_LCD_DAT              PORTA
diff --git a/radio/src/targets/mega2560/board_mega2560.h b/radio/src/targets/mega2560/board_mega2560.h
index c996ade9e..d8df6481a 100644
--- a/radio/src/targets/mega2560/board_mega2560.h
+++ b/radio/src/targets/mega2560/board_mega2560.h
@@ -148,10 +148,6 @@ void sdPoll10ms(void);
 
 // DBLKeys driver                         
 #define KEYS_PRESSED()             (~PINL)
-#define DBLKEYS_PRESSED_RGT_LFT(i) ((in & (KEYS_GPIO_PIN_RIGHT + KEYS_GPIO_PIN_LEFT)) == (KEYS_GPIO_PIN_RIGHT + KEYS_GPIO_PIN_LEFT))
-#define DBLKEYS_PRESSED_UP_DWN(i)  ((in & (KEYS_GPIO_PIN_UP + KEYS_GPIO_PIN_DOWN)) == (KEYS_GPIO_PIN_UP + KEYS_GPIO_PIN_DOWN))
-#define DBLKEYS_PRESSED_RGT_UP(i)  ((in & (KEYS_GPIO_PIN_RIGHT + KEYS_GPIO_PIN_UP))  == (KEYS_GPIO_PIN_RIGHT + KEYS_GPIO_PIN_UP))
-#define DBLKEYS_PRESSED_LFT_DWN(i) ((in & (KEYS_GPIO_PIN_LEFT + KEYS_GPIO_PIN_DOWN)) == (KEYS_GPIO_PIN_LEFT + KEYS_GPIO_PIN_DOWN))
 
 // Power driver
 uint8_t pwrCheck();
diff --git a/radio/src/targets/sky9x/board_sky9x.h b/radio/src/targets/sky9x/board_sky9x.h
index 69bf102d0..434160dbf 100644
--- a/radio/src/targets/sky9x/board_sky9x.h
+++ b/radio/src/targets/sky9x/board_sky9x.h
@@ -186,12 +186,8 @@ void writeFlash(uint32_t * address, uint32_t * buffer);
 // Keys driver
 extern uint32_t readKeys();
 extern uint32_t readTrims();
-#define TRIMS_PRESSED() (readTrims())
-#define KEYS_PRESSED()  (readKeys())
-#define DBLKEYS_PRESSED_RGT_LFT(i) ((in & (0x20 + 0x40)) == (0x20 + 0x40))
-#define DBLKEYS_PRESSED_UP_DWN(i)  ((in & (0x10 + 0x08)) == (0x10 + 0x08))
-#define DBLKEYS_PRESSED_RGT_UP(i)  ((in & (0x20 + 0x10)) == (0x20 + 0x10))
-#define DBLKEYS_PRESSED_LFT_DWN(i) ((in & (0x40 + 0x08)) == (0x40 + 0x08))
+#define TRIMS_PRESSED()            (readTrims())
+#define KEYS_PRESSED()             (readKeys())
 
 // Pulses driver
 void init_no_pulses(uint32_t port);
diff --git a/radio/src/targets/stock/board_stock.h b/radio/src/targets/stock/board_stock.h
index 7362c7eb4..b0845cedb 100644
--- a/radio/src/targets/stock/board_stock.h
+++ b/radio/src/targets/stock/board_stock.h
@@ -213,15 +213,11 @@ void processMultiplexAna();
 #endif
 
 #if defined(TELEMETRY_MOD_14051_SWAPPED)
-#define TRIMS_PRESSED() (~PIND & ~0x0c || pf7_digital[PF7_TRM_LV_UP] || pf7_digital[PF7_TRM_LV_DWN])
+  #define TRIMS_PRESSED()          (~PIND & ~0x0c || pf7_digital[PF7_TRM_LV_UP] || pf7_digital[PF7_TRM_LV_DWN])
 #else
-#define TRIMS_PRESSED()            (~PIND)
+  #define TRIMS_PRESSED()          (~PIND)
 #endif
 #define KEYS_PRESSED()             (~PINB)
-#define DBLKEYS_PRESSED_RGT_LFT(i) ((in & (KEYS_GPIO_PIN_RIGHT + KEYS_GPIO_PIN_LEFT)) == (KEYS_GPIO_PIN_RIGHT + KEYS_GPIO_PIN_LEFT))
-#define DBLKEYS_PRESSED_UP_DWN(i)  ((in & (KEYS_GPIO_PIN_UP  + KEYS_GPIO_PIN_DOWN)) == (KEYS_GPIO_PIN_UP  + KEYS_GPIO_PIN_DOWN))
-#define DBLKEYS_PRESSED_RGT_UP(i)  ((in & (KEYS_GPIO_PIN_RIGHT + KEYS_GPIO_PIN_UP))  == (KEYS_GPIO_PIN_RIGHT + KEYS_GPIO_PIN_UP))
-#define DBLKEYS_PRESSED_LFT_DWN(i) ((in & (KEYS_GPIO_PIN_LEFT + KEYS_GPIO_PIN_DOWN)) == (KEYS_GPIO_PIN_LEFT + KEYS_GPIO_PIN_DOWN))
 
 // LCD driver
 #define PORTA_LCD_DAT              PORTA
diff --git a/radio/src/targets/taranis/board_taranis.h b/radio/src/targets/taranis/board_taranis.h
index f90cb653c..583ed3236 100644
--- a/radio/src/targets/taranis/board_taranis.h
+++ b/radio/src/targets/taranis/board_taranis.h
@@ -220,12 +220,8 @@ void set_trainer_ppm_parameters(uint32_t idleTime, uint32_t delay, uint32_t posi
 void keysInit(void);
 uint32_t readKeys(void);
 uint32_t readTrims(void);
-#define TRIMS_PRESSED() (readTrims())
-#define KEYS_PRESSED()  (readKeys())
-#define DBLKEYS_PRESSED_RGT_LFT(i) ((in & ((2<<KEY_PLUS) + (2<<KEY_MINUS))) == ((2<<KEY_PLUS) + (2<<KEY_MINUS)))
-#define DBLKEYS_PRESSED_UP_DWN(i)  ((in & ((2<<KEY_MENU) + (2<<KEY_PAGE))) == ((2<<KEY_MENU) + (2<<KEY_PAGE)))
-#define DBLKEYS_PRESSED_RGT_UP(i)  ((in & ((2<<KEY_ENTER) + (2<<KEY_MINUS))) == ((2<<KEY_ENTER) + (2<<KEY_MINUS)))
-#define DBLKEYS_PRESSED_LFT_DWN(i) ((in & ((2<<KEY_PAGE) + (2<<KEY_EXIT))) == ((2<<KEY_PAGE) + (2<<KEY_EXIT)))
+#define TRIMS_PRESSED()            (readTrims())
+#define KEYS_PRESSED()             (readKeys())
 
 #if defined(REV9E)
 // Rotary Encoder driver