From cbe0dc60e6091ce12f407d75642c9e7c263a2971 Mon Sep 17 00:00:00 2001 From: 3djc Date: Wed, 25 Jan 2017 04:09:53 -0800 Subject: [PATCH] Enable LUA_COMPILER (#4283) Added Companon firmware option luac --- companion/src/firmwares/opentx/opentxinterface.cpp | 1 + radio/util/fwoptions.py | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/companion/src/firmwares/opentx/opentxinterface.cpp b/companion/src/firmwares/opentx/opentxinterface.cpp index c3b333cab..80bdeec66 100644 --- a/companion/src/firmwares/opentx/opentxinterface.cpp +++ b/companion/src/firmwares/opentx/opentxinterface.cpp @@ -1173,6 +1173,7 @@ void addOpenTxFrskyOptions(OpenTxFirmware * firmware) firmware->addOption("noheli", QObject::tr("Disable HELI menu and cyclic mix support")); firmware->addOption("nogvars", QObject::tr("Disable Global variables")); firmware->addOption("lua", QObject::tr("Support for Lua model scripts")); + firmware->addOption("luac", QObject::tr("Enable Lua compiler")); Option usb_options[] = {{"massstorage", QObject::tr("Instead of Joystick emulation, USB connection is Mass Storage (as in the Bootloader)")}, {"cli", QObject::tr("Instead of Joystick emulation, USB connection is Command Line Interface")}, {NULL}}; diff --git a/radio/util/fwoptions.py b/radio/util/fwoptions.py index d3185f54c..0a92093ff 100755 --- a/radio/util/fwoptions.py +++ b/radio/util/fwoptions.py @@ -235,6 +235,7 @@ options_taranis = { "noheli": ("HELI", "NO", "YES"), "ppmus": ("PPM_UNIT", "US", "PERCENT_PREC1"), "lua": ("LUA", "YES", "NO_MODEL_SCRIPTS"), + "luac": ("LUA_COMPILER", "YES", "NO"), "haptic": ("HAPTIC", "YES", "NO"), "nogvars": ("GVARS", "NO", "YES"), "sqt5font": ("FONT", "SQT5", None), @@ -254,6 +255,7 @@ options_taranisplus = { "noheli": ("HELI", "NO", "YES"), "ppmus": ("PPM_UNIT", "US", "PERCENT_PREC1"), "lua": ("LUA", "YES", "NO_MODEL_SCRIPTS"), + "luac": ("LUA_COMPILER", "YES", "NO"), "SWR": ("SWR", "YES", "NO"), "nogvars": ("GVARS", "NO", "YES"), "sqt5font": ("FONT", "SQT5", None), @@ -273,6 +275,7 @@ options_taranisx9e = { "noheli": ("HELI", "NO", "YES"), "ppmus": ("PPM_UNIT", "US", "PERCENT_PREC1"), "lua": ("LUA", "YES", "NO_MODEL_SCRIPTS"), + "luac": ("LUA_COMPILER", "YES", "NO"), "SWR": ("SWR", "YES", "NO"), "nogvars": ("GVARS", "NO", "YES"), "sqt5font": ("FONT", "SQT5", None), @@ -293,6 +296,7 @@ options_horus = { "noheli": ("HELI", "NO", "YES"), "ppmus": ("PPM_UNIT", "US", "PERCENT_PREC1"), "lua": ("LUA", "YES", "NO_MODEL_SCRIPTS"), + "luac": ("LUA_COMPILER", "YES", "NO"), "nogvars": ("GVARS", "NO", "YES"), "faimode": ("FAI", "YES", None), "faichoice": ("FAI", "CHOICE", None),