From 45df511b261ad59cb800ce3c67054d26f7be4915 Mon Sep 17 00:00:00 2001 From: 3djc Date: Mon, 18 Feb 2019 17:32:28 +0100 Subject: [PATCH] Add telem1-32 and lua mixer outputs to lua fields --- radio/src/dataconstants.h | 4 ++-- radio/src/lua/api_general.cpp | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/radio/src/dataconstants.h b/radio/src/dataconstants.h index 5eb277c9a..77c7bdbd4 100644 --- a/radio/src/dataconstants.h +++ b/radio/src/dataconstants.h @@ -510,7 +510,7 @@ enum MixSources { MIXSRC_LAST_INPUT = MIXSRC_FIRST_INPUT+MAX_INPUTS-1, #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, #endif @@ -679,7 +679,7 @@ enum MixSources { MIXSRC_TIMER3, LUA_EXPORT("timer3", "Timer 3 value [seconds]") 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 }; diff --git a/radio/src/lua/api_general.cpp b/radio/src/lua/api_general.cpp index 7ed606df5..9716e69cc 100644 --- a/radio/src/lua/api_general.cpp +++ b/radio/src/lua/api_general.cpp @@ -303,7 +303,10 @@ bool luaFindFieldByName(const char * name, LuaField & field, unsigned int flags) continue; } 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) { snprintf(field.desc, sizeof(field.desc)-1, luaMultipleFields[n].desc, index+1); field.desc[sizeof(field.desc)-1] = '\0';