From b66fd75b504548a6bc7a89a8329fc6517b6d1a3c Mon Sep 17 00:00:00 2001
From: Bertrand Songis <bsongis@gmail.com>
Date: Wed, 22 Jan 2014 15:15:56 +0100
Subject: [PATCH] Issue #552 Radio part done

---
 radio/src/gui/menu_model.cpp |  4 +++-
 radio/src/opentx.cpp         |  2 +-
 radio/src/translations/en.h  | 10 +++++-----
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/radio/src/gui/menu_model.cpp b/radio/src/gui/menu_model.cpp
index d1f9889fb..65fd8dcea 100644
--- a/radio/src/gui/menu_model.cpp
+++ b/radio/src/gui/menu_model.cpp
@@ -4933,11 +4933,13 @@ void menuModelCustomFunctions(uint8_t event)
           break;
 
         case 3:
-          if (sd->swtch && (CFN_FUNC(sd) <= FUNC_INSTANT_TRIM
+          if (sd->swtch && (CFN_FUNC(sd) <= FUNC_INSTANT_TRIM || CFN_FUNC(sd) == FUNC_RESET
 #if defined(GVARS)
+              // TODO #define
               || CFN_FUNC(sd) >= FUNC_ADJUST_GV1
 #endif
 #if defined(CPUARM)
+              // TODO #define
               || CFN_FUNC(sd) == FUNC_VOLUME
 #endif
               )) {
diff --git a/radio/src/opentx.cpp b/radio/src/opentx.cpp
index ee634a7d2..78f6ed887 100644
--- a/radio/src/opentx.cpp
+++ b/radio/src/opentx.cpp
@@ -3129,7 +3129,7 @@ void evalFunctions()
             }
           }
         }
-        else if (CFN_FUNC(sd) <= FUNC_INSTANT_TRIM) {
+        else if (CFN_FUNC(sd) <= FUNC_INSTANT_TRIM || CFN_FUNC(sd) == FUNC_RESET) {
           active = false;
         }
 
diff --git a/radio/src/translations/en.h b/radio/src/translations/en.h
index 62876daf9..fe5a929db 100644
--- a/radio/src/translations/en.h
+++ b/radio/src/translations/en.h
@@ -206,23 +206,23 @@
   #define TR_VFSWFUNC          "Safety\0   ""Trainer\0  ""Inst. Trim" TR_SOUND TR_HAPTIC "Reset\0    " TR_VVARIO TR_PLAY_TRACK TR_PLAY_BOTH TR_PLAY_VALUE "Backlight\0" TR_CFN_ADJUST_GVAR TR_CFN_TEST
 #endif
 
-#define LEN_VFSWRESET          TR("\005", "\011")
+#define LEN_VFSWRESET          TR("\004", "\011")
 
 #if defined(FRSKY)
-  #define TR_FSW_RESET_TELEM   TR("Telem", "Telemetry")
+  #define TR_FSW_RESET_TELEM   TR("Telm", "Telemetry")
 #else
   #define TR_FSW_RESET_TELEM
 #endif
 
 #if ROTARY_ENCODERS == 2
-  #define TR_FSW_RESET_ROTENC  TR("REa\0 ""REb\0 ", "RotEnc A\0""RotEnc B\0")
+  #define TR_FSW_RESET_ROTENC  TR("REa\0""REb\0", "RotEnc A\0""RotEnc B\0")
 #elif ROTARY_ENCODERS == 1
-  #define TR_FSW_RESET_ROTENC  TR("R.Enc", "RotEnc\0  ")
+  #define TR_FSW_RESET_ROTENC  TR("R.E.", "RotEnc\0  ")
 #else
   #define TR_FSW_RESET_ROTENC
 #endif
 
-#define TR_VFSWRESET           TR("Tmr1\0""Tmr2\0""All\0 " TR_FSW_RESET_TELEM TR_FSW_RESET_ROTENC, "Timer 1  ""Timer 2  ""All      " TR_FSW_RESET_TELEM TR_FSW_RESET_ROTENC)
+#define TR_VFSWRESET           TR("Tmr1""Tmr2""All\0" TR_FSW_RESET_TELEM TR_FSW_RESET_ROTENC, "Timer 1  ""Timer 2  ""All      " TR_FSW_RESET_TELEM TR_FSW_RESET_ROTENC)
 
 #define LEN_FUNCSOUNDS         TR("\004", "\006")
 #define TR_FUNCSOUNDS          TR("Bp1\0""Bp2\0""Bp3\0""Wrn1""Wrn2""Chee""Rata""Tick""Sirn""Ring""SciF""Robt""Chrp""Tada""Crck""Alrm", "Beep1 ""Beep2 ""Beep3 ""Warn1 ""Warn2 ""Cheep ""Ratata""Tick  ""Siren ""Ring  ""SciFi ""Robot ""Chirp ""Tada  ""Crickt""AlmClk")