From 91dbfce5f92e1b29d2cc63a11ec141774d647052 Mon Sep 17 00:00:00 2001 From: Lucas De Marchi Date: Tue, 3 Nov 2015 11:59:04 -0200 Subject: [PATCH] APMrover2: remove check for MAVLINK_COMM_NUM_BUFFERS --- APMrover2/Parameters.cpp | 4 ---- APMrover2/system.cpp | 4 ---- 2 files changed, 8 deletions(-) diff --git a/APMrover2/Parameters.cpp b/APMrover2/Parameters.cpp index e3a8b6498e..0423a409c8 100644 --- a/APMrover2/Parameters.cpp +++ b/APMrover2/Parameters.cpp @@ -450,17 +450,13 @@ const AP_Param::Info Rover::var_info[] = { // @Path: GCS_Mavlink.cpp GOBJECTN(gcs[1], gcs1, "SR1_", GCS_MAVLINK), -#if MAVLINK_COMM_NUM_BUFFERS > 2 // @Group: SR2_ // @Path: GCS_Mavlink.cpp GOBJECTN(gcs[2], gcs2, "SR2_", GCS_MAVLINK), -#endif -#if MAVLINK_COMM_NUM_BUFFERS > 3 // @Group: SR3_ // @Path: GCS_Mavlink.cpp GOBJECTN(gcs[3], gcs3, "SR3_", GCS_MAVLINK), -#endif // @Group: SERIAL // @Path: ../libraries/AP_SerialManager/AP_SerialManager.cpp diff --git a/APMrover2/system.cpp b/APMrover2/system.cpp index ac39ecf9f9..336a65af85 100644 --- a/APMrover2/system.cpp +++ b/APMrover2/system.cpp @@ -118,15 +118,11 @@ void Rover::init_ardupilot() // setup serial port for telem1 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_MAVLink, 1); -#endif -#if MAVLINK_COMM_NUM_BUFFERS > 3 // setup serial port for fourth telemetry port (not used by default) gcs[3].setup_uart(serial_manager, AP_SerialManager::SerialProtocol_MAVLink, 2); -#endif // setup frsky telemetry #if FRSKY_TELEM_ENABLED == ENABLED