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

Add telem1-32 and lua mixer outputs to lua fields

Browse source
This commit is contained in:
3djc 2019-02-18 17:32:28 +01:00
parent 7e39b38dd8
commit 45df511b26
2 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
radio/src/dataconstants.h
View file

@ -510,7 +510,7 @@ enum MixSources {
MIXSRC_LAST_INPUT = MIXSRC_FIRST_INPUT+MAX_INPUTS-1, MIXSRC_LAST_INPUT = MIXSRC_FIRST_INPUT+MAX_INPUTS-1,
#if defined(LUA_INPUTS) #if defined(LUA_INPUTS)
MIXSRC_FIRST_LUA, MIXSRC_FIRST_LUA, LUA_EXPORT_MULTIPLE("lua", "Lua mix output %d", MAX_SCRIPTS*MAX_SCRIPT_OUTPUTS)
MIXSRC_LAST_LUA = MIXSRC_FIRST_LUA+(MAX_SCRIPTS*MAX_SCRIPT_OUTPUTS)-1, MIXSRC_LAST_LUA = MIXSRC_FIRST_LUA+(MAX_SCRIPTS*MAX_SCRIPT_OUTPUTS)-1,
#endif #endif
@ -679,7 +679,7 @@ enum MixSources {
MIXSRC_TIMER3, LUA_EXPORT("timer3", "Timer 3 value [seconds]") MIXSRC_TIMER3, LUA_EXPORT("timer3", "Timer 3 value [seconds]")
MIXSRC_LAST_TIMER = MIXSRC_TIMER3, MIXSRC_LAST_TIMER = MIXSRC_TIMER3,
MIXSRC_FIRST_TELEM, MIXSRC_FIRST_TELEM, LUA_EXPORT_MULTIPLE("telem", "Telemetry sensor %d", MAX_TELEMETRY_SENSORS)
MIXSRC_LAST_TELEM = MIXSRC_FIRST_TELEM+3*MAX_TELEMETRY_SENSORS-1 MIXSRC_LAST_TELEM = MIXSRC_FIRST_TELEM+3*MAX_TELEMETRY_SENSORS-1
}; };

5
radio/src/lua/api_general.cpp
View file

@ -303,7 +303,10 @@ bool luaFindFieldByName(const char * name, LuaField & field, unsigned int flags)
continue; continue;
} }
if (index < luaMultipleFields[n].count) { if (index < luaMultipleFields[n].count) {
field.id = luaMultipleFields[n].id + index; if(luaMultipleFields[n].id == MIXSRC_FIRST_TELEM)
field.id = luaMultipleFields[n].id + index*3;
else
field.id = luaMultipleFields[n].id + index;
if (flags & FIND_FIELD_DESC) { if (flags & FIND_FIELD_DESC) {
snprintf(field.desc, sizeof(field.desc)-1, luaMultipleFields[n].desc, index+1); snprintf(field.desc, sizeof(field.desc)-1, luaMultipleFields[n].desc, index+1);
field.desc[sizeof(field.desc)-1] = '\0'; field.desc[sizeof(field.desc)-1] = '\0';