From 78442b7e81b432ce5595d39c96d6f82cead334bd Mon Sep 17 00:00:00 2001 From: Michael du Breuil Date: Mon, 14 Mar 2016 23:52:05 -0700 Subject: [PATCH] Plane: make the initialization of the gcs instances follow the define --- ArduPlane/system.cpp | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/ArduPlane/system.cpp b/ArduPlane/system.cpp index 0c44b522ed..f9dcd5b512 100644 --- a/ArduPlane/system.cpp +++ b/ArduPlane/system.cpp @@ -144,14 +144,10 @@ void Plane::init_ardupilot() usb_connected = true; check_usb_mux(); - // setup serial port for telem1 - gcs[1].setup_uart(serial_manager, AP_SerialManager::SerialProtocol_MAVLink, 0); - - // setup serial port for telem2 - gcs[2].setup_uart(serial_manager, AP_SerialManager::SerialProtocol_MAVLink, 1); - - // setup serial port for fourth telemetry port (not used by default) - gcs[3].setup_uart(serial_manager, AP_SerialManager::SerialProtocol_MAVLink, 2); + // setup all other telem slots with serial ports + for (uint8_t i = 1; i < MAVLINK_COMM_NUM_BUFFERS; i++) { + gcs[i].setup_uart(serial_manager, AP_SerialManager::SerialProtocol_MAVLink, (i - 1)); + } // setup frsky #if FRSKY_TELEM_ENABLED == ENABLED