From 9a2b6689561f1c2670b50ea035328816355d92c4 Mon Sep 17 00:00:00 2001
From: Bertrand Songis <bsongis@gmail.com>
Date: Thu, 9 Jan 2014 18:53:35 +0100
Subject: [PATCH] GvarsOfsNum (er9x) removed

---
 companion/src/eeprominterface.h                      | 1 -
 companion/src/firmwares/er9x/er9xinterface.cpp       | 2 --
 companion/src/firmwares/ersky9x/ersky9xinterface.cpp | 2 --
 companion/src/firmwares/opentx/opentxinterface.cpp   | 2 --
 companion/src/helpers.cpp                            | 2 +-
 5 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/companion/src/eeprominterface.h b/companion/src/eeprominterface.h
index 2acda3b71..8c2218a00 100644
--- a/companion/src/eeprominterface.h
+++ b/companion/src/eeprominterface.h
@@ -977,7 +977,6 @@ enum Capability {
  GvarsAsSources,
  GvarsAsWeight,
  GvarsName,
- GvarsOfsNum,
  NoTelemetryProtocol,
  TelemetryCSFields,
  TelemetryColsCSFields,
diff --git a/companion/src/firmwares/er9x/er9xinterface.cpp b/companion/src/firmwares/er9x/er9xinterface.cpp
index 123ec7f3b..7ef121909 100644
--- a/companion/src/firmwares/er9x/er9xinterface.cpp
+++ b/companion/src/firmwares/er9x/er9xinterface.cpp
@@ -243,8 +243,6 @@ int Er9xInterface::getCapability(const Capability capability)
       return 12;
     case CustomAndSwitches:
         return 5;
-    case GvarsOfsNum:
-      return 5;
     case CSFunc:
       return 13;
     case Outputs:
diff --git a/companion/src/firmwares/ersky9x/ersky9xinterface.cpp b/companion/src/firmwares/ersky9x/ersky9xinterface.cpp
index 1f78a4b98..d3fba6d85 100644
--- a/companion/src/firmwares/ersky9x/ersky9xinterface.cpp
+++ b/companion/src/firmwares/ersky9x/ersky9xinterface.cpp
@@ -279,8 +279,6 @@ int Ersky9xInterface::getCapability(const Capability capability)
       return 3;
     case Gvars:
       return 7;
-    case GvarsOfsNum:
-      return 5;
     case Switches:
       return 7;
     case SwitchesPositions:
diff --git a/companion/src/firmwares/opentx/opentxinterface.cpp b/companion/src/firmwares/opentx/opentxinterface.cpp
index ee9d2583e..fbe7652bd 100644
--- a/companion/src/firmwares/opentx/opentxinterface.cpp
+++ b/companion/src/firmwares/opentx/opentxinterface.cpp
@@ -691,8 +691,6 @@ int Open9xInterface::getCapability(const Capability capability)
       return (IS_ARM(board) ? 250 : 15);
     case CSFunc:
       return 18;
-    case GvarsOfsNum:  
-      return 5;
     case HasSDLogs:
       return ((board == BOARD_GRUVIN9X || IS_ARM(board)) ? true : false);
     case LCDWidth:
diff --git a/companion/src/helpers.cpp b/companion/src/helpers.cpp
index 0bc850e09..a1e69ed04 100644
--- a/companion/src/helpers.cpp
+++ b/companion/src/helpers.cpp
@@ -814,7 +814,7 @@ void populateGVCB(QComboBox *b, int value)
   int selected=0;
   int nullitem;
   b->clear();
-  int pgvars=GetEepromInterface()->getCapability(GvarsOfsNum);
+  int pgvars = GetEepromInterface()->getCapability(Gvars);
   for (int i=-pgvars; i<=-1; i++) {
     int16_t gval = (int16_t)(-10000+i);
     b->addItem(QObject::tr("-GV%1").arg(-i), gval);