piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

fix: Lua - Changed getSwitch* so can also get "One" and "ON" switch positions (#1720)

Browse Source 
Use `ModelCustomFunctionsContext` instead of `LogicalSwitchesContext` to get "One" and "ON" switch positions
This commit is contained in:
Jesper Frickmann
2022-03-23 19:09:43 +10:00
committed by GitHub
parent 6bb11a3b68
commit cdda903a25
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/lua/api_general.cpp
+4 -4
View File
@@ -2169,7 +2169,7 @@ static int luaGetSwitchIndex(lua_State * L)
}
for (idx = SWSRC_NONE; idx < SWSRC_COUNT; idx++) {
if (isSwitchAvailableInLogicalSwitches(idx)) {
if (isSwitchAvailable(idx, ModelCustomFunctionsContext)) {
char* s = getSwitchPositionName(idx);
if (!strncasecmp(s, name, 31)) {
found = true;
@@ -2203,7 +2203,7 @@ static int luaGetSwitchIndex(lua_State * L)
static int luaGetSwitchName(lua_State * L)
{
swsrc_t idx = luaL_checkinteger(L, 1);
if (idx > -SWSRC_COUNT && idx < SWSRC_COUNT && isSwitchAvailableInLogicalSwitches(idx)) {
if (idx > -SWSRC_COUNT && idx < SWSRC_COUNT && isSwitchAvailable(idx, ModelCustomFunctionsContext)) {
char* name = getSwitchPositionName(idx);
lua_pushstring(L, name);
}
@@ -2226,7 +2226,7 @@ static int luaGetSwitchName(lua_State * L)
static int luaGetSwitchValue(lua_State * L)
{
swsrc_t idx = luaL_checkinteger(L, 1);
if (idx > -SWSRC_COUNT && idx < SWSRC_COUNT && isSwitchAvailableInLogicalSwitches(idx))
if (idx > -SWSRC_COUNT && idx < SWSRC_COUNT && isSwitchAvailable(idx, ModelCustomFunctionsContext))
lua_pushboolean(L, getSwitch(idx));
else
lua_pushnil(L);
@@ -2251,7 +2251,7 @@ static int luaNextSwitch(lua_State * L)
swsrc_t idx = luaL_checkinteger(L, 2);
while (++idx <= last) {
if (isSwitchAvailableInLogicalSwitches(idx)) {
if (isSwitchAvailable(idx, ModelCustomFunctionsContext)) {
char* name = getSwitchPositionName(idx);
lua_pushinteger(L, idx);
lua_pushstring(L, name);