From 16cd0cffe0c94dd5cb78f32e6d8009315b477456 Mon Sep 17 00:00:00 2001
From: Bertrand Songis <bsongis@gmail.com>
Date: Wed, 3 Apr 2019 10:32:19 +0200
Subject: [PATCH] Mix sources shifted

---
 radio/src/gui/128x64/lcd.cpp    | 5 -----
 radio/src/translations.cpp      | 1 -
 radio/src/translations.h        | 4 +---
 radio/src/translations/en.h.txt | 8 +++++++-
 4 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/radio/src/gui/128x64/lcd.cpp b/radio/src/gui/128x64/lcd.cpp
index f7d43bc07..100d59334 100644
--- a/radio/src/gui/128x64/lcd.cpp
+++ b/radio/src/gui/128x64/lcd.cpp
@@ -723,11 +723,6 @@ void drawSource(coord_t x, coord_t y, uint32_t idx, LcdFlags att)
       lcdDrawTextAtIndex(x, y, STR_VSRCRAW, idx + 1, att);
     }
   }
-#if defined(GYRO)
-  else if (idx <= MIXSRC_GYRO2) {
-    lcdDrawTextAtIndex(x, y, STR_GYROS, idx - MIXSRC_GYRO1, att);
-  }
-#endif
   else if (idx >= MIXSRC_FIRST_SWITCH && idx <= MIXSRC_LAST_SWITCH) {
     idx = idx-MIXSRC_FIRST_SWITCH;
     if (ZEXIST(g_eeGeneral.switchNames[idx])) {
diff --git a/radio/src/translations.cpp b/radio/src/translations.cpp
index 0905138fd..7dc5add48 100644
--- a/radio/src/translations.cpp
+++ b/radio/src/translations.cpp
@@ -112,7 +112,6 @@ const char STR_OPEN9X[]  =
     ISTR(BLUETOOTH_MODES)
 #endif
     ISTR(VANTENNATYPES)
-    ISTR(GYROS)
     ;
 
 // The 0-terminated-strings
diff --git a/radio/src/translations.h b/radio/src/translations.h
index 3515069c6..e214f5300 100644
--- a/radio/src/translations.h
+++ b/radio/src/translations.h
@@ -213,8 +213,7 @@ extern const char STR_OPEN9X[];
 #else
   #define OFS_VANTENNATYPES     (OFS_VCELLINDEX + sizeof(TR_VCELLINDEX))
 #endif
-  #define OFS_GYROS             (OFS_VANTENNATYPES + sizeof(TR_VANTENNATYPES))
-  #define OFS_MAVLINK_BAUDS     (OFS_GYROS + sizeof(TR_GYROS))
+  #define OFS_MAVLINK_BAUDS     (OFS_VANTENNATYPES + sizeof(TR_VANTENNATYPES))
   #define OFS_SPARE		(OFS_MAVLINK_BAUDS)
 
 #define STR_OFFON               (STR_OPEN9X + OFS_OFFON)
@@ -314,7 +313,6 @@ extern const char STR_OPEN9X[];
   #define STR_VPREC             (STR_OPEN9X + OFS_VPREC)
   #define STR_VCELLINDEX        (STR_OPEN9X + OFS_VCELLINDEX)
   #define STR_VANTENNATYPES     (STR_OPEN9X + OFS_VANTENNATYPES)
-  #define STR_GYROS             (STR_OPEN9X + OFS_GYROS)
 
 #if defined(BLUETOOTH)
   extern const char STR_BLUETOOTH[];
diff --git a/radio/src/translations/en.h.txt b/radio/src/translations/en.h.txt
index a902dc99f..2a500c869 100644
--- a/radio/src/translations/en.h.txt
+++ b/radio/src/translations/en.h.txt
@@ -468,6 +468,12 @@
   #define TR_VSWITCHES                 "---" TR_9X_3POS_SWITCHES TR_2POS_SWITCHES TR_TRIMS_SWITCHES TR_ROTENC_SWITCHES TR_LOGICALSW TR_ON_ONE_SWITCHES
 #endif
 
+#if defined(GYRO)
+  #define TR_GYR_VSRCRAW               "GyrX""GyrY"
+#else
+  #define TR_GYR_VSRCRAW
+#endif
+
 #if defined(HELI)
   #define TR_CYC_VSRCRAW               "CYC1""CYC2""CYC3"
 #else
@@ -477,7 +483,7 @@
   #define TR_RESERVE_VSRCRAW           "[--]"
   #define TR_EXTRA_VSRCRAW             "Batt""Time""GPS\0" TR_RESERVE_VSRCRAW TR_RESERVE_VSRCRAW TR_RESERVE_VSRCRAW TR_RESERVE_VSRCRAW "Tmr1""Tmr2""Tmr3"
 
-#define TR_VSRCRAW                     "---\0" TR_STICKS_VSRCRAW TR_POTS_VSRCRAW TR_ROTARY_ENCODERS "MAX\0" TR_CYC_VSRCRAW TR_TRIMS_VSRCRAW TR_SW_VSRCRAW TR_EXTRA_VSRCRAW
+#define TR_VSRCRAW                     "---\0" TR_STICKS_VSRCRAW TR_POTS_VSRCRAW TR_ROTARY_ENCODERS TR_GYR_VSRCRAW "MAX\0" TR_CYC_VSRCRAW TR_TRIMS_VSRCRAW TR_SW_VSRCRAW TR_EXTRA_VSRCRAW
 
 #define LEN_VTMRMODES                  "\003"
 #define TR_VTMRMODES                   "OFF""ON\0""THs""TH%""THt"