diff --git a/radio/src/CMakeLists.txt b/radio/src/CMakeLists.txt index 890b80730..2bdd9c8a0 100644 --- a/radio/src/CMakeLists.txt +++ b/radio/src/CMakeLists.txt @@ -36,7 +36,6 @@ if(SDL2_FOUND) option(SIMU_AUDIO "Enable simulator audio." ON) endif() option(LUA "Enable LUA support" ON) -option(LUA_MIXER "Enable LUA mixer/model scripts support" OFF) option(SIMU_DISKIO "Enable disk IO simulation in simulator. Simulator will use FatFs module and simulated IO layer that uses \"./sdcard.image\" file as image of SD card. This file must contain whole SD card from first to last sector" OFF) option(SIMU_LUA_COMPILER "Pre-compile and save Lua scripts in simulator." ON) option(FAS_PROTOTYPE "Support of old FAS prototypes (different resistors)" OFF) @@ -180,14 +179,16 @@ if(RTC_BACKUP_RAM) add_custom_target(datacopy DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/datacopy.inc) endif() -if(LUA) - include(lua/CMakeLists.txt) -endif() +option(LUA_MIXER "Enable LUA mixer/model scripts support" OFF) if (LUA_MIXER AND NOT LUA) message(FATAL_ERROR "LUA_MIXER requires LUA!!") endif() +if(LUA) + include(lua/CMakeLists.txt) +endif() + if(HELI) add_definitions(-DHELI) endif() diff --git a/radio/src/model_init.cpp b/radio/src/model_init.cpp index 5d190f49f..4eebb7330 100644 --- a/radio/src/model_init.cpp +++ b/radio/src/model_init.cpp @@ -132,10 +132,8 @@ void applyDefaultTemplate() g_model.switchWarningState |= (1 << (3 * i)); } #endif - } - void setModelDefaults(uint8_t id) { memset(&g_model, 0, sizeof(g_model)); @@ -149,7 +147,7 @@ void setModelDefaults(uint8_t id) #endif strAppendUnsigned(strAppend(g_model.header.name, STR_MODEL), id, 2); -#if defined(LUA) && defined(PCBTARANIS) // Horus uses menuModelWizard() for wizard +#if defined(LUA) && defined(PCBTARANIS) if (isFileAvailable(WIZARD_PATH "/" WIZARD_NAME)) { f_chdir(WIZARD_PATH); luaExec(WIZARD_NAME); diff --git a/radio/src/opentx.cpp b/radio/src/opentx.cpp index 40fdf6f42..91fc18d41 100644 --- a/radio/src/opentx.cpp +++ b/radio/src/opentx.cpp @@ -353,6 +353,9 @@ void generalDefault() g_eeGeneral.audioMuteEnable = 1; #endif + // disable Custom Script + g_eeGeneral.modelCustomScriptsDisabled = true; + g_eeGeneral.chkSum = 0xFFFF; } diff --git a/radio/src/storage/sdcard_common.cpp b/radio/src/storage/sdcard_common.cpp index 4695dfd15..6d3708fb8 100644 --- a/radio/src/storage/sdcard_common.cpp +++ b/radio/src/storage/sdcard_common.cpp @@ -180,6 +180,10 @@ void storageReadAll() modelslist.clear(); #endif + // Some radio defaults overriden by config loading: + // - screens disabled by default: + g_eeGeneral.modelCustomScriptsDisabled = true; + if (loadRadioSettings() != nullptr) { storageEraseAll(true); } diff --git a/radio/src/targets/horus/CMakeLists.txt b/radio/src/targets/horus/CMakeLists.txt index 47a5e49f8..843ec6bf3 100644 --- a/radio/src/targets/horus/CMakeLists.txt +++ b/radio/src/targets/horus/CMakeLists.txt @@ -8,6 +8,7 @@ option(MULTIMODULE "DIY Multiprotocol TX Module (https://github.com/pascallanger option(GHOST "Ghost TX Module" ON) option(SPACEMOUSE "Support for SpaceMouse" OFF) option(MODULE_SIZE_STD "Standard size TX Module" ON) +option(LUA_MIXER "Enable LUA mixer/model scripts support" ON) set(PWR_BUTTON "PRESS" CACHE STRING "Pwr button type (PRESS/SWITCH)") set(CPU_TYPE STM32F4) diff --git a/radio/src/targets/nv14/CMakeLists.txt b/radio/src/targets/nv14/CMakeLists.txt index 74f4c28b0..c90b1883a 100644 --- a/radio/src/targets/nv14/CMakeLists.txt +++ b/radio/src/targets/nv14/CMakeLists.txt @@ -7,6 +7,7 @@ option(GHOST "Ghost TX Module" ON) option(PXX1 "PXX1 protocol support" ON) option(PXX2 "PXX2 protocol support" OFF) option(MODULE_SIZE_STD "Standard size TX Module" ON) +option(LUA_MIXER "Enable LUA mixer/model scripts support" ON) set(PWR_BUTTON "PRESS" CACHE STRING "Pwr button type (PRESS/SWITCH)") set(CPU_TYPE STM32F4)