From cd6aa7af00bccd4b85df0ba70c2c4062b4c1eb2f Mon Sep 17 00:00:00 2001
From: Bertrand Songis <bsongis@gmail.com>
Date: Mon, 26 Oct 2020 16:13:24 +0100
Subject: [PATCH] Update to latest libopenui

---
 radio/src/opentx_helpers.h     |  5 ++++-
 radio/src/thirdparty/libopenui |  2 +-
 radio/src/translations.cpp     |  6 ++----
 radio/src/translations.h       | 28 ++++++++++++----------------
 4 files changed, 19 insertions(+), 22 deletions(-)

diff --git a/radio/src/opentx_helpers.h b/radio/src/opentx_helpers.h
index 6dc545028..32aebe6e8 100644
--- a/radio/src/opentx_helpers.h
+++ b/radio/src/opentx_helpers.h
@@ -22,13 +22,16 @@
 #define _OPENTX_HELPERS_H_
 
 #include <string.h>
-#include "thirdparty/libopenui/src/libopenui_helpers.h"
 
+#if defined(COLORLCD)
+#include "thirdparty/libopenui/src/libopenui_helpers.h"
+#else
 template<class T>
 inline T sgn(T a)
 {
   return a > 0 ? 1 : (a < 0 ? -1 : 0);
 }
+#endif
 
 template<class T>
 inline void SWAP(T & a, T & b)
diff --git a/radio/src/thirdparty/libopenui b/radio/src/thirdparty/libopenui
index 9e24ec470..6c31676e1 160000
--- a/radio/src/thirdparty/libopenui
+++ b/radio/src/thirdparty/libopenui
@@ -1 +1 @@
-Subproject commit 9e24ec470546fb5c2af3994ea071fb1c345adf33
+Subproject commit 6c31676e1b9a729cda00e9a772eeac3f81603ff3
diff --git a/radio/src/translations.cpp b/radio/src/translations.cpp
index 6a906838b..7debfdf99 100644
--- a/radio/src/translations.cpp
+++ b/radio/src/translations.cpp
@@ -858,13 +858,12 @@ const char STR_AFHDS3_ONE_TO_MANY[] = TR_AFHDS3_ONE_TO_MANY;
 const char STR_SUBTYPE[] = TR_SUBTYPE;
 #endif
 
-#if defined(SDCARD)
 const char STR_BACKUP_MODEL[] = TR_BACKUP_MODEL;
 const char STR_RESTORE_MODEL[] = TR_RESTORE_MODEL;
 const char STR_DELETE_ERROR[] = TR_DELETE_ERROR;
 const char STR_SDCARD_ERROR[] = TR_SDCARD_ERROR;
-const char STR_SDCARD[]  = TR_SDCARD;
-const char STR_NO_FILES_ON_SD[]  = TR_NO_FILES_ON_SD;
+#define STR_SDCARD TR_SDCARD
+#define STR_NO_FILES_ON_SD TR_NO_FILES_ON_SD
 const char STR_NO_SDCARD[] = TR_NO_SDCARD;
 const char STR_SDCARD_FULL[] = TR_SDCARD_FULL;
 const char STR_INCOMPATIBLE[] = TR_INCOMPATIBLE;
@@ -872,7 +871,6 @@ const char STR_LOGS_PATH[] = LOGS_PATH;
 const char STR_LOGS_EXT[] = LOGS_EXT;
 const char STR_MODELS_PATH[] = MODELS_PATH;
 const char STR_MODELS_EXT[] = MODELS_EXT;
-#endif
 
 const char STR_TEST_WARNING[] = TR_TEST_WARNING;
 const char STR_TEST_NOTSAFE[] = TR_TEST_NOTSAFE;
diff --git a/radio/src/translations.h b/radio/src/translations.h
index 499c92598..c3f18ebcb 100644
--- a/radio/src/translations.h
+++ b/radio/src/translations.h
@@ -557,22 +557,18 @@ extern const char STR_WAITING_FOR_RX[];
 extern const char STR_WAITING_FOR_TX[];
 extern const char STR_WARN_5VOLTS[];
 
-#if defined(SDCARD)
-  extern const char STR_BACKUP_MODEL[];
-  extern const char STR_RESTORE_MODEL[];
-  extern const char STR_DELETE_ERROR[];
-  extern const char STR_SDCARD_ERROR[];
-extern const char STR_SDCARD[];
-extern const char STR_NO_FILES_ON_SD[];
-  extern const char STR_NO_SDCARD[];
-  extern const char STR_SDCARD_FULL[];
-  extern const char STR_INCOMPATIBLE[];
-  extern const char STR_LOGS_PATH[];
-  extern const char STR_LOGS_EXT[];
-  extern const char STR_MODELS_PATH[];
-  extern const char STR_MODELS_EXT[];
-  #define STR_UPDATE_LIST STR_DELAYDOWN
-#endif
+extern const char STR_BACKUP_MODEL[];
+extern const char STR_RESTORE_MODEL[];
+extern const char STR_DELETE_ERROR[];
+extern const char STR_SDCARD_ERROR[];
+extern const char STR_NO_SDCARD[];
+extern const char STR_SDCARD_FULL[];
+extern const char STR_INCOMPATIBLE[];
+extern const char STR_LOGS_PATH[];
+extern const char STR_LOGS_EXT[];
+extern const char STR_MODELS_PATH[];
+extern const char STR_MODELS_EXT[];
+#define STR_UPDATE_LIST STR_DELAYDOWN
 
 extern const char STR_NEEDS_FILE[];
 extern const char STR_EXT_MULTI_SPEC[];