Mirror/betaflight
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-17 13:25:30 +03:00
Code Issues Wiki Activity

use separate serial functions for SmartAudio and Tramp.

Browse source
This commit is contained in:
Raphael Coeffic 2017-01-15 12:22:18 +01:00
parent 56c8fb0183
commit c29f8a79ed
3 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/main/io/serial.h
View file

@ -37,8 +37,9 @@ typedef enum {
FUNCTION_BLACKBOX = (1 << 7), // 128 FUNCTION_BLACKBOX = (1 << 7), // 128
FUNCTION_TELEMETRY_MAVLINK = (1 << 9), // 512 FUNCTION_TELEMETRY_MAVLINK = (1 << 9), // 512
FUNCTION_ESC_SENSOR = (1 << 10), // 1024 FUNCTION_ESC_SENSOR = (1 << 10), // 1024
FUNCTION_VTX_CONTROL = (1 << 11), // 2048 FUNCTION_VTX_SMARTAUDIO = (1 << 11), // 2048
FUNCTION_TELEMETRY_IBUS = (1 << 12), // 4096 FUNCTION_TELEMETRY_IBUS = (1 << 12), // 4096
FUNCTION_VTX_TRAMP = (1 << 13), // 8192
} serialPortFunction_e; } serialPortFunction_e;
typedef enum { typedef enum {

4
src/main/io/vtx_smartaudio.c
View file

@ -652,9 +652,9 @@ bool smartAudioInit()
} }
#endif #endif
serialPortConfig_t *portConfig = findSerialPortConfig(FUNCTION_VTX_CONTROL); serialPortConfig_t *portConfig = findSerialPortConfig(FUNCTION_VTX_SMARTAUDIO);
if (portConfig) { if (portConfig) {
smartAudioSerialPort = openSerialPort(portConfig->identifier, FUNCTION_VTX_CONTROL, NULL, 4800, MODE_RXTX, SERIAL_BIDIR|SERIAL_BIDIR_PP); smartAudioSerialPort = openSerialPort(portConfig->identifier, FUNCTION_VTX_SMARTAUDIO, NULL, 4800, MODE_RXTX, SERIAL_BIDIR|SERIAL_BIDIR_PP);
} }
if (!smartAudioSerialPort) { if (!smartAudioSerialPort) {

4
src/main/io/vtx_tramp.c
View file

@ -166,10 +166,10 @@ void trampQueryS(void)
bool trampInit() bool trampInit()
{ {
serialPortConfig_t *portConfig = findSerialPortConfig(FUNCTION_VTX_CONTROL); serialPortConfig_t *portConfig = findSerialPortConfig(FUNCTION_VTX_TRAMP);
if (portConfig) { if (portConfig) {
trampSerialPort = openSerialPort(portConfig->identifier, FUNCTION_VTX_CONTROL, NULL, 9600, MODE_RXTX, TRAMP_SERIAL_OPTIONS); trampSerialPort = openSerialPort(portConfig->identifier, FUNCTION_VTX_TRAMP, NULL, 9600, MODE_RXTX, TRAMP_SERIAL_OPTIONS);
} }
if (!trampSerialPort) { if (!trampSerialPort) {