From dc1987e0abeba1c6bae560c9f9d4942385c29a5f Mon Sep 17 00:00:00 2001 From: Kilrah Date: Sat, 4 May 2019 10:10:53 +0200 Subject: [PATCH] missing option --- radio/src/targets/common/arm/CMakeLists.txt | 5 +++++ radio/src/thirdparty/GCS_MAVLink/include_v1.0 | 1 + radio/util/build-firmware.py | 11 +++++++++-- 3 files changed, 15 insertions(+), 2 deletions(-) create mode 160000 radio/src/thirdparty/GCS_MAVLink/include_v1.0 diff --git a/radio/src/targets/common/arm/CMakeLists.txt b/radio/src/targets/common/arm/CMakeLists.txt index ef4276798..68e7d03d4 100644 --- a/radio/src/targets/common/arm/CMakeLists.txt +++ b/radio/src/targets/common/arm/CMakeLists.txt @@ -8,6 +8,7 @@ option(TRACE_FATFS "Traces FatFS enabled" OFF) option(TRACE_AUDIO "Traces audio enabled" OFF) option(DEBUG_TRACE_BUFFER "Debug Trace Screen" OFF) option(MULTIMODULE "DIY Multiprotocol TX Module (https://github.com/pascallanger/DIY-Multiprotocol-TX-Module)" OFF) +option(MULTI_SPORT "SPORT telemetry support" OFF) option(CROSSFIRE "Crossfire TX Module" OFF) option(SUPPORT_D16_EU_ONLY "XJT module only supports D16-EU and LR12-EU" OFF) # TODO rename to XJT_EU_ONLY option(DEBUG_INTERRUPTS "Count interrupts" OFF) @@ -112,6 +113,10 @@ if(MULTIMODULE) set(SRC ${SRC} pulses/multi.cpp telemetry/spektrum.cpp telemetry/flysky_ibus.cpp telemetry/multi.cpp) endif() +if(MULTI_SPORT) + add_definitions(-DMULTI_SPORT) +endif() + if(CROSSFIRE) add_definitions(-DCROSSFIRE) set(PULSES_SRC diff --git a/radio/src/thirdparty/GCS_MAVLink/include_v1.0 b/radio/src/thirdparty/GCS_MAVLink/include_v1.0 new file mode 160000 index 000000000..21083c3af --- /dev/null +++ b/radio/src/thirdparty/GCS_MAVLink/include_v1.0 @@ -0,0 +1 @@ +Subproject commit 21083c3af5f386a27d59a3ef6bff01a70991c3cb diff --git a/radio/util/build-firmware.py b/radio/util/build-firmware.py index 846bb865e..634daa15f 100755 --- a/radio/util/build-firmware.py +++ b/radio/util/build-firmware.py @@ -60,42 +60,49 @@ elif options[optcount] == "ar9x": board_family = BOARD_FAMILY_ARM elif options[optcount] == "x7": command_options["PCB"] = "X7" + command_options["MULTI_SPORT"] = "ON" firmware_options = options_taranisplus maxsize = 65536 * 8 board = BOARD_TARANIS board_family = BOARD_FAMILY_ARM elif options[optcount] == "xlite": command_options["PCB"] = "XLITE" + command_options["MULTI_SPORT"] = "ON" firmware_options = options_xlite maxsize = 65536 * 8 board = BOARD_TARANIS board_family = BOARD_FAMILY_ARM elif options[optcount] == "x9d": command_options["PCB"] = "X9D" + command_options["MULTI_SPORT"] = "ON" firmware_options = options_taranis maxsize = 65536 * 8 board = BOARD_TARANIS board_family = BOARD_FAMILY_ARM elif options[optcount] == "x9d+": command_options["PCB"] = "X9D+" + command_options["MULTI_SPORT"] = "ON" firmware_options = options_taranisplus maxsize = 65536 * 8 board = BOARD_TARANIS board_family = BOARD_FAMILY_ARM elif options[optcount] == "x9e": command_options["PCB"] = "X9E" + command_options["MULTI_SPORT"] = "ON" firmware_options = options_taranisx9e maxsize = 65536 * 8 board = BOARD_TARANIS board_family = BOARD_FAMILY_ARM elif options[optcount] == "x10": command_options["PCB"] = "X10" + command_options["MULTI_SPORT"] = "ON" firmware_options = options_x10 maxsize = 2 * 1024 * 1024 board = BOARD_HORUS board_family = BOARD_FAMILY_ARM elif options[optcount] == "x12s": command_options["PCB"] = "X12S" + command_options["MULTI_SPORT"] = "ON" firmware_options = options_x12s maxsize = 2 * 1024 * 1024 board = BOARD_HORUS @@ -129,8 +136,8 @@ for opt, value in firmware_options.items(): break if found: - optvalue = value[1]; - filename += "-" + opt; + optvalue = value[1] + filename += "-" + opt else: optvalue = value[2]