Undo split

This commit is contained in:
3djc
2019-08-22 14:50:30 +02:00
parent 321c25b756
commit 9ec069d09b
4 changed files with 13 additions and 37 deletions
@@ -12,6 +12,7 @@ option(MODULE_SIZE_STD "Standard size TX Module" ON)
option(PPM "PPM TX Module" ON)
option(DSM2 "DSM2 TX Module" ON)
option(SBUS "SBUS TX Module" ON)
option(CROSSFIRE "Crossfire TX Module" ON)
option(MULTIMODULE "DIY Multiprotocol TX Module (https://github.com/pascallanger/DIY-Multiprotocol-TX-Module)" ON)
option(MULTI_SPORT "SPORT telemetry support" OFF)
option(SUPPORT_D16_EU_ONLY "XJT module only supports D16-EU and LR12-EU" OFF) # TODO rename to XJT_EU_ONLY
@@ -155,6 +156,18 @@ if(MULTI_SPORT)
add_definitions(-DMULTI_SPORT)
endif()
if(CROSSFIRE)
add_definitions(-DCROSSFIRE)
set(PULSES_SRC
${PULSES_SRC}
crossfire.cpp
)
set(SRC
${SRC}
telemetry/crossfire.cpp
)
endif()
add_definitions(-DCPUARM)
add_definitions(-DGPS)
add_definitions(-DBOLD_FONT -DBATTGRAPH -DTHRTRACE)
-12
View File
@@ -1,4 +1,3 @@
option(CROSSFIRE "Crossfire TX Module" ON)
option(DISK_CACHE "Enable SD card disk cache" ON)
option(UNEXPECTED_SHUTDOWN "Enable the Unexpected Shutdown screen" ON)
option(PXX1 "PXX1 protocol support" ON)
@@ -204,14 +203,3 @@ if(PYTHONINTERP_FOUND)
)
endif()
if(CROSSFIRE)
add_definitions(-DCROSSFIRE)
set(PULSES_SRC
${PULSES_SRC}
crossfire.cpp
)
set(SRC
${SRC}
telemetry/crossfire.cpp
)
endif()
-12
View File
@@ -1,4 +1,3 @@
option(CROSSFIRE "Crossfire TX Module" OFF)
set(ARCH ARM)
set(LUA NO)
set(MCU cortex-m3)
@@ -131,14 +130,3 @@ set(SRC
debug.cpp
)
if(CROSSFIRE)
add_definitions(-DCROSSFIRE)
set(PULSES_SRC
${PULSES_SRC}
crossfire.cpp
)
set(SRC
${SRC}
telemetry/crossfire.cpp
)
endif()
-13
View File
@@ -1,4 +1,3 @@
option(CROSSFIRE "Crossfire TX Module" ON)
option(SHUTDOWN_CONFIRMATION "Shutdown confirmation" OFF)
option(LCD_DUAL_BUFFER "Dual LCD Buffer" OFF)
option(INTERNAL_MODULE_PPM "Support for PPM internal module hack" OFF)
@@ -311,15 +310,3 @@ if(INTERNAL_MODULE_PXX1)
endif()
set(FIRMWARE_DEPENDENCIES ${FIRMWARE_DEPENDENCIES} ${BITMAPS_TARGET})
if(CROSSFIRE)
add_definitions(-DCROSSFIRE)
set(PULSES_SRC
${PULSES_SRC}
crossfire.cpp
)
set(SRC
${SRC}
telemetry/crossfire.cpp
)
endif()