From b32bc913851ad53c3baa9fa9feb95476744fbc78 Mon Sep 17 00:00:00 2001
From: Bertrand Songis <bsongis@gmail.com>
Date: Fri, 12 Jun 2015 13:41:45 +0200
Subject: [PATCH] Compilation fixes

---
 radio/src/targets/mega2560/board_mega2560.cpp | 18 +++++++++---------
 radio/src/targets/mega2560/board_mega2560.h   |  4 ++--
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/radio/src/targets/mega2560/board_mega2560.cpp b/radio/src/targets/mega2560/board_mega2560.cpp
index 584c6b714..30026111f 100644
--- a/radio/src/targets/mega2560/board_mega2560.cpp
+++ b/radio/src/targets/mega2560/board_mega2560.cpp
@@ -162,15 +162,15 @@ bool switchState(EnumKeys enuk)
 }
 
 // Trim switches
-static const pm_uchar crossTrim[] PROGMEM ={
-    1<<INP_F_TRM_LH_DWN,
-    1<<INP_F_TRM_LH_UP,
-    1<<INP_F_TRM_LV_DWN,
-    1<<INP_F_TRM_LV_UP,
-    1<<INP_F_TRM_RV_DWN,
-    1<<INP_F_TRM_RV_UP,
-    1<<INP_F_TRM_RH_DWN,
-    1<<INP_F_TRM_RH_UP
+static const pm_uchar crossTrim[] PROGMEM = {
+  TRIMS_GPIO_PIN_LHL,
+  TRIMS_GPIO_PIN_LHR,
+  TRIMS_GPIO_PIN_LVD,
+  TRIMS_GPIO_PIN_LVU,
+  TRIMS_GPIO_PIN_RVD,
+  TRIMS_GPIO_PIN_RVU,
+  TRIMS_GPIO_PIN_RHL,
+  TRIMS_GPIO_PIN_RHR
 };
      
 uint8_t trimDown(uint8_t idx)
diff --git a/radio/src/targets/mega2560/board_mega2560.h b/radio/src/targets/mega2560/board_mega2560.h
index 50d560d13..c996ade9e 100644
--- a/radio/src/targets/mega2560/board_mega2560.h
+++ b/radio/src/targets/mega2560/board_mega2560.h
@@ -149,9 +149,9 @@ 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 + (1<<INP_L_KEY_DWN))) == (KEYS_GPIO_PIN_UP + (1<<INP_L_KEY_DWN)))
+#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 + (1<<INP_L_KEY_DWN))) == (KEYS_GPIO_PIN_LEFT + (1<<INP_L_KEY_DWN)))
+#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();