From 2bca354029d312eb063a70e595c4bfddbc96c69c Mon Sep 17 00:00:00 2001
From: 3djc <lesitewebdejc@hotmail.com>
Date: Tue, 7 Jul 2020 17:04:43 +0200
Subject: [PATCH] Please Travis (#7802)

---
 radio/src/targets/horus/CMakeLists.txt       | 6 +++---
 radio/src/targets/horus/trainer_driver.cpp   | 2 +-
 radio/src/targets/taranis/CMakeLists.txt     | 1 +
 radio/src/targets/taranis/trainer_driver.cpp | 2 +-
 radio/src/tasks.cpp                          | 2 +-
 5 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/radio/src/targets/horus/CMakeLists.txt b/radio/src/targets/horus/CMakeLists.txt
index 220bb5b9e..525c8a4ad 100644
--- a/radio/src/targets/horus/CMakeLists.txt
+++ b/radio/src/targets/horus/CMakeLists.txt
@@ -66,7 +66,7 @@ if (PCB STREQUAL X10)
     set(HARDWARE_TOUCH YES)
     set(USB_CHARGER YES)
     set(DEFAULT_THEME "DARKBLUE")
-    set(SBUS ON)
+    set(SBUS_TRAINER ON)
     set(AUX_SERIAL ON)
     if (NOT BLUETOOTH AND NOT INTERNAL_GPS)
       set(AUX2_SERIAL ON)
@@ -255,8 +255,8 @@ if (AUX2_SERIAL)
   set(AUX_SERIAL_DRIVER ../common/arm/stm32/aux_serial_driver.cpp)
 endif()
 
-if (SBUS)
-  add_definitions(-DSBUS)
+if (SBUS_TRAINER)
+  add_definitions(-DSBUS_TRAINER)
   set(SRC
     ${SRC}
     sbus.cpp
diff --git a/radio/src/targets/horus/trainer_driver.cpp b/radio/src/targets/horus/trainer_driver.cpp
index f039536ff..83ec7a542 100644
--- a/radio/src/targets/horus/trainer_driver.cpp
+++ b/radio/src/targets/horus/trainer_driver.cpp
@@ -20,7 +20,7 @@
 
 #include "opentx.h"
 
-#if defined(SBUS)
+#if defined(SBUS_TRAINER)
 Fifo<uint8_t, 32> trainerSbusFifo;
 #endif
 
diff --git a/radio/src/targets/taranis/CMakeLists.txt b/radio/src/targets/taranis/CMakeLists.txt
index 82dbcef91..b00c7dfba 100644
--- a/radio/src/targets/taranis/CMakeLists.txt
+++ b/radio/src/targets/taranis/CMakeLists.txt
@@ -335,6 +335,7 @@ endif()
 
 add_definitions(-DPCBTARANIS)
 add_definitions(-DAUDIO -DVOICE -DRTCLOCK)
+add_definitions(-DSBUS_TRAINER)
 
 set(SRC
   ${SRC}
diff --git a/radio/src/targets/taranis/trainer_driver.cpp b/radio/src/targets/taranis/trainer_driver.cpp
index 06a006899..01f6e47bf 100644
--- a/radio/src/targets/taranis/trainer_driver.cpp
+++ b/radio/src/targets/taranis/trainer_driver.cpp
@@ -329,7 +329,7 @@ void stop_trainer_module_sbus()
 }
 #endif
 
-#if defined(SBUS)
+#if defined(SBUS_TRAINER)
 int sbusGetByte(uint8_t * byte)
 {
   switch (currentTrainerMode) {
diff --git a/radio/src/tasks.cpp b/radio/src/tasks.cpp
index 533d1bb33..e9dcfac45 100644
--- a/radio/src/tasks.cpp
+++ b/radio/src/tasks.cpp
@@ -107,7 +107,7 @@ TASK_FUNCTION(mixerTask)
   s_pulses_paused = true;
 
   while (true) {
-#if defined(SBUS) && !defined(PCBSKY9X)
+#if defined(SBUS_TRAINER)
     // SBUS trainer
     processSbusInput();
 #endif