From 1a308b0a53b817b9974df8c1abeb520f0199d18c Mon Sep 17 00:00:00 2001
From: Bertrand Songis <bsongis@gmail.com>
Date: Wed, 23 Dec 2015 18:59:16 +0100
Subject: [PATCH] Horus board tested OK

---
 radio/src/Makefile                      | 5 +++--
 radio/src/targets/horus/board_horus.h   | 3 ++-
 radio/src/targets/horus/keys_driver.cpp | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/radio/src/Makefile b/radio/src/Makefile
index 49fab6ca5..c7c32b003 100644
--- a/radio/src/Makefile
+++ b/radio/src/Makefile
@@ -831,7 +831,8 @@ ifeq ($(PCB), $(filter $(PCB), SKY9X 9XRPRO AR9X))
   PULSESSRC = pulses/pulses_arm.cpp pulses/ppm_arm.cpp pulses/pxx_arm.cpp pulses/dsm2_arm.cpp
   CPPSRC += tasks_arm.cpp audio_arm.cpp haptic.cpp gui/$(GUIDIRECTORY)/view_about.cpp gui/$(GUIDIRECTORY)/view_text.cpp telemetry/telemetry.cpp
   CPPSRC += targets/sky9x/telemetry_driver.cpp targets/sky9x/serial2_driver.cpp targets/sky9x/pwr_driver.cpp targets/sky9x/adc_driver.cpp targets/sky9x/eeprom_driver.cpp targets/sky9x/pulses_driver.cpp targets/sky9x/keys_driver.cpp targets/sky9x/audio_driver.cpp targets/sky9x/buzzer_driver.cpp targets/sky9x/haptic_driver.cpp targets/sky9x/sdcard_driver.cpp targets/sky9x/massstorage.cpp
-  CPPSRC += loadboot.cpp debug.cpp
+  CPPSRC += debug.cpp
+  EXTRABOARDSRC += loadboot.cpp
   BITMAPS += bitmaps/9x/splash.lbm bitmaps/9x/asterisk.lbm bitmaps/9x/about.lbm
   ifeq ($(SDCARD), YES)
     CPPDEFS += -DSDCARD -DVOICE
@@ -964,7 +965,7 @@ ifeq ($(PCB), TARANIS)
   CPPSRC += tasks_arm.cpp audio_arm.cpp sbus.cpp telemetry/telemetry.cpp
   CPPSRC += targets/taranis/pulses_driver.cpp targets/taranis/keys_driver.cpp targets/taranis/adc_driver.cpp targets/taranis/trainer_driver.cpp targets/taranis/audio_driver.cpp targets/taranis/serial2_driver.cpp targets/taranis/telemetry_driver.cpp
   CPPSRC += bmp.cpp gui/$(GUIDIRECTORY)/view_channels.cpp gui/$(GUIDIRECTORY)/view_about.cpp gui/$(GUIDIRECTORY)/view_text.cpp debug.cpp
-  CPPSRC += loadboot.cpp
+  EXTRABOARDSRC += loadboot.cpp
   ifeq ($(PCBREV), REV9E)
     CPPSRC += targets/taranis/top_lcd_driver.cpp
     SRC += targets/taranis/system_stm32f4xx.c
diff --git a/radio/src/targets/horus/board_horus.h b/radio/src/targets/horus/board_horus.h
index b5071d582..5dee90b35 100644
--- a/radio/src/targets/horus/board_horus.h
+++ b/radio/src/targets/horus/board_horus.h
@@ -204,6 +204,7 @@ uint32_t readTrims(void);
 #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))
+extern int32_t rotencValue;
 void checkRotaryEncoder(void);
 
 // WDT driver
@@ -235,7 +236,7 @@ enum Analogs {
   MOUSE2,
   NUMBER_ANALOG
 };
-
+extern uint16_t adcValues[NUMBER_ANALOG];
 void adcInit(void);
 void adcRead(void);
 uint16_t getAnalogValue(uint32_t value);
diff --git a/radio/src/targets/horus/keys_driver.cpp b/radio/src/targets/horus/keys_driver.cpp
index 692cd9a61..b00d9fb48 100644
--- a/radio/src/targets/horus/keys_driver.cpp
+++ b/radio/src/targets/horus/keys_driver.cpp
@@ -105,7 +105,7 @@ uint8_t keyDown()
   return readKeys();
 }
 
-rotenc_t rotencValue;
+int32_t rotencValue;
 void checkRotaryEncoder()
 {
   static uint32_t Rotary_position;