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

FrSky X3 fixes

Browse source
This commit is contained in:
Bertrand Songis 2019-02-18 15:37:00 +01:00
parent 8ec797730e
commit decfa57149
5 changed files with 9 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
radio/src/CMakeLists.txt
View file

@ -448,7 +448,7 @@ if(NOT MSVC)
set(SRC ${SRC} bin_allocator.cpp) set(SRC ${SRC} bin_allocator.cpp)
endif() endif()
if(PCB STREQUAL XLITE OR PCB STREQUAL XLITES OR PCB STREQUAL X9D OR PCB STREQUAL X9D+ OR PCB STREQUAL X9E OR PCB STREQUAL X7 OR PCB STREQUAL X10 OR PCB STREQUAL X12S) if(PCB STREQUAL XLITE OR PCB STREQUAL XLITES OR PCB STREQUAL X9D OR PCB STREQUAL X9D+ OR PCB STREQUAL X9E OR PCB STREQUAL X7 OR PCB STREQUAL X3 OR PCB STREQUAL X10 OR PCB STREQUAL X12S)
add_subdirectory(targets/common/arm/stm32/bootloader) add_subdirectory(targets/common/arm/stm32/bootloader)
include_directories(${CMAKE_CURRENT_BINARY_DIR}/targets/common/arm/stm32/bootloader) include_directories(${CMAKE_CURRENT_BINARY_DIR}/targets/common/arm/stm32/bootloader)
set(FIRMWARE_DEPENDENCIES ${FIRMWARE_DEPENDENCIES} bootloader) set(FIRMWARE_DEPENDENCIES ${FIRMWARE_DEPENDENCIES} bootloader)

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

@ -40,6 +40,7 @@ set(LUA_INCLUDES_STM32F4
) )
if(PYTHONINTERP_FOUND) 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(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(x9d ${LUA_INCLUDES_STM32F2} -DPCBTARANIS -DPCBX9D) add_lua_export_target(x9d ${LUA_INCLUDES_STM32F2} -DPCBTARANIS -DPCBX9D)

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

@ -33,6 +33,8 @@
#include "lua/lua_exports_x9e.inc" #include "lua/lua_exports_x9e.inc"
#elif defined(PCBX7) #elif defined(PCBX7)
#include "lua/lua_exports_x7.inc" #include "lua/lua_exports_x7.inc"
#elif defined(PCBX3)
#include "lua/lua_exports_x3.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)
@ -1338,11 +1340,11 @@ const luaR_value_entry opentxConstants[] = {
{ "MIXSRC_SB", MIXSRC_SB }, { "MIXSRC_SB", MIXSRC_SB },
{ "MIXSRC_SC", MIXSRC_SC }, { "MIXSRC_SC", MIXSRC_SC },
{ "MIXSRC_SD", MIXSRC_SD }, { "MIXSRC_SD", MIXSRC_SD },
#if !defined(PCBX7) && !defined(PCBXLITE) #if !defined(PCBX7) && !defined(PCBXLITE) && !defined(PCBX3)
{ "MIXSRC_SE", MIXSRC_SE }, { "MIXSRC_SE", MIXSRC_SE },
{ "MIXSRC_SG", MIXSRC_SG }, { "MIXSRC_SG", MIXSRC_SG },
#endif #endif
#if !defined(PCBXLITE) #if !defined(PCBXLITE) && !defined(PCBX3)
{ "MIXSRC_SF", MIXSRC_SF }, { "MIXSRC_SF", MIXSRC_SF },
{ "MIXSRC_SH", MIXSRC_SH }, { "MIXSRC_SH", MIXSRC_SH },
#endif #endif

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

@ -90,7 +90,7 @@ elseif(PCB STREQUAL X3)
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_x7) set(LUA_EXPORT lua_export_x3)
set(FLAVOUR x3) set(FLAVOUR x3)
add_definitions(-DPCBX3 -DSOFTWARE_VOLUME) add_definitions(-DPCBX3 -DSOFTWARE_VOLUME)
add_definitions(-DEEPROM_VARIANT=0x4000) add_definitions(-DEEPROM_VARIANT=0x4000)

4
radio/src/targets/taranis/hal.h
View file

@ -1061,7 +1061,7 @@
#define LCD_DMA_FLAG_INT DMA_HIFCR_CTCIF7 #define LCD_DMA_FLAG_INT DMA_HIFCR_CTCIF7
#define LCD_SPI SPI3 #define LCD_SPI SPI3
#define LCD_GPIO_AF GPIO_AF_SPI3 #define LCD_GPIO_AF GPIO_AF_SPI3
#elif defined(PCBX9DP) || defined(PCBX7) #elif defined(PCBX9DP) || defined(PCBX7) || defined(PCBX3)
#define LCD_RCC_AHB1Periph (RCC_AHB1Periph_GPIOA | RCC_AHB1Periph_GPIOC | RCC_AHB1Periph_GPIOD | RCC_AHB1Periph_DMA1) #define LCD_RCC_AHB1Periph (RCC_AHB1Periph_GPIOA | RCC_AHB1Periph_GPIOC | RCC_AHB1Periph_GPIOD | RCC_AHB1Periph_DMA1)
#define LCD_RCC_APB1Periph RCC_APB1Periph_SPI3 #define LCD_RCC_APB1Periph RCC_APB1Periph_SPI3
#define LCD_SPI_GPIO GPIOC #define LCD_SPI_GPIO GPIOC
@ -1100,7 +1100,7 @@
#define I2C_RCC_APB1Periph RCC_APB1Periph_I2C1 #define I2C_RCC_APB1Periph RCC_APB1Periph_I2C1
#define I2C I2C1 #define I2C I2C1
#define I2C_GPIO_AF GPIO_AF_I2C1 #define I2C_GPIO_AF GPIO_AF_I2C1
#if defined(PCBXLITE) #if defined(PCBXLITE) || defined(PCBX3)
#define I2C_RCC_AHB1Periph (RCC_AHB1Periph_GPIOB | RCC_AHB1Periph_GPIOD) #define I2C_RCC_AHB1Periph (RCC_AHB1Periph_GPIOB | RCC_AHB1Periph_GPIOD)
#define I2C_SPI_GPIO GPIOB #define I2C_SPI_GPIO GPIOB
#define I2C_SDA_GPIO_PIN GPIO_Pin_9 // PB.09 #define I2C_SDA_GPIO_PIN GPIO_Pin_9 // PB.09