From cbe244fc6c436541ecdbe5531f3c31540949d1a1 Mon Sep 17 00:00:00 2001
From: Bertrand Songis <bsongis@gmail.com>
Date: Thu, 26 Nov 2015 19:35:07 +0100
Subject: [PATCH] Fixes Horus compilation

---
 radio/src/gui/Horus/menu_model_limits.cpp | 2 +-
 radio/src/gui/Horus/menu_model_setup.cpp  | 4 ++--
 radio/src/gui/Horus/navigation.cpp        | 2 +-
 radio/src/gui/Horus/popups.cpp            | 4 ++--
 radio/util/commit-tests.sh                | 5 +++++
 5 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/radio/src/gui/Horus/menu_model_limits.cpp b/radio/src/gui/Horus/menu_model_limits.cpp
index d679b0f1e..d7bd919b3 100644
--- a/radio/src/gui/Horus/menu_model_limits.cpp
+++ b/radio/src/gui/Horus/menu_model_limits.cpp
@@ -155,7 +155,7 @@ bool menuModelLimits(evt_t event)
       // last line available - add the "copy trim menu" line
       uint8_t attr = (sub==NUM_CHNOUT) ? INVERS : 0;
       // TODO CENTER attribute
-      lcdDrawText(100, y, STR_TRIMS2OFFSETS, s_noHi ? 0 : attr);
+      lcdDrawText(100, y, STR_TRIMS2OFFSETS, noHighlightCounter ? 0 : attr);
       if (attr) {
         s_editMode = 0;
         if (event==EVT_KEY_LONG(KEY_ENTER)) {
diff --git a/radio/src/gui/Horus/menu_model_setup.cpp b/radio/src/gui/Horus/menu_model_setup.cpp
index 5270507c3..33bf5fb41 100644
--- a/radio/src/gui/Horus/menu_model_setup.cpp
+++ b/radio/src/gui/Horus/menu_model_setup.cpp
@@ -323,7 +323,7 @@ bool menuModelSetup(evt_t event)
       case ITEM_MODEL_EXTENDED_TRIMS:
         lcdDrawText(MENUS_MARGIN_LEFT, y, STR_ETRIMS);
         g_model.extendedTrims = onoffMenuItem(g_model.extendedTrims, MODEL_SETUP_2ND_COLUMN, y, menuHorizontalPosition<=0 ? attr : 0, event==EVT_KEY_BREAK(KEY_ENTER) ? event : 0);
-        lcdDrawText(MODEL_SETUP_2ND_COLUMN+18, y, STR_RESET_BTN, menuHorizontalPosition>0  && !s_noHi ? attr : 0);
+        lcdDrawText(MODEL_SETUP_2ND_COLUMN+18, y, STR_RESET_BTN, menuHorizontalPosition>0  && !noHighlightCounter ? attr : 0);
         if (attr && menuHorizontalPosition>0) {
           s_editMode = 0;
           if (event==EVT_KEY_LONG(KEY_ENTER)) {
@@ -746,7 +746,7 @@ bool menuModelFailsafe(evt_t event)
 
       // Value
       LcdFlags flags = TINSIZE;
-      if (menuVerticalPosition == ch && !s_noHi) {
+      if (menuVerticalPosition == ch && !noHighlightCounter) {
         flags |= INVERS;
         if (s_editMode)
           flags |= BLINK;
diff --git a/radio/src/gui/Horus/navigation.cpp b/radio/src/gui/Horus/navigation.cpp
index 726b6b283..2a48f5b6d 100644
--- a/radio/src/gui/Horus/navigation.cpp
+++ b/radio/src/gui/Horus/navigation.cpp
@@ -40,7 +40,7 @@ vertpos_t menuVerticalOffset;
 vertpos_t menuVerticalPosition;
 horzpos_t menuHorizontalPosition;
 int8_t s_editMode;
-uint8_t s_noHi;
+uint8_t noHighlightCounter;
 uint8_t calibrationState; // TODO rename this variable
 
 #if defined(AUTOSWITCH)
diff --git a/radio/src/gui/Horus/popups.cpp b/radio/src/gui/Horus/popups.cpp
index f6b18576a..22cb2429a 100644
--- a/radio/src/gui/Horus/popups.cpp
+++ b/radio/src/gui/Horus/popups.cpp
@@ -100,7 +100,7 @@ void message(const pm_char *title, const pm_char *t, const char *last MESSAGE_SO
   clearKeyEvents();
 }
 
-void displayPopup(const char *title)
+void displayPopup(const char * title)
 {
   // displayMessageBox();
   lcdDrawSizedText(WARNING_LINE_X, WARNING_LINE_Y, title, WARNING_LINE_LEN, DBLSIZE|WARNING_COLOR);
@@ -138,7 +138,7 @@ void displayWarning(evt_t event)
   }
 }
 
-const char * displayMenu(evt_t event)
+const char * displayPopupMenu(evt_t event)
 {
   const char * result = NULL;
   uint8_t display_count = min(popupMenuNoItems, (uint16_t)POPUP_MENU_MAX_LINES);
diff --git a/radio/util/commit-tests.sh b/radio/util/commit-tests.sh
index 081f19942..b98cc3784 100755
--- a/radio/util/commit-tests.sh
+++ b/radio/util/commit-tests.sh
@@ -57,3 +57,8 @@ make PCB=MEGA2560
 # OpenTX on MEGA2560 with MAVLINK
 make clean
 make PCB=MEGA2560 EXT=MAVLINK
+
+# OpenTX on Horus
+make clean
+make        PCB=HORUS HELI=NO USB=SERIAL CLI=YES DEBUG=YES
+make simu   PCB=HORUS HELI=NO USB=SERIAL CLI=YES DEBUG=YES