diff --git a/radio/src/CMakeLists.txt b/radio/src/CMakeLists.txt
index c57692d81..ccab36a00 100644
--- a/radio/src/CMakeLists.txt
+++ b/radio/src/CMakeLists.txt
@@ -196,10 +196,12 @@ endif()
 
 if(CURVES)
   add_definitions(-DCURVES)
+  set(SRC ${SRC} curves.cpp)
 endif()
 
 if(GVARS)
   add_definitions(-DGVARS)
+  set(SRC ${SRC} gvars.cpp)
   math(EXPR EEPROM_VARIANT ${EEPROM_VARIANT}+${GVARS_VARIANT})
 endif()
 
@@ -285,13 +287,6 @@ set(SRC
   trainer_input.cpp
   )
 
-if(CURVES)
-  set(SRC
-    ${SRC}
-    curves.cpp
-    )
-endif()
-
 if(GUI)
   add_definitions(-DGUI)
   set(SRC
diff --git a/radio/src/functions.cpp b/radio/src/functions.cpp
index 3c3adf5d1..205964819 100644
--- a/radio/src/functions.cpp
+++ b/radio/src/functions.cpp
@@ -402,36 +402,34 @@ void evalFunctions()
 
 #if defined(GVARS)
           case FUNC_ADJUST_GVAR:
-            if (isRepeatDelayElapsed(functions, functionsContext, i)) {
-              if (CFN_GVAR_MODE(cfn) == FUNC_ADJUST_GVAR_CONSTANT) {
-                SET_GVAR(CFN_GVAR_INDEX(cfn), CFN_PARAM(cfn), mixerCurrentFlightMode);
-              }
-              else if (CFN_GVAR_MODE(cfn) == FUNC_ADJUST_GVAR_GVAR) {
-                SET_GVAR(CFN_GVAR_INDEX(cfn), GVAR_VALUE(CFN_PARAM(cfn), getGVarFlightMode(mixerCurrentFlightMode, CFN_PARAM(cfn))), mixerCurrentFlightMode);
-              }
-              else if (CFN_GVAR_MODE(cfn) == FUNC_ADJUST_GVAR_INCDEC) {
+            if (CFN_GVAR_MODE(cfn) == FUNC_ADJUST_GVAR_CONSTANT) {
+              SET_GVAR(CFN_GVAR_INDEX(cfn), CFN_PARAM(cfn), mixerCurrentFlightMode);
+            }
+            else if (CFN_GVAR_MODE(cfn) == FUNC_ADJUST_GVAR_GVAR) {
+              SET_GVAR(CFN_GVAR_INDEX(cfn), GVAR_VALUE(CFN_PARAM(cfn), getGVarFlightMode(mixerCurrentFlightMode, CFN_PARAM(cfn))), mixerCurrentFlightMode);
+            }
+            else if (CFN_GVAR_MODE(cfn) == FUNC_ADJUST_GVAR_INCDEC) {
 #if defined(CPUARM)
-                SET_GVAR(CFN_GVAR_INDEX(cfn), limit<int16_t>(CFN_GVAR_CST_MIN+g_model.gvars[CFN_GVAR_INDEX(cfn)].min, GVAR_VALUE(CFN_GVAR_INDEX(cfn), getGVarFlightMode(mixerCurrentFlightMode, CFN_GVAR_INDEX(cfn))) + CFN_PARAM(cfn), CFN_GVAR_CST_MAX-g_model.gvars[CFN_GVAR_INDEX(cfn)].max), mixerCurrentFlightMode);
+              SET_GVAR(CFN_GVAR_INDEX(cfn), limit<int16_t>(CFN_GVAR_CST_MIN+g_model.gvars[CFN_GVAR_INDEX(cfn)].min, GVAR_VALUE(CFN_GVAR_INDEX(cfn), getGVarFlightMode(mixerCurrentFlightMode, CFN_GVAR_INDEX(cfn))) + CFN_PARAM(cfn), CFN_GVAR_CST_MAX-g_model.gvars[CFN_GVAR_INDEX(cfn)].max), mixerCurrentFlightMode);
 #else
-                if (!(functionsContext.activeSwitches & switch_mask)) {
-                  SET_GVAR(CFN_GVAR_INDEX(cfn), GVAR_VALUE(CFN_GVAR_INDEX(cfn), getGVarFlightMode(mixerCurrentFlightMode, CFN_GVAR_INDEX(cfn))) + (CFN_PARAM(cfn) ? +1 : -1), mixerCurrentFlightMode);
-                }
+              if (!(functionsContext.activeSwitches & switch_mask)) {
+                SET_GVAR(CFN_GVAR_INDEX(cfn), GVAR_VALUE(CFN_GVAR_INDEX(cfn), getGVarFlightMode(mixerCurrentFlightMode, CFN_GVAR_INDEX(cfn))) + (CFN_PARAM(cfn) ? +1 : -1), mixerCurrentFlightMode);
+              }
 #endif
-              }
-              else if (CFN_PARAM(cfn) >= MIXSRC_TrimRud && CFN_PARAM(cfn) <= MIXSRC_TrimAil) {
-                trimGvar[CFN_PARAM(cfn)-MIXSRC_TrimRud] = CFN_GVAR_INDEX(cfn);
-              }
+            }
+            else if (CFN_PARAM(cfn) >= MIXSRC_TrimRud && CFN_PARAM(cfn) <= MIXSRC_TrimAil) {
+              trimGvar[CFN_PARAM(cfn)-MIXSRC_TrimRud] = CFN_GVAR_INDEX(cfn);
+            }
 #if defined(ROTARY_ENCODERS)
-              else if (CFN_PARAM(cfn) >= MIXSRC_REa && CFN_PARAM(cfn) < MIXSRC_TrimRud) {
-                int8_t scroll = rePreviousValues[CFN_PARAM(cfn)-MIXSRC_REa] - (rotencValue[CFN_PARAM(cfn)-MIXSRC_REa] / ROTARY_ENCODER_GRANULARITY);
-                if (scroll) {
-                  SET_GVAR(CFN_GVAR_INDEX(cfn), GVAR_VALUE(CFN_GVAR_INDEX(cfn), getGVarFlightMode(mixerCurrentFlightMode, CFN_GVAR_INDEX(cfn))) + scroll, mixerCurrentFlightMode);
-                }
+            else if (CFN_PARAM(cfn) >= MIXSRC_REa && CFN_PARAM(cfn) < MIXSRC_TrimRud) {
+              int8_t scroll = rePreviousValues[CFN_PARAM(cfn)-MIXSRC_REa] - (rotencValue[CFN_PARAM(cfn)-MIXSRC_REa] / ROTARY_ENCODER_GRANULARITY);
+              if (scroll) {
+                SET_GVAR(CFN_GVAR_INDEX(cfn), GVAR_VALUE(CFN_GVAR_INDEX(cfn), getGVarFlightMode(mixerCurrentFlightMode, CFN_GVAR_INDEX(cfn))) + scroll, mixerCurrentFlightMode);
               }
+            }
 #endif
-              else {
-                SET_GVAR(CFN_GVAR_INDEX(cfn), calcRESXto100(getValue(CFN_PARAM(cfn))), mixerCurrentFlightMode);
-              }
+            else {
+              SET_GVAR(CFN_GVAR_INDEX(cfn), calcRESXto100(getValue(CFN_PARAM(cfn))), mixerCurrentFlightMode);
             }
             break;
 #endif
diff --git a/radio/src/gvars.cpp b/radio/src/gvars.cpp
new file mode 100644
index 000000000..64ef322d7
--- /dev/null
+++ b/radio/src/gvars.cpp
@@ -0,0 +1,118 @@
+/*
+ * Copyright (C) OpenTX
+ *
+ * Based on code named
+ *   th9x - http://code.google.com/p/th9x
+ *   er9x - http://code.google.com/p/er9x
+ *   gruvin9x - http://code.google.com/p/gruvin9x
+ *
+ * License GPLv2: http://www.gnu.org/licenses/gpl-2.0.html
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+#include "opentx.h"
+
+#if defined(PCBSTD)
+int16_t getGVarFieldValue(int16_t x, int16_t min, int16_t max)
+{
+  if (GV_IS_GV_VALUE(x, min, max)) {
+    int8_t idx = GV_INDEX_CALCULATION(x, max);
+    int8_t mul = 1;
+
+    if (idx < 0) {
+      idx = -1-idx;
+      mul = -1;
+    }
+
+    x = GVAR_VALUE(idx, -1) * mul;
+  }
+
+  return limit(min, x, max);
+}
+
+void setGVarValue(uint8_t idx, int8_t value)
+{
+  if (GVAR_VALUE(idx, -1) != value) {
+    SET_GVAR_VALUE(idx, -1, value);
+  }
+}
+#else
+uint8_t gvarDisplayTimer = 0;
+uint8_t gvarLastChanged = 0;
+
+uint8_t getGVarFlightMode(uint8_t fm, uint8_t gv) // TODO change params order to be consistent!
+{
+  for (uint8_t i=0; i<MAX_FLIGHT_MODES; i++) {
+    if (fm == 0) return 0;
+    int16_t val = GVAR_VALUE(gv, fm);
+    if (val <= GVAR_MAX) return fm;
+    uint8_t result = val-GVAR_MAX-1;
+    if (result >= fm) result++;
+    fm = result;
+  }
+  return 0;
+}
+
+int16_t getGVarValue(int8_t gv, int8_t fm)
+{
+  int8_t mul = 1;
+  if (gv < 0) {
+    gv = -1-gv;
+    mul = -1;
+  }
+  return GVAR_VALUE(gv, getGVarFlightMode(fm, gv)) * mul;
+}
+
+int32_t getGVarValuePrec1(int8_t gv, int8_t fm)
+{
+  int8_t mul;
+  uint8_t prec = g_model.gvars[gv].prec;
+  if (prec == 0)
+    mul = 10;
+  else
+    mul = 1;
+
+  if (gv < 0) {
+    gv = -1-gv;
+    mul = -mul;
+  }
+  return GVAR_VALUE(gv, getGVarFlightMode(fm, gv)) * mul;
+}
+
+void setGVarValue(uint8_t gv, int16_t value, int8_t fm)
+{
+  fm = getGVarFlightMode(fm, gv);
+  if (GVAR_VALUE(gv, fm) != value) {
+    SET_GVAR_VALUE(gv, fm, value);
+  }
+}
+
+int16_t getGVarFieldValue(int16_t val, int16_t min, int16_t max, int8_t fm)
+{
+  if (GV_IS_GV_VALUE(val, min, max)) {
+    int8_t gv = GV_INDEX_CALCULATION(val, max);
+    val = getGVarValue(gv, fm);
+  }
+  return limit(min, val, max);
+}
+
+int32_t getGVarFieldValuePrec1(int16_t val, int16_t min, int16_t max, int8_t fm)
+{
+  if (GV_IS_GV_VALUE(val, min, max)) {
+    int8_t gv = GV_INDEX_CALCULATION(val, max);
+    val = getGVarValuePrec1(gv, fm);
+  }
+  else {
+    val *= 10;
+  }
+  return limit<int>(min*10, val, max*10);
+}
+#endif
diff --git a/radio/src/gvars.h b/radio/src/gvars.h
new file mode 100644
index 000000000..176a7cf93
--- /dev/null
+++ b/radio/src/gvars.h
@@ -0,0 +1,102 @@
+/*
+ * Copyright (C) OpenTX
+ *
+ * Based on code named
+ *   th9x - http://code.google.com/p/th9x
+ *   er9x - http://code.google.com/p/er9x
+ *   gruvin9x - http://code.google.com/p/gruvin9x
+ *
+ * License GPLv2: http://www.gnu.org/licenses/gpl-2.0.html
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+#ifndef _GVARS_H_
+#define _GVARS_H_
+
+#if defined(PCBSTD)
+  // GVars are common to all flight modes
+  #define GVAR_VALUE(x, p)             g_model.gvars[x]
+  #define SET_GVAR_VALUE(idx, phase, value) \
+    (GVAR_VALUE(idx, phase) = value, storageDirty(EE_MODEL))
+#else
+  // GVars have one value per flight mode
+  #define GVAR_VALUE(gv, fm)           g_model.flightModeData[fm].gvars[gv]
+  #define SET_GVAR_VALUE(idx, phase, value) \
+    GVAR_VALUE(idx, phase) = value; \
+    storageDirty(EE_MODEL); \
+    if (g_model.gvars[idx].popup) { \
+      gvarLastChanged = idx; \
+      gvarDisplayTimer = GVAR_DISPLAY_TIME; \
+    }
+#endif
+
+#if defined(GVARS)
+  #if defined(PCBSTD)
+    int16_t getGVarFieldValue(int16_t x, int16_t min, int16_t max);
+    void setGVarValue(uint8_t x, int8_t value);
+    #define GET_GVAR(x, min, max, fm)  getGVarFieldValue(x, min, max)
+    #define SET_GVAR(idx, val, fm)     setGVarValue(idx, val)
+  #else
+    uint8_t getGVarFlightMode(uint8_t fm, uint8_t gv);
+    int16_t getGVarFieldValue(int16_t x, int16_t min, int16_t max, int8_t fm);
+    int32_t getGVarFieldValuePrec1(int16_t x, int16_t min, int16_t max, int8_t fm);
+    int16_t getGVarValue(int8_t gv, int8_t fm);
+    int32_t getGVarValuePrec1(int8_t gv, int8_t fm);
+    void setGVarValue(uint8_t x, int16_t value, int8_t fm);
+    #define GET_GVAR(x, min, max, fm)  getGVarFieldValue(x, min, max, fm)
+    #define SET_GVAR(idx, val, fm)     setGVarValue(idx, val, fm)
+    #define GVAR_DISPLAY_TIME          100 /*1 second*/;
+    #define GET_GVAR_PREC1(x, min, max, fm) getGVarFieldValuePrec1(x, min, max, fm)
+    extern uint8_t gvarDisplayTimer;
+    extern uint8_t gvarLastChanged;
+  #endif
+#else
+  #define GET_GVAR(x, ...)             (x)
+  #define GET_GVAR_PREC1(x, ...)       (x*10)
+#endif
+
+#if defined(CPUARM)
+  #define GV_GET_GV1_VALUE(max)        ((max<=GV_RANGESMALL && min>=GV_RANGESMALL_NEG) ? GV1_SMALL : GV1_LARGE)
+  #define GV_INDEX_CALCULATION(x,max)  ((max<=GV_RANGESMALL && min>=GV_RANGESMALL_NEG) ? (uint8_t) x-GV1_SMALL : ((x&(GV1_LARGE*2-1))-GV1_LARGE))
+  #define GV_IS_GV_VALUE(x,min,max)    ((max>GV1_SMALL || min<-GV1_SMALL) ? (x>GV_RANGELARGE || x<GV_RANGELARGE_NEG) : (x>max) || (x<min))
+#else
+  #define GV_GET_GV1_VALUE(max)        ((max<=GV_RANGESMALL) ? GV1_SMALL : GV1_LARGE)
+  #define GV_INDEX_CALCULATION(x,max)  ((max<=GV1_SMALL) ? (uint8_t) x-GV1_SMALL : ((x&(GV1_LARGE*2-1))-GV1_LARGE))
+  #define GV_IS_GV_VALUE(x,min,max)    ((x>max) || (x<min) )
+#endif
+
+#define GV_INDEX_CALC_DELTA(x,delta)   ((x&(delta*2-1)) - delta)
+
+#define GV_CALC_VALUE_IDX_POS(idx,delta) (-delta+idx)
+#define GV_CALC_VALUE_IDX_NEG(idx,delta) (delta+idx)
+
+#define GV_RANGESMALL                  (GV1_SMALL - (RESERVE_RANGE_FOR_GVARS+1))
+#define GV_RANGESMALL_NEG              (-GV1_SMALL + (RESERVE_RANGE_FOR_GVARS+1))
+#define GV_RANGELARGE                  (GV1_LARGE - (RESERVE_RANGE_FOR_GVARS+1))
+#define GV_RANGELARGE_NEG              (-GV1_LARGE + (RESERVE_RANGE_FOR_GVARS+1))
+
+#if defined(CPUARM)
+  // the define GV1_LARGE marks the highest bit value used for this variables
+  // because this would give too big numbers for ARM, we limit it further for
+  // offset and weight
+  #define GV_RANGELARGE_WEIGHT         (GV_RANGE_WEIGHT)
+  #define GV_RANGELARGE_WEIGHT_NEG     (-GV_RANGE_WEIGHT)
+  #define GV_RANGELARGE_OFFSET         (GV_RANGE_OFFSET)
+  #define GV_RANGELARGE_OFFSET_NEG     (-GV_RANGE_OFFSET)
+#else
+  // for stock we just use as much as possible
+  #define GV_RANGELARGE_WEIGHT         GV_RANGELARGE
+  #define GV_RANGELARGE_WEIGHT_NEG     GV_RANGELARGE_NEG
+  #define GV_RANGELARGE_OFFSET         GV_RANGELARGE
+  #define GV_RANGELARGE_OFFSET_NEG     GV_RANGELARGE_NEG
+#endif
+
+#endif // _GVARS_H_
\ No newline at end of file
diff --git a/radio/src/myeeprom.h b/radio/src/myeeprom.h
index 0c2160afc..8833b7a35 100644
--- a/radio/src/myeeprom.h
+++ b/radio/src/myeeprom.h
@@ -47,12 +47,6 @@
   #define EEPROM_VER             216
 #endif
 
-#if defined(PCBSTD)
-  #define GVAR_VALUE(x, p)             g_model.gvars[x]
-#else
-  #define GVAR_VALUE(gv, fm)           g_model.flightModeData[fm].gvars[gv]
-#endif
-
 #define GET_PPM_POLARITY(idx)             g_model.moduleData[idx].ppm.pulsePol
 #define GET_PPM_DELAY(idx)                (g_model.moduleData[idx].ppm.delay * 50 + 300)
 #define SET_DEFAULT_PPM_FRAME_LENGTH(idx) g_model.moduleData[idx].ppm.frameLength = 4 * max((int8_t)0, g_model.moduleData[idx].channelsCount)
diff --git a/radio/src/opentx.cpp b/radio/src/opentx.cpp
index c225b47e6..c9c7d9073 100644
--- a/radio/src/opentx.cpp
+++ b/radio/src/opentx.cpp
@@ -586,7 +586,7 @@ int getTrimValue(uint8_t phase, uint8_t idx)
   }
   return 0;
 #else
-  return getRawTrimValue(getTrimFlightPhase(phase, idx), idx);
+  return getRawTrimValue(getTrimFlightMode(phase, idx), idx);
 #endif
 }
 
@@ -630,7 +630,7 @@ void setTrimValue(uint8_t phase, uint8_t idx, int trim)
 #endif
 
 #if !defined(CPUARM)
-uint8_t getTrimFlightPhase(uint8_t phase, uint8_t idx)
+uint8_t getTrimFlightMode(uint8_t phase, uint8_t idx)
 {
   for (uint8_t i=0; i<MAX_FLIGHT_MODES; i++) {
     if (phase == 0) return 0;
@@ -645,7 +645,7 @@ uint8_t getTrimFlightPhase(uint8_t phase, uint8_t idx)
 #endif
 
 #if defined(ROTARY_ENCODERS)
-uint8_t getRotaryEncoderFlightPhase(uint8_t idx)
+uint8_t getRotaryEncoderFlightMode(uint8_t idx)
 {
   uint8_t phase = mixerCurrentFlightMode;
   for (uint8_t i=0; i<MAX_FLIGHT_MODES; i++) {
@@ -661,132 +661,18 @@ uint8_t getRotaryEncoderFlightPhase(uint8_t idx)
 
 int16_t getRotaryEncoder(uint8_t idx)
 {
-  return flightModeAddress(getRotaryEncoderFlightPhase(idx))->rotaryEncoders[idx];
+  return flightModeAddress(getRotaryEncoderFlightMode(idx))->rotaryEncoders[idx];
 }
 
 void incRotaryEncoder(uint8_t idx, int8_t inc)
 {
   rotencValue[idx] += inc;
-  int16_t *value = &(flightModeAddress(getRotaryEncoderFlightPhase(idx))->rotaryEncoders[idx]);
+  int16_t *value = &(flightModeAddress(getRotaryEncoderFlightMode(idx))->rotaryEncoders[idx]);
   *value = limit((int16_t)-RESX, (int16_t)(*value + (inc * 8)), (int16_t)+RESX);
   storageDirty(EE_MODEL);
 }
 #endif
 
-#if defined(GVARS)
-
-#if defined(PCBSTD)
-  #define SET_GVAR_VALUE(idx, phase, value) \
-    (GVAR_VALUE(idx, phase) = value, storageDirty(EE_MODEL))
-#else
-  #define SET_GVAR_VALUE(idx, phase, value) \
-    GVAR_VALUE(idx, phase) = value; \
-    storageDirty(EE_MODEL); \
-    if (g_model.gvars[idx].popup) { \
-      gvarLastChanged = idx; \
-      gvarDisplayTimer = GVAR_DISPLAY_TIME; \
-    }
-#endif
-
-#if defined(PCBSTD)
-int16_t getGVarFieldValue(int16_t x, int16_t min, int16_t max)
-{
-  if (GV_IS_GV_VALUE(x, min, max)) {
-    int8_t idx = GV_INDEX_CALCULATION(x, max);
-    int8_t mul = 1;
-
-    if (idx < 0) {
-      idx = -1-idx;
-      mul = -1;
-    }
-
-    x = GVAR_VALUE(idx, -1) * mul;
-  }
-
-  return limit(min, x, max);
-}
-
-void setGVarValue(uint8_t idx, int8_t value)
-{
-  if (GVAR_VALUE(idx, -1) != value) {
-    SET_GVAR_VALUE(idx, -1, value);
-  }
-}
-#else
-uint8_t gvarDisplayTimer = 0;
-uint8_t gvarLastChanged = 0;
-
-uint8_t getGVarFlightMode(uint8_t fm, uint8_t gv) // TODO change params order to be consistent!
-{
-  for (uint8_t i=0; i<MAX_FLIGHT_MODES; i++) {
-    if (fm == 0) return 0;
-    int16_t val = GVAR_VALUE(gv, fm);
-    if (val <= GVAR_MAX) return fm;
-    uint8_t result = val-GVAR_MAX-1;
-    if (result >= fm) result++;
-    fm = result;
-  }
-  return 0;
-}
-
-int16_t getGVarValue(int8_t gv, int8_t fm)
-{
-  int8_t mul = 1;
-  if (gv < 0) {
-    gv = -1-gv;
-    mul = -1;
-  }
-  return GVAR_VALUE(gv, getGVarFlightMode(fm, gv)) * mul;
-}
-
-int32_t getGVarValuePrec1(int8_t gv, int8_t fm)
-{
-  int8_t mul;
-  uint8_t prec = g_model.gvars[gv].prec;
-  if (prec == 0)
-    mul = 10;
-  else
-    mul = 1;
-
-  if (gv < 0) {
-    gv = -1-gv;
-    mul = -mul;
-  }
-  return GVAR_VALUE(gv, getGVarFlightMode(fm, gv)) * mul;
-}
-
-void setGVarValue(uint8_t gv, int16_t value, int8_t fm)
-{
-  fm = getGVarFlightMode(fm, gv);
-  if (GVAR_VALUE(gv, fm) != value) {
-    SET_GVAR_VALUE(gv, fm, value);
-  }
-}
-
-int16_t getGVarFieldValue(int16_t val, int16_t min, int16_t max, int8_t fm)
-{
-  if (GV_IS_GV_VALUE(val, min, max)) {
-    int8_t gv = GV_INDEX_CALCULATION(val, max);
-    val = getGVarValue(gv, fm);
-  }
-  return limit(min, val, max);
-}
-
-int32_t getGVarFieldValuePrec1(int16_t val, int16_t min, int16_t max, int8_t fm)
-{
-  if (GV_IS_GV_VALUE(val, min, max)) {
-    int8_t gv = GV_INDEX_CALCULATION(val, max);
-    val = getGVarValuePrec1(gv, fm);
-  }
-  else {
-    val *= 10;
-  }
-  return limit<int>(min*10, val, max*10);
-}
-#endif
-
-#endif
-
 #if defined(CPUARM)
 getvalue_t convert16bitsTelemValue(source_t channel, ls_telemetry_value_t value)
 {
@@ -1380,7 +1266,7 @@ uint8_t checkTrim(event_t event)
       thro = false;
     }
     else {
-      phase = getTrimFlightPhase(mixerCurrentFlightMode, idx);
+      phase = getTrimFlightMode(mixerCurrentFlightMode, idx);
 #if defined(CPUARM)
       before = getTrimValue(phase, idx);
 #else
@@ -1389,7 +1275,7 @@ uint8_t checkTrim(event_t event)
       thro = (idx==THR_STICK && g_model.thrTrim);
     }
 #else
-    phase = getTrimFlightPhase(mixerCurrentFlightMode, idx);
+    phase = getTrimFlightMode(mixerCurrentFlightMode, idx);
 #if defined(CPUARM)
     before = getTrimValue(phase, idx);
 #else
@@ -2359,7 +2245,7 @@ void instantTrim()
   for (uint8_t stick=0; stick<NUM_STICKS; stick++) {
     if (stick!=THR_STICK) {
       // don't instant trim the throttle stick
-      uint8_t trim_phase = getTrimFlightPhase(mixerCurrentFlightMode, stick);
+      uint8_t trim_phase = getTrimFlightMode(mixerCurrentFlightMode, stick);
 #if defined(VIRTUAL_INPUTS)
       int16_t delta = 0;
       for (int e=0; e<MAX_EXPOS; e++) {
diff --git a/radio/src/opentx.h b/radio/src/opentx.h
index 70951f67f..dc34a2621 100644
--- a/radio/src/opentx.h
+++ b/radio/src/opentx.h
@@ -718,9 +718,9 @@ swsrc_t getMovedSwitch();
 #endif
 
 #if !defined(CPUARM)
-  uint8_t getTrimFlightPhase(uint8_t phase, uint8_t idx);
+  uint8_t getTrimFlightMode(uint8_t phase, uint8_t idx);
 #else
-  #define getTrimFlightPhase(phase, idx) (phase)
+  #define getTrimFlightMode(phase, idx) (phase)
 #endif
 
 #if defined(GVARS)
@@ -752,65 +752,7 @@ int getTrimValue(uint8_t phase, uint8_t idx);
   #define ROTARY_ENCODER_GRANULARITY (2)
 #endif
 
-#if defined(GVARS)
-  #if defined(PCBSTD)
-    int16_t getGVarFieldValue(int16_t x, int16_t min, int16_t max);
-    void setGVarValue(uint8_t x, int8_t value);
-    #define GET_GVAR(x, min, max, fm) getGVarFieldValue(x, min, max)
-    #define SET_GVAR(idx, val, fm) setGVarValue(idx, val)
-  #else
-    uint8_t getGVarFlightMode(uint8_t fm, uint8_t gv);
-    int16_t getGVarFieldValue(int16_t x, int16_t min, int16_t max, int8_t fm);
-    int32_t getGVarFieldValuePrec1(int16_t x, int16_t min, int16_t max, int8_t fm);
-    int16_t getGVarValue(int8_t gv, int8_t fm);
-    int32_t getGVarValuePrec1(int8_t gv, int8_t fm);
-    void setGVarValue(uint8_t x, int16_t value, int8_t fm);
-    #define GET_GVAR(x, min, max, fm) getGVarFieldValue(x, min, max, fm)
-    #define SET_GVAR(idx, val, fm) setGVarValue(idx, val, fm)
-    #define GVAR_DISPLAY_TIME     100 /*1 second*/;
-    #define GET_GVAR_PREC1(x, min, max, fm) getGVarFieldValuePrec1(x, min, max, fm)
-    extern uint8_t gvarDisplayTimer;
-    extern uint8_t gvarLastChanged;
-  #endif
-#else
-  #define GET_GVAR(x, ...)       (x)
-  #define GET_GVAR_PREC1(x, ...) (x*10)
-#endif
-
-#if defined(CPUARM)
-  #define GV_GET_GV1_VALUE(max)        ( (max<=GV_RANGESMALL && min>=GV_RANGESMALL_NEG) ? GV1_SMALL : GV1_LARGE )
-  #define GV_INDEX_CALCULATION(x,max)  ( (max<=GV_RANGESMALL && min>=GV_RANGESMALL_NEG) ? (uint8_t) x-GV1_SMALL : ((x&(GV1_LARGE*2-1))-GV1_LARGE) )
-  #define GV_IS_GV_VALUE(x,min,max)    ( (max>GV1_SMALL || min<-GV1_SMALL) ? (x>GV_RANGELARGE || x<GV_RANGELARGE_NEG) : (x>max) || (x<min) )
-#else
-  #define GV_GET_GV1_VALUE(max)        ( (max<=GV_RANGESMALL) ? GV1_SMALL : GV1_LARGE )
-  #define GV_INDEX_CALCULATION(x,max)  ( (max<=GV1_SMALL) ? (uint8_t) x-GV1_SMALL : ((x&(GV1_LARGE*2-1))-GV1_LARGE) )
-  #define GV_IS_GV_VALUE(x,min,max)    ( (x>max) || (x<min) )
-#endif
-
-#define GV_INDEX_CALC_DELTA(x,delta) ((x&(delta*2-1)) - delta)
-
-#define GV_CALC_VALUE_IDX_POS(idx,delta) (-delta+idx)
-#define GV_CALC_VALUE_IDX_NEG(idx,delta) (delta+idx)
-
-#define GV_RANGESMALL      (GV1_SMALL - (RESERVE_RANGE_FOR_GVARS+1))
-#define GV_RANGESMALL_NEG  (-GV1_SMALL + (RESERVE_RANGE_FOR_GVARS+1))
-#define GV_RANGELARGE      (GV1_LARGE - (RESERVE_RANGE_FOR_GVARS+1))
-#define GV_RANGELARGE_NEG  (-GV1_LARGE + (RESERVE_RANGE_FOR_GVARS+1))
-#if defined(CPUARM)
-  // the define GV1_LARGE marks the highest bit value used for this variables
-  // because this would give too big numbers for ARM, we limit it further for
-  // offset and weight
-  #define GV_RANGELARGE_WEIGHT      (GV_RANGE_WEIGHT)
-  #define GV_RANGELARGE_WEIGHT_NEG (-GV_RANGE_WEIGHT)
-  #define GV_RANGELARGE_OFFSET      (GV_RANGE_OFFSET)
-  #define GV_RANGELARGE_OFFSET_NEG (-GV_RANGE_OFFSET)
-#else
-  // for stock we just use as much as possible
-  #define GV_RANGELARGE_WEIGHT      GV_RANGELARGE
-  #define GV_RANGELARGE_WEIGHT_NEG  GV_RANGELARGE_NEG
-  #define GV_RANGELARGE_OFFSET      GV_RANGELARGE
-  #define GV_RANGELARGE_OFFSET_NEG  GV_RANGELARGE_NEG
-#endif
+#include "gvars.h"
 
 extern uint16_t sessionTimer;
 extern uint16_t s_timeCumThr;
diff --git a/radio/src/targets/simu/opentxsimulator.cpp b/radio/src/targets/simu/opentxsimulator.cpp
index d5d170f86..29f0cc348 100644
--- a/radio/src/targets/simu/opentxsimulator.cpp
+++ b/radio/src/targets/simu/opentxsimulator.cpp
@@ -134,7 +134,7 @@ void OpenTxSimulator::setValues(TxInputs &inputs)
 void OpenTxSimulator::setTrim(unsigned int idx, int value)
 {
   idx = modn12x3[4*getStickMode() + idx];
-  uint8_t phase = getTrimFlightPhase(getFlightMode(), idx);
+  uint8_t phase = getTrimFlightMode(getFlightMode(), idx);
   setTrimValue(phase, idx, value);
 }
 
@@ -143,7 +143,7 @@ void OpenTxSimulator::getTrims(Trims & trims)
   uint8_t phase = getFlightMode();
   trims.extended = hasExtendedTrims();
   for (uint8_t idx=0; idx<4; idx++) {
-    trims.values[idx] = getTrimValue(getTrimFlightPhase(phase, idx), idx);
+    trims.values[idx] = getTrimValue(getTrimFlightMode(phase, idx), idx);
   }
 
   for (int i=0; i<2; i++) {
diff --git a/radio/src/tests/mixer.cpp b/radio/src/tests/mixer.cpp
index 8ceef58dd..f06973057 100644
--- a/radio/src/tests/mixer.cpp
+++ b/radio/src/tests/mixer.cpp
@@ -330,7 +330,7 @@ TEST(Trims, greaterTrimLink)
   MODEL_RESET();
   setTrimValue(1, RUD_STICK, TRIM_EXTENDED_MAX+3); // link to FP3 trim
   setTrimValue(3, RUD_STICK, 32);
-  EXPECT_EQ(getRawTrimValue(getTrimFlightPhase(1, RUD_STICK), RUD_STICK), 32);
+  EXPECT_EQ(getRawTrimValue(getTrimFlightMode(1, RUD_STICK), RUD_STICK), 32);
 }
 
 TEST(Trims, chainedTrims)
@@ -339,7 +339,7 @@ TEST(Trims, chainedTrims)
   setTrimValue(0, RUD_STICK, 32);
   setTrimValue(1, RUD_STICK, TRIM_EXTENDED_MAX+1); // link to FP0 trim
   setTrimValue(2, RUD_STICK, TRIM_EXTENDED_MAX+2); // link to FP1 trim
-  EXPECT_EQ(getRawTrimValue(getTrimFlightPhase(0, RUD_STICK), RUD_STICK), 32);
+  EXPECT_EQ(getRawTrimValue(getTrimFlightMode(0, RUD_STICK), RUD_STICK), 32);
 }
 
 TEST(Trims, infiniteChainedTrims)
@@ -349,7 +349,7 @@ TEST(Trims, infiniteChainedTrims)
   setTrimValue(1, RUD_STICK, TRIM_EXTENDED_MAX+3); // link to FP3 trim
   setTrimValue(2, RUD_STICK, TRIM_EXTENDED_MAX+2); // link to FP1 trim
   setTrimValue(3, RUD_STICK, TRIM_EXTENDED_MAX+3); // link to FP2 trim
-  EXPECT_EQ(getRawTrimValue(getTrimFlightPhase(0, RUD_STICK), RUD_STICK), 32);
+  EXPECT_EQ(getRawTrimValue(getTrimFlightMode(0, RUD_STICK), RUD_STICK), 32);
 }
 #endif