From a3b91660ebc9fd98a06b7dcb1debfa1d82434bb3 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Tue, 27 May 2014 16:35:39 +1000
Subject: [PATCH] AntennaTracker: build fixes for new GCS_MAVLink API

---
 Tools/AntennaTracker/GCS_Mavlink.pde |  5 +++--
 Tools/AntennaTracker/system.pde      | 10 +++++-----
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/Tools/AntennaTracker/GCS_Mavlink.pde b/Tools/AntennaTracker/GCS_Mavlink.pde
index 4b4e464186..cce7c5fe78 100644
--- a/Tools/AntennaTracker/GCS_Mavlink.pde
+++ b/Tools/AntennaTracker/GCS_Mavlink.pde
@@ -1062,8 +1062,9 @@ static void gcs_update(void)
         }
     }
     // Also check for messages from the remote if we are in proxy mode
-    if (g.proxy_mode == true && proxy_vehicle.initialised)
-        proxy_vehicle.update();
+    if (g.proxy_mode == true && proxy_vehicle.initialised) {
+        proxy_vehicle.update(NULL);
+    }
 }
 
 static void gcs_send_text_P(gcs_severity severity, const prog_char_t *str)
diff --git a/Tools/AntennaTracker/system.pde b/Tools/AntennaTracker/system.pde
index f41b02beb4..a99b94385e 100644
--- a/Tools/AntennaTracker/system.pde
+++ b/Tools/AntennaTracker/system.pde
@@ -35,12 +35,12 @@ static void init_tracker()
     check_usb_mux();
 
     // we have a 2nd serial port for telemetry
-    hal.uartC->begin(map_baudrate(g.serial1_baud, SERIAL1_BAUD),
-                     128, SERIAL1_BUFSIZE);
-    if (g.proxy_mode == true)
-        proxy_vehicle.init(hal.uartC);
-    else
+    hal.uartC->begin(map_baudrate(g.serial1_baud), 128, SERIAL1_BUFSIZE);
+    if (g.proxy_mode == true) {
+        proxy_vehicle.setup_uart(hal.uartC, map_baudrate(g.serial1_baud), 128, SERIAL1_BUFSIZE);
+    } else {
         gcs[1].setup_uart(hal.uartC, map_baudrate(g.serial1_baud), 128, SERIAL1_BUFSIZE);
+    }
 
     mavlink_system.sysid = g.sysid_this_mav;