Please Travis (#7802)

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

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
 

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}

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) {

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