From 085cb2551d3549d135275998a6ae39d5ab9a635e Mon Sep 17 00:00:00 2001 From: 3djc Date: Wed, 1 May 2019 08:45:31 +0200 Subject: [PATCH] Fix LUA exports for xliteS/Pro This fixes #6405 --- radio/src/dataconstants.h | 2 +- radio/src/lua/CMakeLists.txt | 1 + radio/src/lua/api_general.cpp | 2 ++ radio/src/targets/taranis/CMakeLists.txt | 2 +- 4 files changed, 5 insertions(+), 2 deletions(-) diff --git a/radio/src/dataconstants.h b/radio/src/dataconstants.h index db963f9ef..fdca1bcbd 100644 --- a/radio/src/dataconstants.h +++ b/radio/src/dataconstants.h @@ -564,7 +564,7 @@ enum MixSources { MIXSRC_SLIDER3, LUA_EXPORT("lcs", "Left center slider (X9E only)") MIXSRC_SLIDER4, LUA_EXPORT("rcs", "Right center slider (X9E only)") MIXSRC_LAST_POT = MIXSRC_SLIDER4, -#elif defined(PCBX7) || defined(PCBXLITE) +#elif defined(PCBX7) || defined(PCBXLITE) || defined(PCBXLITES) MIXSRC_POT1 = MIXSRC_FIRST_POT, LUA_EXPORT("s1", "Potentiometer 1") MIXSRC_POT2, LUA_EXPORT("s2", "Potentiometer 2") MIXSRC_LAST_POT = MIXSRC_POT2, diff --git a/radio/src/lua/CMakeLists.txt b/radio/src/lua/CMakeLists.txt index 6bfd035d1..2c4695c72 100644 --- a/radio/src/lua/CMakeLists.txt +++ b/radio/src/lua/CMakeLists.txt @@ -37,6 +37,7 @@ if(PYTHONINTERP_FOUND) add_lua_export_target(x3 ${LUA_INCLUDES_STM32F2} -DPCBTARANIS -DPCBX3) add_lua_export_target(x7 ${LUA_INCLUDES_STM32F2} -DPCBTARANIS -DPCBX7) add_lua_export_target(xlite ${LUA_INCLUDES_STM32F2} -DPCBTARANIS -DPCBXLITE) + add_lua_export_target(xlites ${LUA_INCLUDES_STM32F2} -DPCBTARANIS -DPCBXLITES) add_lua_export_target(x9d ${LUA_INCLUDES_STM32F2} -DPCBTARANIS -DPCBX9D) add_lua_export_target(x9e ${LUA_INCLUDES_STM32F4} -DPCBTARANIS -DPCBX9E -DSTM32F40_41xxx) add_lua_export_target(x10 ${LUA_INCLUDES_STM32F4} -DPCBHORUS -DPCBX10 -DSTM32F40_41xxx) diff --git a/radio/src/lua/api_general.cpp b/radio/src/lua/api_general.cpp index abf069b60..e38095b4e 100644 --- a/radio/src/lua/api_general.cpp +++ b/radio/src/lua/api_general.cpp @@ -35,6 +35,8 @@ #include "lua/lua_exports_x7.inc" #elif defined(PCBX3) #include "lua/lua_exports_x3.inc" +#elif defined(PCBXLITES) + #include "lua/lua_exports_xlites.inc" #elif defined(PCBXLITE) #include "lua/lua_exports_xlite.inc" #elif defined(PCBTARANIS) diff --git a/radio/src/targets/taranis/CMakeLists.txt b/radio/src/targets/taranis/CMakeLists.txt index e514de5a8..51aeaba61 100644 --- a/radio/src/targets/taranis/CMakeLists.txt +++ b/radio/src/targets/taranis/CMakeLists.txt @@ -132,7 +132,7 @@ elseif(PCB STREQUAL XLITES) set(CPU_TYPE_FULL STM32F205xE) # for size report set(LINKER_SCRIPT targets/taranis/stm32f2_flash.ld) set(HAPTIC YES) - set(LUA_EXPORT lua_export_xlite) + set(LUA_EXPORT lua_export_xlites) set(FLAVOUR xlites) add_definitions(-DPCBXLITES -DPCBXLITE -DSOFTWARE_VOLUME -DEXTERNAL_ANTENNA -DSTICKS_PWM) add_definitions(-DEEPROM_VARIANT=0x1000)