Merge remote-tracking branch 'origin/next' into

bsongis/Lua_interpreter_171

Conflicts:
	companion/src/firmwares/opentx/opentxeeprom.cpp
This commit is contained in:
Bertrand Songis
2014-02-10 17:57:40 +01:00
24 changed files with 736 additions and 311 deletions
+6 -1
View File
@@ -894,8 +894,12 @@ class ModelData {
SwashRingData swashRingData;
unsigned int thrTraceSrc;
int8_t traineron; // 0 disable trainer, 1 allow trainer
unsigned int modelId;
unsigned int modelId;
unsigned int switchWarningStates;
unsigned int nSwToWarn;
unsigned int nPotsToWarn;
int potPosition[C9X_NUM_POTS];
bool displayText;
// TODO structure
char gvars_names[C9X_MAX_GVARS][6+1];
bool gvars_popups[C9X_MAX_GVARS];
@@ -1043,6 +1047,7 @@ enum Capability {
CSFunc,
LCDWidth,
GetThrSwitch,
HasDisplayText,
VirtualInputs,
LuaInputs,
LimitsPer1000,