From 40a391d7782f74f83708217a7be8189fc8e8e82f Mon Sep 17 00:00:00 2001
From: bsongis <bsongis@gmail.com>
Date: Sat, 21 Jun 2014 11:06:58 +0200
Subject: [PATCH] dTE min/max wrong in Logical Switches (Companion). GVARS
 min/max wrong in Logical Switches (Firmware and Companion)

---
 companion/src/eeprominterface.cpp | 10 ++++++++++
 radio/src/gui/menu_model.cpp      | 10 +++++++++-
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/companion/src/eeprominterface.cpp b/companion/src/eeprominterface.cpp
index 7cb6508d3..00ad171ae 100644
--- a/companion/src/eeprominterface.cpp
+++ b/companion/src/eeprominterface.cpp
@@ -150,6 +150,8 @@ RawSourceRange RawSource::getRange(const ModelData & model, const GeneralSetting
           break;
         }
         case TELEMETRY_SOURCE_ALT:
+        case TELEMETRY_SOURCE_ALT_MIN:
+        case TELEMETRY_SOURCE_ALT_MAX:
         case TELEMETRY_SOURCE_GPS_ALT:
           result.step = singleprec ? 8 : 1;
           result.min = -500;
@@ -211,6 +213,9 @@ RawSourceRange RawSource::getRange(const ModelData & model, const GeneralSetting
           result.decimals = 1;
           result.unit = QObject::tr("m/s");
           break;
+        case TELEMETRY_SOURCE_DTE:
+          result.max = 30000;
+          break;
         case TELEMETRY_SOURCE_DIST:
         case TELEMETRY_SOURCE_DIST_MAX:
           result.step = singleprec ? 8 : 1;
@@ -280,6 +285,11 @@ RawSourceRange RawSource::getRange(const ModelData & model, const GeneralSetting
       }
       break;
 
+    case SOURCE_TYPE_GVAR:
+      result.max = 1024;
+      result.min = -result.max;
+      break;
+
     default:
       result.max = (model.extendedLimits ? 125 : 100);
       result.min = -result.max;
diff --git a/radio/src/gui/menu_model.cpp b/radio/src/gui/menu_model.cpp
index 5f1fd33f4..350cebcde 100644
--- a/radio/src/gui/menu_model.cpp
+++ b/radio/src/gui/menu_model.cpp
@@ -4716,7 +4716,15 @@ void menuModelLogicalSwitches(uint8_t event)
       }
       else {
         lcd_outdezAtt(CSW_3RD_COLUMN, y, cs->v2, LEFT|attr2);
-        v2_min = -125; v2_max = 125;
+#if defined(CPUARM) && defined(GVARS)
+        if (v1_val >= MIXSRC_GVAR1) {
+          v2_min = -1024; v2_max = +1024;
+        }
+        else
+#endif
+        {
+          v2_min = -125; v2_max = +125;
+        }
       }
 #else
       if (v1_val >= MIXSRC_FIRST_TELEM) {