From 78f36a02b4b3a7fb5de5e87b55ef7a5cc41a01cf Mon Sep 17 00:00:00 2001
From: Andre Bernet <andre@andrebernet.ch>
Date: Sat, 15 Mar 2014 16:30:33 +0100
Subject: [PATCH] Fixes #793

---
 companion/src/firmwares/opentx/opentxSky9xsimulator.cpp   | 1 +
 companion/src/firmwares/opentx/opentxTaranisSimulator.cpp | 5 ++---
 companion/src/firmwares/opentx/opentxsimulator.cpp        | 2 ++
 companion/src/simulation/simulatordialog.cpp              | 1 +
 companion/src/simulation/simulatorinterface.h             | 2 +-
 5 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/companion/src/firmwares/opentx/opentxSky9xsimulator.cpp b/companion/src/firmwares/opentx/opentxSky9xsimulator.cpp
index e17a14be3..6abd60971 100644
--- a/companion/src/firmwares/opentx/opentxSky9xsimulator.cpp
+++ b/companion/src/firmwares/opentx/opentxSky9xsimulator.cpp
@@ -54,6 +54,7 @@
 #define GPS
 #define FAI_CHOICE
 
+#define NUM_POTS  3
 #define EEPROM_VARIANT 3
 
 #undef min
diff --git a/companion/src/firmwares/opentx/opentxTaranisSimulator.cpp b/companion/src/firmwares/opentx/opentxTaranisSimulator.cpp
index f147e1fc5..f809b3447 100644
--- a/companion/src/firmwares/opentx/opentxTaranisSimulator.cpp
+++ b/companion/src/firmwares/opentx/opentxTaranisSimulator.cpp
@@ -54,6 +54,8 @@
 #define LUA_MODEL_SCRIPTS
 #define EEPROM_VARIANT 3
 
+#define NUM_POTS  5
+
 #undef min
 #undef max
 
@@ -152,9 +154,6 @@ int16_t g_anas[NUM_STICKS+5];
 
 uint16_t anaIn(uint8_t chan)
 {
-  if (chan == 8)
-    return 1800;
-  else
     return g_anas[chan];
 }
 
diff --git a/companion/src/firmwares/opentx/opentxsimulator.cpp b/companion/src/firmwares/opentx/opentxsimulator.cpp
index dfb7025ea..1841d22b7 100644
--- a/companion/src/firmwares/opentx/opentxsimulator.cpp
+++ b/companion/src/firmwares/opentx/opentxsimulator.cpp
@@ -53,6 +53,8 @@
 #define EEPROM_VARIANT SIMU_STOCK_VARIANTS
 #define GAUGES
 
+#define NUM_POTS  3
+
 #undef min
 #undef max
 
diff --git a/companion/src/simulation/simulatordialog.cpp b/companion/src/simulation/simulatordialog.cpp
index 597edfe35..466d59a62 100644
--- a/companion/src/simulation/simulatordialog.cpp
+++ b/companion/src/simulation/simulatordialog.cpp
@@ -515,6 +515,7 @@ void SimulatorDialogTaranis::getValues()
     {
       -ui->dialP_1->value(),
       ui->dialP_2->value(),
+      0,
       -ui->dialP_3->value(),
       ui->dialP_4->value()
     },
diff --git a/companion/src/simulation/simulatorinterface.h b/companion/src/simulation/simulatorinterface.h
index 2b2e76187..744984ebb 100644
--- a/companion/src/simulation/simulatorinterface.h
+++ b/companion/src/simulation/simulatorinterface.h
@@ -21,7 +21,7 @@
 
 struct TxInputs {
     int  sticks[NUM_STICKS]; /* lh lv rv rh */
-    int  pots[4]; /* TODO NUM_POTS */
+    int  pots[5]; /* TODO NUM_POTS */
     int  switches[10]; /* TODO NUM_SWITCHES */
     bool keys[6]; /* TODO NUM_KEYS */
     bool rotenc;