From a47ac42996d598ac46334cf5d945df3440e2198c Mon Sep 17 00:00:00 2001
From: Bertrand Songis <bsongis@gmail.com>
Date: Sat, 22 Feb 2014 14:00:01 +0100
Subject: [PATCH] I Add some reserve in custom functions to avoid to change
 EEPROM 15days after the release ...

---
 companion/src/eeprominterface.h                 |  3 ++-
 companion/src/firmwares/opentx/opentxeeprom.cpp | 11 ++++++++++-
 radio/src/gui/menus.cpp                         |  8 ++++++++
 radio/src/myeeprom.h                            |  6 ++++++
 radio/src/translations/en.h                     |  4 +++-
 5 files changed, 29 insertions(+), 3 deletions(-)

diff --git a/companion/src/eeprominterface.h b/companion/src/eeprominterface.h
index 07919466c..2881e5801 100644
--- a/companion/src/eeprominterface.h
+++ b/companion/src/eeprominterface.h
@@ -658,7 +658,8 @@ enum AssignFunc {
   FuncBackgroundMusicPause,
   FuncAdjustGV1,
   FuncAdjustGVLast = FuncAdjustGV1+C9X_MAX_GVARS-1,
-  FuncCount
+  FuncCount,
+  FuncReserve = -1
 };
 
 class FuncSwData { // Function Switches data
diff --git a/companion/src/firmwares/opentx/opentxeeprom.cpp b/companion/src/firmwares/opentx/opentxeeprom.cpp
index 37f148900..d70e892f5 100644
--- a/companion/src/firmwares/opentx/opentxeeprom.cpp
+++ b/companion/src/firmwares/opentx/opentxeeprom.cpp
@@ -1319,7 +1319,9 @@ class CustomFunctionsConversionTable: public ConversionTable {
         addConversion(FuncTrainerTHR, val++);
         addConversion(FuncTrainerAIL, val++);
       }
+
       addConversion(FuncInstantTrim, val++);
+
       if (version >= 216) {
         addConversion(FuncReset, val++);
         if (IS_ARM(board)) {
@@ -1330,14 +1332,21 @@ class CustomFunctionsConversionTable: public ConversionTable {
         for (int i=0; i<MAX_GVARS(board, version); i++)
           addConversion(FuncAdjustGV1+i, val);
         val++;
-        if (IS_ARM(board))
+        if (IS_ARM(board)) {
           addConversion(FuncVolume, val++);
+          addConversion(FuncReserve, val++);
+          addConversion(FuncReserve, val++);
+          addConversion(FuncReserve, val++);
+        }
         addConversion(FuncPlaySound, val++);
         addConversion(FuncPlayPrompt, val++);
         if (version >= 213 && !IS_ARM(board))
           addConversion(FuncPlayBoth, val++);
         addConversion(FuncPlayValue, val++);
         if (IS_ARM(board)) {
+          addConversion(FuncReserve, val++);
+          addConversion(FuncReserve, val++);
+          addConversion(FuncReserve, val++);
           addConversion(FuncBackgroundMusic, val++);
           addConversion(FuncBackgroundMusicPause, val++);
         }
diff --git a/radio/src/gui/menus.cpp b/radio/src/gui/menus.cpp
index dfc74980e..3c6998c0b 100644
--- a/radio/src/gui/menus.cpp
+++ b/radio/src/gui/menus.cpp
@@ -1311,6 +1311,14 @@ bool isAssignableFunctionAvailable(int16_t function)
       return false;
 #endif
 
+    case FUNC_PLAY_DIFF:
+    case FUNC_RESERVE1:
+    case FUNC_RESERVE2:
+    case FUNC_RESERVE3:
+    case FUNC_RESERVE4:
+    case FUNC_RESERVE5:
+      return false;
+
     default:
       return true;
   }
diff --git a/radio/src/myeeprom.h b/radio/src/myeeprom.h
index fed0158f4..8f0b7b03c 100644
--- a/radio/src/myeeprom.h
+++ b/radio/src/myeeprom.h
@@ -732,6 +732,9 @@ enum Functions {
   FUNC_ADJUST_GVAR,
 #if defined(CPUARM)
   FUNC_VOLUME,
+  FUNC_RESERVE1,
+  FUNC_RESERVE2,
+  FUNC_RESERVE3,
 #endif
 
   // then the other functions
@@ -743,6 +746,9 @@ enum Functions {
 #endif
   FUNC_PLAY_VALUE,
 #if defined(CPUARM)
+  FUNC_PLAY_DIFF,
+  FUNC_RESERVE4,
+  FUNC_RESERVE5,
   FUNC_BACKGND_MUSIC,
   FUNC_BACKGND_MUSIC_PAUSE,
 #endif
diff --git a/radio/src/translations/en.h b/radio/src/translations/en.h
index 5d8b9dedc..7cc6745d9 100644
--- a/radio/src/translations/en.h
+++ b/radio/src/translations/en.h
@@ -224,8 +224,10 @@
   #define TR_CFN_TEST
 #endif
 
+#define TR_CFN_RESERVE         "[reserve]\0"
+
 #if defined(CPUARM)
-  #define TR_VFSWFUNC          "Safety\0   ""Trainer\0  ""Inst. Trim""Reset\0    ""Set \0     " TR_ADJUST_GVAR "Volume\0   " TR_SOUND TR_PLAY_TRACK TR_PLAY_VALUE TR_CFN_BG_MUSIC TR_VVARIO TR_HAPTIC TR_SDCLOGS "Backlight\0" TR_CFN_TEST
+  #define TR_VFSWFUNC          "Safety\0   ""Trainer\0  ""Inst. Trim""Reset\0    ""Set \0     " TR_ADJUST_GVAR "Volume\0   " TR_CFN_RESERVE TR_CFN_RESERVE TR_CFN_RESERVE TR_SOUND TR_PLAY_TRACK TR_PLAY_VALUE TR_CFN_RESERVE TR_CFN_RESERVE TR_CFN_RESERVE TR_CFN_BG_MUSIC TR_VVARIO TR_HAPTIC TR_SDCLOGS "Backlight\0" TR_CFN_TEST
 #elif defined(PCBGRUVIN9X)
   #define TR_VFSWFUNC          "Safety\0   ""Trainer\0  ""Inst. Trim""Reset\0    " TR_ADJUST_GVAR TR_SOUND TR_PLAY_TRACK TR_PLAY_BOTH TR_PLAY_VALUE TR_VVARIO TR_HAPTIC TR_SDCLOGS "Backlight\0" TR_CFN_TEST
 #else