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

Add X9D+ 2019 simu support

Browse Source
This commit is contained in:
3djc
2019-08-19 11:50:59 +02:00
parent 82b7f719e8
commit 0777e3ca81
3 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
companion/src/CMakeLists.txt
+2
View File
@@ -335,6 +335,8 @@ file(GLOB simulator_plugins "${CMAKE_BINARY_DIR}/Release/*opentx-*simulator${CMA
# add its library name to be sure # add its library name to be sure
if(PCB STREQUAL X7 AND PCBREV STREQUAL T12) if(PCB STREQUAL X7 AND PCBREV STREQUAL T12)
set(FLAVOUR t12) set(FLAVOUR t12)
elseif(PCB STREQUAL X9D+ AND PCBREV STREQUAL 2019)
set(FLAVOUR x9d+2019)
else() else()
string(TOLOWER ${PCB} FLAVOUR) string(TOLOWER ${PCB} FLAVOUR)
endif() endif()
radio/src/targets/taranis/CMakeLists.txt
+2 -1
View File
@@ -38,7 +38,6 @@ if(PCB STREQUAL X9E)
elseif(PCB STREQUAL X9D+) elseif(PCB STREQUAL X9D+)
set(HAPTIC YES) set(HAPTIC YES)
set(LUA_EXPORT lua_export_x9d) set(LUA_EXPORT lua_export_x9d)
set(FLAVOUR x9d+)
add_definitions(-DPCBX9DP -DPCBX9) add_definitions(-DPCBX9DP -DPCBX9)
add_definitions(-DEEPROM_VARIANT=0) add_definitions(-DEEPROM_VARIANT=0)
set(GUI_DIR 212x64) set(GUI_DIR 212x64)
@@ -63,12 +62,14 @@ elseif(PCB STREQUAL X9D+)
set(STATUS_LEDS YES) set(STATUS_LEDS YES)
set(PXX2 ON) set(PXX2 ON)
set(PXX_FREQUENCY "HIGH") set(PXX_FREQUENCY "HIGH")
set(FLAVOUR x9d+2019)
else() else()
set(CPU_TYPE STM32F2) set(CPU_TYPE STM32F2)
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(AUX_SERIAL_DRIVER ../common/arm/stm32/aux_serial_driver.cpp) set(AUX_SERIAL_DRIVER ../common/arm/stm32/aux_serial_driver.cpp)
set(STATUS_LEDS NO) set(STATUS_LEDS NO)
set(FLAVOUR x9d+)
endif() endif()
elseif(PCB STREQUAL X9D) elseif(PCB STREQUAL X9D)
set(CPU_TYPE STM32F2) set(CPU_TYPE STM32F2)
tools/build-companion-nightly.sh
+6
View File
@@ -53,9 +53,15 @@ make -j${JOBS} libsimulator
cmake ${COMMON_OPTIONS} -DPCB=X7 ${SRCDIR} cmake ${COMMON_OPTIONS} -DPCB=X7 ${SRCDIR}
make -j${JOBS} libsimulator make -j${JOBS} libsimulator
cmake ${COMMON_OPTIONS} -DPCB=X7 -DPCBREV=T12 ${SRCDIR}
make -j${JOBS} libsimulator
cmake ${COMMON_OPTIONS} -DPCB=X9D ${SRCDIR} cmake ${COMMON_OPTIONS} -DPCB=X9D ${SRCDIR}
make -j${JOBS} libsimulator make -j${JOBS} libsimulator
cmake ${COMMON_OPTIONS} -DPCB=X9D+ -DPCBREV=2019 ${SRCDIR}
make -j${JOBS} libsimulator
cmake ${COMMON_OPTIONS} -DPCB=X9D+ ${SRCDIR} cmake ${COMMON_OPTIONS} -DPCB=X9D+ ${SRCDIR}
make -j${JOBS} libsimulator make -j${JOBS} libsimulator