Mirror/opentx
1
0
Fork 0
mirror of https://github.com/opentx/opentx.git synced 2025-07-24 16:55:20 +03:00
Code Issues Wiki Activity

Fix LUA exports for xliteS/Pro

Browse source 
This fixes #6405
This commit is contained in:
3djc 2019-05-01 08:45:31 +02:00
parent d50f26f19e
commit 085cb2551d
4 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
radio/src/dataconstants.h
View file

@ -564,7 +564,7 @@ enum MixSources {
MIXSRC_SLIDER3, LUA_EXPORT("lcs", "Left center slider (X9E only)") MIXSRC_SLIDER3, LUA_EXPORT("lcs", "Left center slider (X9E only)")
MIXSRC_SLIDER4, LUA_EXPORT("rcs", "Right center slider (X9E only)") MIXSRC_SLIDER4, LUA_EXPORT("rcs", "Right center slider (X9E only)")
MIXSRC_LAST_POT = MIXSRC_SLIDER4, 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_POT1 = MIXSRC_FIRST_POT, LUA_EXPORT("s1", "Potentiometer 1")
MIXSRC_POT2, LUA_EXPORT("s2", "Potentiometer 2") MIXSRC_POT2, LUA_EXPORT("s2", "Potentiometer 2")
MIXSRC_LAST_POT = MIXSRC_POT2, MIXSRC_LAST_POT = MIXSRC_POT2,

1
radio/src/lua/CMakeLists.txt
View file

@ -37,6 +37,7 @@ if(PYTHONINTERP_FOUND)
add_lua_export_target(x3 ${LUA_INCLUDES_STM32F2} -DPCBTARANIS -DPCBX3) add_lua_export_target(x3 ${LUA_INCLUDES_STM32F2} -DPCBTARANIS -DPCBX3)
add_lua_export_target(x7 ${LUA_INCLUDES_STM32F2} -DPCBTARANIS -DPCBX7) add_lua_export_target(x7 ${LUA_INCLUDES_STM32F2} -DPCBTARANIS -DPCBX7)
add_lua_export_target(xlite ${LUA_INCLUDES_STM32F2} -DPCBTARANIS -DPCBXLITE) 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(x9d ${LUA_INCLUDES_STM32F2} -DPCBTARANIS -DPCBX9D)
add_lua_export_target(x9e ${LUA_INCLUDES_STM32F4} -DPCBTARANIS -DPCBX9E -DSTM32F40_41xxx) add_lua_export_target(x9e ${LUA_INCLUDES_STM32F4} -DPCBTARANIS -DPCBX9E -DSTM32F40_41xxx)
add_lua_export_target(x10 ${LUA_INCLUDES_STM32F4} -DPCBHORUS -DPCBX10 -DSTM32F40_41xxx) add_lua_export_target(x10 ${LUA_INCLUDES_STM32F4} -DPCBHORUS -DPCBX10 -DSTM32F40_41xxx)

2
radio/src/lua/api_general.cpp
View file

@ -35,6 +35,8 @@
#include "lua/lua_exports_x7.inc" #include "lua/lua_exports_x7.inc"
#elif defined(PCBX3) #elif defined(PCBX3)
#include "lua/lua_exports_x3.inc" #include "lua/lua_exports_x3.inc"
#elif defined(PCBXLITES)
#include "lua/lua_exports_xlites.inc"
#elif defined(PCBXLITE) #elif defined(PCBXLITE)
#include "lua/lua_exports_xlite.inc" #include "lua/lua_exports_xlite.inc"
#elif defined(PCBTARANIS) #elif defined(PCBTARANIS)

2
radio/src/targets/taranis/CMakeLists.txt
View file

@ -132,7 +132,7 @@ elseif(PCB STREQUAL XLITES)
set(CPU_TYPE_FULL STM32F205xE) # for size report set(CPU_TYPE_FULL STM32F205xE) # for size report
set(LINKER_SCRIPT targets/taranis/stm32f2_flash.ld) set(LINKER_SCRIPT targets/taranis/stm32f2_flash.ld)
set(HAPTIC YES) set(HAPTIC YES)
set(LUA_EXPORT lua_export_xlite) set(LUA_EXPORT lua_export_xlites)
set(FLAVOUR xlites) set(FLAVOUR xlites)
add_definitions(-DPCBXLITES -DPCBXLITE -DSOFTWARE_VOLUME -DEXTERNAL_ANTENNA -DSTICKS_PWM) add_definitions(-DPCBXLITES -DPCBXLITE -DSOFTWARE_VOLUME -DEXTERNAL_ANTENNA -DSTICKS_PWM)
add_definitions(-DEEPROM_VARIANT=0x1000) add_definitions(-DEEPROM_VARIANT=0x1000)