From 7b81f6f9717ab8457528afbdc3b2515ee1c47ff7 Mon Sep 17 00:00:00 2001
From: Kilrah <kilrah@andrebernet.ch>
Date: Mon, 20 Apr 2020 13:29:30 +0200
Subject: [PATCH] More init fixes

---
 radio/src/targets/horus/hal.h           |  4 ++--
 radio/src/targets/horus/keys_driver.cpp | 23 +++++++++++++++++++++++
 2 files changed, 25 insertions(+), 2 deletions(-)
 mode change 100644 => 100755 radio/src/targets/horus/keys_driver.cpp

diff --git a/radio/src/targets/horus/hal.h b/radio/src/targets/horus/hal.h
index 9e4da20b8..b87f401fd 100644
--- a/radio/src/targets/horus/hal.h
+++ b/radio/src/targets/horus/hal.h
@@ -243,8 +243,8 @@
   #define KEYS_GPIOG_PINS               (SWITCHES_GPIO_PIN_D_L | SWITCHES_GPIO_PIN_G_H | SWITCHES_GPIO_PIN_G_L | SWITCHES_GPIO_PIN_H | TRIMS_GPIO_PIN_LVD)
 #if defined(RADIO_TX16S)
   #define KEYS_GPIOA_PINS               (GPIO_Pin_6)
-  #define KEYS_GPIOC_PINS               (GPIO_Pin_4)
-  #define KEYS_GPIOH_PINS               (GPIO_Pin_2  |  GPIO_Pin_3 | GPIO_Pin_4 | GPIO_Pin_9 | GPIO_Pin_10 | GPIO_Pin_11 | GPIO_Pin_12 | GPIO_Pin_14 | GPIO_Pin_15)
+  #define KEYS_GPIOC_PINS               (GPIO_Pin_4 | GPIO_Pin_13)
+  #define KEYS_GPIOH_PINS               (GPIO_Pin_2 | GPIO_Pin_3 | GPIO_Pin_4 | GPIO_Pin_9 | GPIO_Pin_10 | GPIO_Pin_11 | GPIO_Pin_12 | GPIO_Pin_14 | GPIO_Pin_15)
 #else
   #define KEYS_GPIOH_PINS               (GPIO_Pin_3 | GPIO_Pin_4 | GPIO_Pin_9 | GPIO_Pin_10 | GPIO_Pin_11 | GPIO_Pin_12 | GPIO_Pin_14 | GPIO_Pin_15)
 #endif
diff --git a/radio/src/targets/horus/keys_driver.cpp b/radio/src/targets/horus/keys_driver.cpp
old mode 100644
new mode 100755
index 0b02a6a03..7433ee58f
--- a/radio/src/targets/horus/keys_driver.cpp
+++ b/radio/src/targets/horus/keys_driver.cpp
@@ -204,16 +204,39 @@ void keysInit()
   GPIO_InitStructure.GPIO_PuPd = GPIO_PuPd_UP;
   GPIO_InitStructure.GPIO_Mode = GPIO_Mode_IN;
 
+#if defined(KEYS_GPIOA_PINS)
+  INIT_KEYS_PINS(GPIOA);
+#endif
+
+#if defined(KEYS_GPIOB_PINS)
   INIT_KEYS_PINS(GPIOB);
+#endif
 
 #if defined(KEYS_GPIOC_PINS)
   INIT_KEYS_PINS(GPIOC);
 #endif
 
+#if defined(KEYS_GPIOD_PINS)
   INIT_KEYS_PINS(GPIOD);
+#endif
+
+#if defined(KEYS_GPIOE_PINS)
   INIT_KEYS_PINS(GPIOE);
+#endif
+
+#if defined(KEYS_GPIOG_PINS)
   INIT_KEYS_PINS(GPIOG);
+#endif
+
+#if defined(KEYS_GPIOH_PINS)
   INIT_KEYS_PINS(GPIOH);
+#endif
+
+#if defined(KEYS_GPIOI_PINS)
   INIT_KEYS_PINS(GPIOI);
+#endif
+
+#if defined(KEYS_GPIOJ_PINS)
   INIT_KEYS_PINS(GPIOJ);
+#endif
 }