From 3d74f2b437ee202cd9c5d41ec4b0c583c5ec7f54 Mon Sep 17 00:00:00 2001
From: Bertrand Songis <bsongis@gmail.com>
Date: Sun, 4 Oct 2015 18:48:46 +0200
Subject: [PATCH] Horus drivers fixes

---
 radio/src/targets/Horus/board_horus.h    | 8 ++++----
 radio/src/targets/Horus/keys_driver.cpp  | 5 ++---
 radio/src/targets/Horus/stm32f4_flash.ld | 4 ++--
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/radio/src/targets/Horus/board_horus.h b/radio/src/targets/Horus/board_horus.h
index 150b4a22f..7fe8a0ce7 100644
--- a/radio/src/targets/Horus/board_horus.h
+++ b/radio/src/targets/Horus/board_horus.h
@@ -203,10 +203,10 @@ 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 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))
 void checkRotaryEncoder(void);
 
 // WDT driver
diff --git a/radio/src/targets/Horus/keys_driver.cpp b/radio/src/targets/Horus/keys_driver.cpp
index 1c426f648..141238c4e 100644
--- a/radio/src/targets/Horus/keys_driver.cpp
+++ b/radio/src/targets/Horus/keys_driver.cpp
@@ -143,16 +143,15 @@ void readKeysAndTrims()
   if (scrollRE) {
     rePreviousValue = reNewValue;
     if (scrollRE < 0) {
-      putEvent(EVT_KEY_FIRST(KEY_MINUS));
+      putEvent(EVT_ROTARY_LEFT);
     }
     else {
-      putEvent(EVT_KEY_FIRST(KEY_PLUS)); 
+      putEvent(EVT_ROTARY_RIGHT);
     }
   }
 
   in = readTrims();
   for (i = 1; i < 4096; i <<= 1) {
-	if (in & i) TRACE("trim %d", enuk);
     keys[enuk++].input(in & i);
   }
 }
diff --git a/radio/src/targets/Horus/stm32f4_flash.ld b/radio/src/targets/Horus/stm32f4_flash.ld
index 15da897a1..2a7a3b134 100644
--- a/radio/src/targets/Horus/stm32f4_flash.ld
+++ b/radio/src/targets/Horus/stm32f4_flash.ld
@@ -33,8 +33,8 @@ _main_stack_start = _estack - _Main_Stack_Size;
 /* Specify the memory areas */
 MEMORY
 {
-  FLASH (rx)      : ORIGIN = 0x08000000, LENGTH = 512K
-  RAM (xrw)       : ORIGIN = 0x20000000, LENGTH = 128K
+  FLASH (rx)      : ORIGIN = 0x08000000, LENGTH = 2048K
+  RAM (xrw)       : ORIGIN = 0x20000000, LENGTH = 256K
   CCM (xrw)       : ORIGIN = 0x10000000, LENGTH = 64K
   MEMORY_B1 (rx)  : ORIGIN = 0x60000000, LENGTH = 0K
   SDRAM(xrw)      : ORIGIN = 0xD0000000, LENGTH = 8192K