Mirror/opentx
1
0
Fork 0
mirror of https://github.com/opentx/opentx.git synced 2025-07-26 09:45:21 +03:00
Code Issues Wiki Activity

Please Travis (#7802)

Browse source
This commit is contained in:
3djc 2020-07-07 17:04:43 +02:00 • committed by GitHub
parent 4d6a8e063a
commit 2bca354029
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
radio/src/targets/horus/CMakeLists.txt
View file

@ -66,7 +66,7 @@ if (PCB STREQUAL X10)
set(HARDWARE_TOUCH YES) set(HARDWARE_TOUCH YES)
set(USB_CHARGER YES) set(USB_CHARGER YES)
set(DEFAULT_THEME "DARKBLUE") set(DEFAULT_THEME "DARKBLUE")
set(SBUS ON) set(SBUS_TRAINER ON)
set(AUX_SERIAL ON) set(AUX_SERIAL ON)
if (NOT BLUETOOTH AND NOT INTERNAL_GPS) if (NOT BLUETOOTH AND NOT INTERNAL_GPS)
set(AUX2_SERIAL ON) set(AUX2_SERIAL ON)
@ -255,8 +255,8 @@ if (AUX2_SERIAL)
set(AUX_SERIAL_DRIVER ../common/arm/stm32/aux_serial_driver.cpp) set(AUX_SERIAL_DRIVER ../common/arm/stm32/aux_serial_driver.cpp)
endif() endif()
if (SBUS) if (SBUS_TRAINER)
add_definitions(-DSBUS) add_definitions(-DSBUS_TRAINER)
set(SRC set(SRC
${SRC} ${SRC}
sbus.cpp sbus.cpp

2
radio/src/targets/horus/trainer_driver.cpp
View file

@ -20,7 +20,7 @@
#include "opentx.h" #include "opentx.h"
#if defined(SBUS) #if defined(SBUS_TRAINER)
Fifo<uint8_t, 32> trainerSbusFifo; Fifo<uint8_t, 32> trainerSbusFifo;
#endif #endif

1
radio/src/targets/taranis/CMakeLists.txt
View file

@ -335,6 +335,7 @@ endif()
add_definitions(-DPCBTARANIS) add_definitions(-DPCBTARANIS)
add_definitions(-DAUDIO -DVOICE -DRTCLOCK) add_definitions(-DAUDIO -DVOICE -DRTCLOCK)
add_definitions(-DSBUS_TRAINER)
set(SRC set(SRC
${SRC} ${SRC}

2
radio/src/targets/taranis/trainer_driver.cpp
View file

@ -329,7 +329,7 @@ void stop_trainer_module_sbus()
} }
#endif #endif
#if defined(SBUS) #if defined(SBUS_TRAINER)
int sbusGetByte(uint8_t * byte) int sbusGetByte(uint8_t * byte)
{ {
switch (currentTrainerMode) { switch (currentTrainerMode) {

2
radio/src/tasks.cpp
View file

@ -107,7 +107,7 @@ TASK_FUNCTION(mixerTask)
s_pulses_paused = true; s_pulses_paused = true;
while (true) { while (true) {
#if defined(SBUS) && !defined(PCBSKY9X) #if defined(SBUS_TRAINER)
// SBUS trainer // SBUS trainer
processSbusInput(); processSbusInput();
#endif #endif