From 4d83dd2c24a5bc43c4bda0469354e72f36f7c684 Mon Sep 17 00:00:00 2001
From: Damjan Adamic <projectkk2glider@gmail.com>
Date: Sat, 15 Aug 2015 12:59:35 +0200
Subject: [PATCH] Fixes #2684: Lua model scripts outputs not working in a
 simulator

---
 companion/releasenotes.txt                    |  8 +++++++
 .../opentx/simulator/opentxsimulator.cpp      | 23 ++++++++++---------
 radio/src/mixer.cpp                           |  4 ++++
 3 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/companion/releasenotes.txt b/companion/releasenotes.txt
index f591f9256..d402dfc87 100644
--- a/companion/releasenotes.txt
+++ b/companion/releasenotes.txt
@@ -1,3 +1,11 @@
+<h2>Version 2.1.2 / <set date></h2>
+<ul>
+<li>Fixed: Lua model scripts outputs not working in a simulator (<a href=https://github.com/opentx/opentx/issues/2684>#2684</a>)</li>
+</ul>
+
+
+
+
 <h2>Version 2.1.1 / 2015-08-06</h2>
 <ul>
 <li>Vario source and center silent options were not saved(<a href=https://github.com/opentx/opentx/issues/2476>#2476</a>)</li>
diff --git a/companion/src/firmwares/opentx/simulator/opentxsimulator.cpp b/companion/src/firmwares/opentx/simulator/opentxsimulator.cpp
index 8a9fa5ccd..49421aa71 100644
--- a/companion/src/firmwares/opentx/simulator/opentxsimulator.cpp
+++ b/companion/src/firmwares/opentx/simulator/opentxsimulator.cpp
@@ -41,14 +41,15 @@
 #define GRAPHICS
 #define CURVES
 #if defined(PCBTARANIS)
-#define RTCLOCK
-#define XCURVES
-#define VIRTUALINPUTS
-#define LUA
-#define LUA_MODEL_SCRIPTS
+  #define RTCLOCK
+  #define XCURVES
+  #define VIRTUALINPUTS
+  #define LUA
+  #define LUA_MODEL_SCRIPTS
+  #define LUAINPUTS 
 #else
-#define BUZZER
-#define TEMPLATES
+  #define BUZZER
+  #define TEMPLATES
 #endif
 #define BOLD_FONT
 #define HAPTIC
@@ -61,17 +62,17 @@
 #endif
 
 #if defined(PCBSKY9X) && !defined(REVX)
-#define ROTARY_ENCODERS 1
+  #define ROTARY_ENCODERS 1
 #elif defined(PCBGRUVIN9X)
-#define ROTARY_ENCODERS 2
+  #define ROTARY_ENCODERS 2
 #endif
 
 #if defined(CPUARM)
-#define FRSKY_SPORT
+  #define FRSKY_SPORT
 #endif
 
 #if defined (PCBTARANIS)
-#define MIXERS_MONITOR
+  #define MIXERS_MONITOR
 #endif
 
 #undef min
diff --git a/radio/src/mixer.cpp b/radio/src/mixer.cpp
index fcf93f5f7..aefdb9732 100644
--- a/radio/src/mixer.cpp
+++ b/radio/src/mixer.cpp
@@ -260,7 +260,11 @@ getvalue_t getValue(mixsrc_t i)
   }
 #endif
 
+#if defined(LUAINPUTS)
   else if (i<=MIXSRC_LAST_POT) return calibratedStick[i-MIXSRC_Rud];
+#else
+  else if (i>=MIXSRC_FIRST_STICK && i<=MIXSRC_LAST_POT) return calibratedStick[i-MIXSRC_Rud];
+#endif
 
 #if defined(PCBGRUVIN9X) || defined(PCBMEGA2560) || defined(ROTARY_ENCODERS)
   else if (i<=MIXSRC_LAST_ROTARY_ENCODER) return getRotaryEncoder(i-MIXSRC_REa);