From 553ac3b9f57907b97dc6244cf6b15c45e10d185a Mon Sep 17 00:00:00 2001
From: bsongis <bsongis@gmail.com>
Date: Thu, 20 Mar 2014 18:13:29 +0100
Subject: [PATCH] BeepAnaCenter was shifted since S3 introduction

---
 radio/src/eeprom_conversions.cpp | 5 +++++
 radio/src/gui/menu_model.cpp     | 3 ++-
 radio/src/translations/cz.h.txt  | 2 +-
 radio/src/translations/de.h.txt  | 2 +-
 radio/src/translations/en.h.txt  | 2 +-
 radio/src/translations/es.h.txt  | 2 +-
 radio/src/translations/fi.h.txt  | 2 +-
 radio/src/translations/fr.h.txt  | 2 +-
 radio/src/translations/it.h.txt  | 2 +-
 radio/src/translations/pl.h.txt  | 2 +-
 radio/src/translations/pt.h.txt  | 2 +-
 radio/src/translations/se.h.txt  | 2 +-
 12 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/radio/src/eeprom_conversions.cpp b/radio/src/eeprom_conversions.cpp
index b94351391..49b17acd4 100644
--- a/radio/src/eeprom_conversions.cpp
+++ b/radio/src/eeprom_conversions.cpp
@@ -427,7 +427,12 @@ void ConvertModel_215_to_216(ModelData &model)
   g_model.extendedLimits = oldModel.extendedLimits;
   g_model.extendedTrims = oldModel.extendedTrims;
   g_model.throttleReversed = oldModel.throttleReversed;
+
+#if defined(PCBTARANIS)
+  g_model.beepANACenter = (oldModel.beepANACenter & 0x3f) | ((oldModel.beepANACenter & 0xc0) << 1);
+#else
   g_model.beepANACenter = oldModel.beepANACenter;
