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

feat(radio): Disable Special Functions when feature turned off (#4116)

Browse Source
This commit is contained in:
philmoz
2023-10-03 10:57:09 +10:00
committed by GitHub
parent e8077021f6
commit 776b64c469
2 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/lua/interface.cpp
+8 -2
View File
@@ -631,8 +631,12 @@ static bool luaLoadFunctionScript(uint8_t ref)
CustomFunctionData * fn;
if (ref <= SCRIPT_FUNC_LAST) {
idx = ref - SCRIPT_FUNC_FIRST;
fn = &g_model.customFn[idx];
if (modelSFEnabled()) {
idx = ref - SCRIPT_FUNC_FIRST;
fn = &g_model.customFn[idx];
} else {
return false;
}
}
else if (radioGFEnabled()) {
idx = ref - SCRIPT_GFUNC_FIRST;
@@ -1101,10 +1105,12 @@ static bool resumeLua(bool init, bool allowLcdUsage)
CustomFunctionsContext * functionsContext;
if (ref <= SCRIPT_FUNC_LAST) {
if (!modelSFEnabled()) continue;
idx = ref - SCRIPT_FUNC_FIRST;
fn = &g_model.customFn[idx];
functionsContext = &modelFunctionsContext;
} else {
if (!radioGFEnabled()) continue;
idx = ref - SCRIPT_GFUNC_FIRST;
fn = &g_eeGeneral.customFn[idx];
functionsContext = &globalFunctionsContext;