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

fix(lua): Add missing switch constants (#3803)

Browse Source
This commit is contained in:
Raphael Coeffic
2023-07-30 14:03:35 +10:00
committed by GitHub
parent f1c98955a7
commit 76423370cd
4 changed files with 29 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/lua/CMakeLists.txt
+7 -1
View File
@@ -28,10 +28,16 @@ set(SRC ${SRC}
)
AddHWGenTarget(${HW_DESC_JSON} lua_inputs lua_inputs.inc)
set(SRC ${SRC} ${CMAKE_CURRENT_BINARY_DIR}/lua_inputs.inc)
AddHWGenTarget(${HW_DESC_JSON} lua_mixsrc lua_mixsrc.inc)
set(SRC ${SRC}
${CMAKE_CURRENT_BINARY_DIR}/lua_inputs.inc
${CMAKE_CURRENT_BINARY_DIR}/lua_mixsrc.inc
)
# helper target for testing purposes
add_custom_target(lua_inputs DEPENDS ${HW_DESC_JSON} lua_inputs.inc)
add_custom_target(lua_mixsrc DEPENDS ${HW_DESC_JSON} lua_mixsrc.inc)
if(GUI_DIR STREQUAL colorlcd)
set(SRC ${SRC} lua/api_colorlcd.cpp lua/widgets.cpp)
radio/src/lua/api_general.cpp
+1 -19
View File
@@ -2895,25 +2895,7 @@ LROT_BEGIN(etxcst, NULL, 0)
LROT_NUMENTRY( REPLACE, MLTPX_REPL )
LROT_NUMENTRY( MIXSRC_MAX, MIXSRC_MAX )
LROT_NUMENTRY( MIXSRC_FIRST_INPUT, MIXSRC_FIRST_INPUT )
LROT_NUMENTRY( MIXSRC_Rud, MIXSRC_FIRST_STICK )
LROT_NUMENTRY( MIXSRC_Ele, MIXSRC_FIRST_STICK + 1 )
LROT_NUMENTRY( MIXSRC_Thr, MIXSRC_FIRST_STICK + 2 )
LROT_NUMENTRY( MIXSRC_Ail, MIXSRC_FIRST_STICK + 3 )
// TODO: LUA switch names
// LROT_NUMENTRY( MIXSRC_SA, MIXSRC_SA )
// LROT_NUMENTRY( MIXSRC_SB, MIXSRC_SB )
// LROT_NUMENTRY( MIXSRC_SC, MIXSRC_SC )
// LROT_NUMENTRY( MIXSRC_SD, MIXSRC_SD )
// #if !defined(PCBX7) && !defined(PCBXLITE) && !defined(PCBX9LITE)
// LROT_NUMENTRY( MIXSRC_SE, MIXSRC_SE )
// LROT_NUMENTRY( MIXSRC_SG, MIXSRC_SG )
// #endif
// #if defined(HARDWARE_SWITCH_F)
// LROT_NUMENTRY( MIXSRC_SF, MIXSRC_SF )
// #endif
// #if defined(HARDWARE_SWITCH_H)
// LROT_NUMENTRY( MIXSRC_SH, MIXSRC_SH )
// #endif
#include "lua_mixsrc.inc"
LROT_NUMENTRY( MIXSRC_CH1, MIXSRC_FIRST_CH )
LROT_NUMENTRY( SWSRC_LAST, SWSRC_LAST_LOGICAL_SWITCH )
LROT_NUMENTRY( SWITCH_COUNT, SWSRC_COUNT )