Mirror/opentx
1
0
Fork 0
mirror of https://github.com/opentx/opentx.git synced 2025-07-15 04:15:26 +03:00
Code Issues Wiki Activity

Simplification

Browse source
This commit is contained in:
Bertrand Songis 2019-06-17 12:48:52 +02:00
parent b20e4a6be4
commit ecf0ce87e3
No known key found for this signature in database
GPG key ID: F189F79290FEC50F
3 changed files with 14 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -9,38 +9,20 @@ macro(add_lua_export_target target)
endmacro(add_lua_export_target) endmacro(add_lua_export_target)
set(LUA_INCLUDES set(LUA_INCLUDES
-DCPUARM -DLUA -DLUA_INPUTS -DCPUARM -DLUA -DLUA_INPUTS -DLUA_EXPORT_GENERATION -DSIMU
-I${RADIO_SRC_DIRECTORY}/targets/${TARGET_DIR} -I${RADIO_SRC_DIRECTORY}/targets/${TARGET_DIR}
-I${RADIO_SRC_DIRECTORY}/thirdparty -I${RADIO_SRC_DIRECTORY}/thirdparty
-I${RADIO_SRC_DIRECTORY}/targets/common/arm/stm32 -I${RADIO_SRC_DIRECTORY}/targets/common/arm/stm32
-I${RADIO_SRC_DIRECTORY}/${STM32LIB_DIR}/CMSIS/include
-I${RADIO_SRC_DIRECTORY}/${STM32USB_DIR}/STM32_USB_OTG_Driver/inc
-I${RADIO_SRC_DIRECTORY}/${STM32USB_DIR}/STM32_USB_Device_Library/Core/inc
-I${RADIO_SRC_DIRECTORY}/${STM32USB_DIR}/STM32_USB_Device_Library/Class/cdc/inc
-I${RADIO_SRC_DIRECTORY}/${STM32USB_DIR}/STM32_USB_Device_Library/Class/msc/inc
-I${RADIO_SRC_DIRECTORY}/${STM32USB_DIR}/STM32_USB_Device_Library/Class/hid/inc
)
set(LUA_INCLUDES_STM32F2
${LUA_INCLUDES}
-DSTM32F2
-I${RADIO_SRC_DIRECTORY}/${STM32LIB_DIR}/CMSIS/Device/ST/STM32F2xx/Include
)
set(LUA_INCLUDES_STM32F4
${LUA_INCLUDES}
-DSTM32F4
-I${RADIO_SRC_DIRECTORY}/${STM32LIB_DIR}/CMSIS/Device/ST/STM32F4xx/Include
) )
if(PYTHONINTERP_FOUND) if(PYTHONINTERP_FOUND)
add_lua_export_target(x9lite ${LUA_INCLUDES_STM32F2} -DPCBTARANIS -DPCBX9LITE -DPCBX9) add_lua_export_target(x9lite ${LUA_INCLUDES} -DPCBTARANIS -DPCBX9LITE -DPCBX9)
add_lua_export_target(x7 ${LUA_INCLUDES_STM32F2} -DPCBTARANIS -DPCBX7 -DRADIO_X7) add_lua_export_target(x7 ${LUA_INCLUDES} -DPCBTARANIS -DPCBX7 -DRADIO_X7)
add_lua_export_target(xlite ${LUA_INCLUDES_STM32F2} -DPCBTARANIS -DPCBXLITE) add_lua_export_target(xlite ${LUA_INCLUDES} -DPCBTARANIS -DPCBXLITE)
add_lua_export_target(xlites ${LUA_INCLUDES_STM32F2} -DPCBTARANIS -DPCBXLITES -DPCBXLITE -DGYRO) add_lua_export_target(xlites ${LUA_INCLUDES} -DPCBTARANIS -DPCBXLITES -DPCBXLITE -DGYRO)
add_lua_export_target(x9d ${LUA_INCLUDES_STM32F2} -DPCBTARANIS -DPCBX9D -DPCBX9) add_lua_export_target(x9d ${LUA_INCLUDES} -DPCBTARANIS -DPCBX9D -DPCBX9)
add_lua_export_target(x9e ${LUA_INCLUDES_STM32F4} -DPCBTARANIS -DPCBX9E -DPCBX9 -DSTM32F40_41xxx) add_lua_export_target(x9e ${LUA_INCLUDES} -DPCBTARANIS -DPCBX9E -DPCBX9 -DSTM32F40_41xxx)
add_lua_export_target(x10 ${LUA_INCLUDES_STM32F4} -DPCBHORUS -DPCBX10 -DSTM32F40_41xxx) add_lua_export_target(x10 ${LUA_INCLUDES} -DPCBHORUS -DPCBX10 -DSTM32F40_41xxx)
add_lua_export_target(x12s ${LUA_INCLUDES_STM32F4} -DPCBHORUS -DPCBX12S -DSTM32F40_41xxx) add_lua_export_target(x12s ${LUA_INCLUDES} -DPCBHORUS -DPCBX12S -DSTM32F40_41xxx)
add_lua_export_target(t12 ${LUA_INCLUDES_STM32F2} -DPCBTARANIS -DPCBX7 -DRADIO_T12) add_lua_export_target(t12 ${LUA_INCLUDES} -DPCBTARANIS -DPCBX7 -DRADIO_T12)
endif() endif()

1
radio/src/pulses/pulses.cpp
View file

@ -260,7 +260,6 @@ void setupPulsesExternalModule(uint8_t protocol)
} }
#if defined(HARDWARE_INTERNAL_MODULE) #if defined(HARDWARE_INTERNAL_MODULE)
void enablePulsesInternalModule(uint8_t protocol) void enablePulsesInternalModule(uint8_t protocol)
{ {
// start new protocol hardware here // start new protocol hardware here

5
radio/src/targets/taranis/board.h
View file

@ -36,7 +36,9 @@ extern "C" {
#pragma clang diagnostic ignored "-Wdeprecated-register" #pragma clang diagnostic ignored "-Wdeprecated-register"
#endif #endif
#if defined(STM32F4) #if defined(LUA_EXPORT_GENERATION)
// no includes
#elif defined(STM32F4)
#include "STM32F4xx_DSP_StdPeriph_Lib_V1.4.0/Libraries/CMSIS/Device/ST/STM32F4xx/Include/stm32f4xx.h" #include "STM32F4xx_DSP_StdPeriph_Lib_V1.4.0/Libraries/CMSIS/Device/ST/STM32F4xx/Include/stm32f4xx.h"
#include "STM32F4xx_DSP_StdPeriph_Lib_V1.4.0/Libraries/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_rcc.h" #include "STM32F4xx_DSP_StdPeriph_Lib_V1.4.0/Libraries/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_rcc.h"
#include "STM32F4xx_DSP_StdPeriph_Lib_V1.4.0/Libraries/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_syscfg.h" #include "STM32F4xx_DSP_StdPeriph_Lib_V1.4.0/Libraries/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_syscfg.h"
@ -78,6 +80,7 @@ extern "C" {
#endif #endif
#include "usb_driver.h" #include "usb_driver.h"
#if !defined(SIMU) #if !defined(SIMU)
#include "usbd_cdc_core.h" #include "usbd_cdc_core.h"
#include "usbd_msc_core.h" #include "usbd_msc_core.h"