Mirror
/
ardupilot
mirror of https://github.com/ArduPilot/ardupilot
5
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Plane: integrate Serial Manager instance

This commit is contained in:
Randy Mackay 2015-03-27 18:50:57 -07:00
parent 24f24a7db7
commit ab749f884f
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ArduPlane/system.pde
View File

@ -120,7 +120,7 @@ static void init_ardupilot()
battery.init();
// init the GCS
gcs[0].setup_uart(serial_manager, AP_SerialManager::SerialProtocol_Console);
gcs[0].setup_uart(serial_manager, AP_SerialManager::SerialProtocol_Console, 0);
// we start by assuming USB connected, as we initialed the serial
// port with SERIAL0_BAUD. check_usb_mux() fixes this if need be.
@ -128,11 +128,11 @@ static void init_ardupilot()
check_usb_mux();
// setup serial port for telem1
gcs[1].setup_uart(serial_manager, AP_SerialManager::SerialProtocol_MAVLink1);
gcs[1].setup_uart(serial_manager, AP_SerialManager::SerialProtocol_MAVLink, 0);
#if MAVLINK_COMM_NUM_BUFFERS > 2
// setup serial port for telem2
gcs[2].setup_uart(serial_manager, AP_SerialManager::SerialProtocol_MAVLink2);
gcs[2].setup_uart(serial_manager, AP_SerialManager::SerialProtocol_MAVLink, 1);
#endif
// setup frsky
@ -586,7 +586,7 @@ static void check_usb_mux(void)
if (usb_connected) {
serial_manager.set_console_baud(AP_SerialManager::SerialProtocol_Console);
} else {
serial_manager.set_console_baud(AP_SerialManager::SerialProtocol_MAVLink1);
serial_manager.set_console_baud(AP_SerialManager::SerialProtocol_MAVLink, 0);
}
#endif
}