From 4597b7bced5811af584b126962587fb3ed0d0105 Mon Sep 17 00:00:00 2001 From: 3djc Date: Thu, 18 Jul 2024 09:32:30 +0200 Subject: [PATCH] feat: LUA_MIXER ON for all radios (#5303) --- radio/src/CMakeLists.txt | 3 +-- radio/src/targets/horus/CMakeLists.txt | 1 - radio/src/targets/nv14/CMakeLists.txt | 1 - radio/src/targets/pl18/CMakeLists.txt | 1 - radio/src/targets/taranis/CMakeLists.txt | 1 - 5 files changed, 1 insertion(+), 6 deletions(-) diff --git a/radio/src/CMakeLists.txt b/radio/src/CMakeLists.txt index 0c6f11a8b..2350459ab 100644 --- a/radio/src/CMakeLists.txt +++ b/radio/src/CMakeLists.txt @@ -56,6 +56,7 @@ option(HARDWARE_TRAINER_MULTI "Allow multi trainer" OFF) option(BOOTLOADER "Include Bootloader" ON) option(FWDRIVE "Attach also firmware drive with USB" OFF) option(DISABLE_MCUCHECK "Disable MCU check at start" OFF) +option(LUA_MIXER "Enable LUA mixer/model scripts support" ON) if(PCB STREQUAL X9D+ AND PCBREV STREQUAL 2019) option(USBJ_EX "Enable USB Joystick Extension" OFF) @@ -177,8 +178,6 @@ if(RTC_BACKUP_RAM) add_custom_target(datacopy DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/datacopy.inc) 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() diff --git a/radio/src/targets/horus/CMakeLists.txt b/radio/src/targets/horus/CMakeLists.txt index c96d83a31..a43feb56c 100644 --- a/radio/src/targets/horus/CMakeLists.txt +++ b/radio/src/targets/horus/CMakeLists.txt @@ -8,7 +8,6 @@ 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 cad71d028..642e872a9 100644 --- a/radio/src/targets/nv14/CMakeLists.txt +++ b/radio/src/targets/nv14/CMakeLists.txt @@ -6,7 +6,6 @@ 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) diff --git a/radio/src/targets/pl18/CMakeLists.txt b/radio/src/targets/pl18/CMakeLists.txt index 2778bcba3..b6707c87b 100644 --- a/radio/src/targets/pl18/CMakeLists.txt +++ b/radio/src/targets/pl18/CMakeLists.txt @@ -5,7 +5,6 @@ option(AFHDS3 "AFHDS3 TX Module" ON) option(MULTIMODULE "DIY Multiprotocol TX Module (https://github.com/pascallanger/DIY-Multiprotocol-TX-Module)" ON) option(GHOST "Ghost TX Module" ON) 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/taranis/CMakeLists.txt b/radio/src/targets/taranis/CMakeLists.txt index fdd3ba0b6..290a02c72 100644 --- a/radio/src/targets/taranis/CMakeLists.txt +++ b/radio/src/targets/taranis/CMakeLists.txt @@ -266,7 +266,6 @@ elseif(PCB STREQUAL X7) add_definitions(-DMANUFACTURER_RADIOMASTER) set(PXX2 ON) set(ENABLE_SERIAL_PASSTHROUGH ON CACHE BOOL "Enable serial passthrough") - set(LUA_MIXER YES) set(FLEXSW "2" CACHE STRING "Max flex inputs usable as switches") if (NOT BLUETOOTH) set(AUX_SERIAL ON)