Mirror/opentx
1
0
Fork 0
mirror of https://github.com/opentx/opentx.git synced 2025-07-25 17:25:13 +03:00
Code Issues Wiki Activity

Fixes #2684: Lua model scripts outputs not working in a simulator

Browse source
This commit is contained in:
Damjan Adamic 2015-08-15 12:59:35 +02:00
parent affda2d8fe
commit 4d83dd2c24
3 changed files with 24 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

8
companion/releasenotes.txt
View file

@ -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> <h2>Version 2.1.1 / 2015-08-06</h2>
<ul> <ul>
<li>Vario source and center silent options were not saved(<a href=https://github.com/opentx/opentx/issues/2476>#2476</a>)</li> <li>Vario source and center silent options were not saved(<a href=https://github.com/opentx/opentx/issues/2476>#2476</a>)</li>

23
companion/src/firmwares/opentx/simulator/opentxsimulator.cpp
View file

@ -41,14 +41,15 @@
#define GRAPHICS #define GRAPHICS
#define CURVES #define CURVES
#if defined(PCBTARANIS) #if defined(PCBTARANIS)
#define RTCLOCK #define RTCLOCK
#define XCURVES #define XCURVES
#define VIRTUALINPUTS #define VIRTUALINPUTS
#define LUA #define LUA
#define LUA_MODEL_SCRIPTS #define LUA_MODEL_SCRIPTS
#define LUAINPUTS
#else #else
#define BUZZER #define BUZZER
#define TEMPLATES #define TEMPLATES
#endif #endif
#define BOLD_FONT #define BOLD_FONT
#define HAPTIC #define HAPTIC
@ -61,17 +62,17 @@
#endif #endif
#if defined(PCBSKY9X) && !defined(REVX) #if defined(PCBSKY9X) && !defined(REVX)
#define ROTARY_ENCODERS 1 #define ROTARY_ENCODERS 1
#elif defined(PCBGRUVIN9X) #elif defined(PCBGRUVIN9X)
#define ROTARY_ENCODERS 2 #define ROTARY_ENCODERS 2
#endif #endif
#if defined(CPUARM) #if defined(CPUARM)
#define FRSKY_SPORT #define FRSKY_SPORT
#endif #endif
#if defined (PCBTARANIS) #if defined (PCBTARANIS)
#define MIXERS_MONITOR #define MIXERS_MONITOR
#endif #endif
#undef min #undef min

4
radio/src/mixer.cpp
View file

@ -260,7 +260,11 @@ getvalue_t getValue(mixsrc_t i)
} }
#endif #endif
#if defined(LUAINPUTS)
else if (i<=MIXSRC_LAST_POT) return calibratedStick[i-MIXSRC_Rud]; 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) #if defined(PCBGRUVIN9X) || defined(PCBMEGA2560) || defined(ROTARY_ENCODERS)
else if (i<=MIXSRC_LAST_ROTARY_ENCODER) return getRotaryEncoder(i-MIXSRC_REa); else if (i<=MIXSRC_LAST_ROTARY_ENCODER) return getRotaryEncoder(i-MIXSRC_REa);