Mirror/opentx
1
0
Fork 0
mirror of https://github.com/opentx/opentx.git synced 2025-07-20 23:05:12 +03:00
Code Issues Wiki Activity

Lua exports fixes:

Browse source 
* X9E fields were missing
 * inputs were missing
 * renamed X9E center sliders, which name collided with logical switches
This commit is contained in:
Damjan Adamic 2015-11-30 18:41:31 +01:00
parent 638f48e58a
commit 5d7cc79db8
2 changed files with 14 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

2
radio/src/Makefile
View file

@ -1664,7 +1664,7 @@ lua/lua_exports.inc lua_fields.txt: lua_exports.dummy
lua_exports.dummy: myeeprom.h ../util/luaexport.py lua_exports.dummy: myeeprom.h ../util/luaexport.py
@echo "Generating a list of Lua exported constants in lua_exports.txt" @echo "Generating a list of Lua exported constants in lua_exports.txt"
@$(PARSER) -DPCBTARANIS -DCPUARM -DCPUSTM32 -DLUA -DEXPORT myeeprom.h | grep LEXP > lua_exports.txt @$(PARSER) -DPCBTARANIS -DREV9E -DCPUARM -DCPUSTM32 -DLUA -DEXPORT -DVIRTUALINPUTS myeeprom.h | grep LEXP > lua_exports.txt
@echo "Parsing and generating C Lua exports in lua/lua_exports.inc" @echo "Parsing and generating C Lua exports in lua/lua_exports.inc"
@$(PYTHON) ../util/luaexport.py $(VERSION) lua_exports.txt lua/lua_exports.inc lua_fields.txt @$(PYTHON) ../util/luaexport.py $(VERSION) lua_exports.txt lua/lua_exports.inc lua_fields.txt
@rm lua_exports.txt @rm lua_exports.txt

26
radio/src/myeeprom.h
View file

@ -1804,14 +1804,14 @@ enum MixSources {
MIXSRC_POT2, LUA_EXPORT("s2", "Potentiometer 2") MIXSRC_POT2, LUA_EXPORT("s2", "Potentiometer 2")
MIXSRC_POT3, LUA_EXPORT("s3", "Potentiometer 3") MIXSRC_POT3, LUA_EXPORT("s3", "Potentiometer 3")
#if defined(REV9E) #if defined(REV9E)
MIXSRC_POT4, LUA_EXPORT("s4", "Potentiometer 4") MIXSRC_POT4, LUA_EXPORT("s4", "Potentiometer 4 (X9E only)")
#endif #endif
MIXSRC_FIRST_SLIDER, MIXSRC_FIRST_SLIDER,
MIXSRC_SLIDER1 = MIXSRC_FIRST_SLIDER, LUA_EXPORT("ls", "Left slider") MIXSRC_SLIDER1 = MIXSRC_FIRST_SLIDER, LUA_EXPORT("ls", "Left slider")
MIXSRC_SLIDER2, LUA_EXPORT("rs", "Right slider") MIXSRC_SLIDER2, LUA_EXPORT("rs", "Right slider")
#if defined(REV9E) #if defined(REV9E)
MIXSRC_SLIDER3, LUA_EXPORT("ls2", "Left center slider") MIXSRC_SLIDER3, LUA_EXPORT("lcs", "Left center slider (X9E only)")
MIXSRC_SLIDER4, LUA_EXPORT("rs2", "Right center slider") MIXSRC_SLIDER4, LUA_EXPORT("rcs", "Right center slider (X9E only)")
MIXSRC_LAST_POT = MIXSRC_SLIDER4, MIXSRC_LAST_POT = MIXSRC_SLIDER4,
#else #else
MIXSRC_LAST_POT = MIXSRC_SLIDER2, MIXSRC_LAST_POT = MIXSRC_SLIDER2,
@ -1864,16 +1864,16 @@ enum MixSources {
MIXSRC_SG, LUA_EXPORT("sg", "Switch G") MIXSRC_SG, LUA_EXPORT("sg", "Switch G")
MIXSRC_SH, LUA_EXPORT("sh", "Switch H") MIXSRC_SH, LUA_EXPORT("sh", "Switch H")
#if defined(REV9E) #if defined(REV9E)
MIXSRC_SI, LUA_EXPORT("si", "Switch I") MIXSRC_SI, LUA_EXPORT("si", "Switch I (X9E only)")
MIXSRC_SJ, LUA_EXPORT("sj", "Switch J") MIXSRC_SJ, LUA_EXPORT("sj", "Switch J (X9E only)")
MIXSRC_SK, LUA_EXPORT("sk", "Switch K") MIXSRC_SK, LUA_EXPORT("sk", "Switch K (X9E only)")
MIXSRC_SL, LUA_EXPORT("sl", "Switch L") MIXSRC_SL, LUA_EXPORT("sl", "Switch L (X9E only)")
MIXSRC_SM, LUA_EXPORT("sm", "Switch M") MIXSRC_SM, LUA_EXPORT("sm", "Switch M (X9E only)")
MIXSRC_SN, LUA_EXPORT("sn", "Switch N") MIXSRC_SN, LUA_EXPORT("sn", "Switch N (X9E only)")
MIXSRC_SO, LUA_EXPORT("so", "Switch O") MIXSRC_SO, LUA_EXPORT("so", "Switch O (X9E only)")
MIXSRC_SP, LUA_EXPORT("sp", "Switch P") MIXSRC_SP, LUA_EXPORT("sp", "Switch P (X9E only)")
MIXSRC_SQ, LUA_EXPORT("sq", "Switch Q") MIXSRC_SQ, LUA_EXPORT("sq", "Switch Q (X9E only)")
MIXSRC_SR, LUA_EXPORT("sr", "Switch R") MIXSRC_SR, LUA_EXPORT("sr", "Switch R (X9E only)")
MIXSRC_LAST_SWITCH = MIXSRC_SR, MIXSRC_LAST_SWITCH = MIXSRC_SR,
#else #else
MIXSRC_LAST_SWITCH = MIXSRC_SH, MIXSRC_LAST_SWITCH = MIXSRC_SH,