+#endif
 
   for (uint8_t i=0; i<64; i++) {
     MixData & mix = g_model.mixData[i];
diff --git a/radio/src/gui/menu_model.cpp b/radio/src/gui/menu_model.cpp
index 05839b40f..254840d97 100644
--- a/radio/src/gui/menu_model.cpp
+++ b/radio/src/gui/menu_model.cpp
@@ -1285,8 +1285,9 @@ void menuModelSetup(uint8_t event)
 
       case ITEM_MODEL_BEEP_CENTER:
         lcd_putsLeft(y, STR_BEEPCTR);
-        for (uint8_t i=0; i<NUM_STICKS+NUM_POTS+NUM_ROTARY_ENCODERS; i++)
+        for (uint8_t i=0; i<NUM_STICKS+NUM_POTS+NUM_ROTARY_ENCODERS; i++) {
           lcd_putsiAtt(MODEL_SETUP_2ND_COLUMN+i*FW, y, STR_RETA123, i, ((m_posHorz==i) && attr) ? BLINK|INVERS : (((g_model.beepANACenter & ((BeepANACenter)1<<i)) || (attr && m_posHorz<0)) ? INVERS : 0 ) );
+        }
         if (attr && CURSOR_ON_CELL) {
           if (event==EVT_KEY_BREAK(KEY_ENTER) || p1valdiff) {
             if (READ_ONLY_UNLOCKED()) {
diff --git a/radio/src/translations/cz.h.txt b/radio/src/translations/cz.h.txt
index 15c7b99f6..8b401770f 100644
--- a/radio/src/translations/cz.h.txt
+++ b/radio/src/translations/cz.h.txt
@@ -110,7 +110,7 @@
     #define TR_RETA123         "SVPK123ab"
   #endif
 #elif defined(PCBTARANIS)
-  #define TR_RETA123           "SVPK12LR"
+  #define TR_RETA123           "SVPK123LR"
 #else
   #define TR_RETA123           "SVPK123"
 #endif
diff --git a/radio/src/translations/de.h.txt b/radio/src/translations/de.h.txt
index 61c59d71b..76b01b209 100644
--- a/radio/src/translations/de.h.txt
+++ b/radio/src/translations/de.h.txt
@@ -107,7 +107,7 @@
     #define TR_RETA123         "SHGQ123ab"
   #endif
 #elif defined(PCBTARANIS)
-  #define TR_RETA123           "SHGQ12LR"
+  #define TR_RETA123           "SHGQ123LR"
 #else
   #define TR_RETA123           "SHGQ123"
 #endif
diff --git a/radio/src/translations/en.h.txt b/radio/src/translations/en.h.txt
index 47b64eb9f..ea0885dfa 100644
--- a/radio/src/translations/en.h.txt
+++ b/radio/src/translations/en.h.txt
@@ -110,7 +110,7 @@
     #define TR_RETA123         "RETA123ab"
   #endif
 #elif defined(PCBTARANIS)
-  #define TR_RETA123           "RETA12LR"
+  #define TR_RETA123           "RETA123LR"
 #else
   #define TR_RETA123           "RETA123"
 #endif
diff --git a/radio/src/translations/es.h.txt b/radio/src/translations/es.h.txt
index b03115b53..248bbd5d4 100644
--- a/radio/src/translations/es.h.txt
+++ b/radio/src/translations/es.h.txt
@@ -110,7 +110,7 @@
     #define TR_RETA123         "RETA123ab"
   #endif
 #elif defined(PCBTARANIS)
-  #define TR_RETA123           "RETA12LR"
+  #define TR_RETA123           "RETA123LR"
 #else
   #define TR_RETA123           "RETA123"
 #endif
diff --git a/radio/src/translations/fi.h.txt b/radio/src/translations/fi.h.txt
index b3ee55159..269bbb69a 100644
--- a/radio/src/translations/fi.h.txt
+++ b/radio/src/translations/fi.h.txt
@@ -110,7 +110,7 @@
     #define TR_RETA123         "RETA123ab"
   #endif
 #elif defined(PCBTARANIS)
-  #define TR_RETA123           "RETA12LR"
+  #define TR_RETA123           "RETA123LR"
 #else
   #define TR_RETA123           "RETA123"
 #endif
diff --git a/radio/src/translations/fr.h.txt b/radio/src/translations/fr.h.txt
index 733dfb6e5..9c5f530e0 100644
--- a/radio/src/translations/fr.h.txt
+++ b/radio/src/translations/fr.h.txt
@@ -107,7 +107,7 @@
     #define TR_RETA123         "DPGA123ab"
   #endif
 #elif defined(PCBTARANIS)
-  #define TR_RETA123           "DPGA12LR"
+  #define TR_RETA123           "DPGA123LR"
 #else
   #define TR_RETA123           "DPGA123"
 #endif
diff --git a/radio/src/translations/it.h.txt b/radio/src/translations/it.h.txt
index 336f03e83..d6ed8bd20 100644
--- a/radio/src/translations/it.h.txt
+++ b/radio/src/translations/it.h.txt
@@ -110,7 +110,7 @@
     #define TR_RETA123       "RETA123ab"
   #endif
 #elif defined(PCBTARANIS)
-  #define TR_RETA123         "RETA12LR"
+  #define TR_RETA123         "RETA123LR"
 #else
   #define TR_RETA123         "RETA123"
 #endif
diff --git a/radio/src/translations/pl.h.txt b/radio/src/translations/pl.h.txt
index d3c7e2baf..2cd648217 100644
--- a/radio/src/translations/pl.h.txt
+++ b/radio/src/translations/pl.h.txt
@@ -110,7 +110,7 @@
     #define TR_RETA123         "KWGL123ab"
   #endif
 #elif defined(PCBTARANIS)
-  #define TR_RETA123           "KWGL12LR"
+  #define TR_RETA123           "KWGL123LR"
 #else
   #define TR_RETA123           "KWGL123"
 #endif
diff --git a/radio/src/translations/pt.h.txt b/radio/src/translations/pt.h.txt
index 93155d975..f94b97229 100644
--- a/radio/src/translations/pt.h.txt
+++ b/radio/src/translations/pt.h.txt
@@ -110,7 +110,7 @@
     #define TR_RETA123       "LPMA123ab"
   #endif
 #elif defined(PCBTARANIS)
-  #define TR_RETA123         "LPMA12LR"
+  #define TR_RETA123         "LPMA123LR"
 #else
   #define TR_RETA123         "LPMA123"
 #endif
diff --git a/radio/src/translations/se.h.txt b/radio/src/translations/se.h.txt
index 0962277bf..684efc34d 100644
--- a/radio/src/translations/se.h.txt
+++ b/radio/src/translations/se.h.txt
@@ -110,7 +110,7 @@
     #define TR_RETA123         "RHGS123ab"
   #endif
 #elif defined(PCBTARANIS)
-  #define TR_RETA123           "RHGS12HV"
+  #define TR_RETA123           "RHGS123HV"
 #else
   #define TR_RETA123           "RHGS123"
 #endif