From e0f052dd9a126c61d083630255ec9bcdc50b0490 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Wed, 9 Jan 2013 09:45:45 +1100
Subject: [PATCH] Plane: update for new AP_Param API

---
 ArduPlane/GCS_Mavlink.pde | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/ArduPlane/GCS_Mavlink.pde b/ArduPlane/GCS_Mavlink.pde
index 0c4e9a7975..de96752931 100644
--- a/ArduPlane/GCS_Mavlink.pde
+++ b/ArduPlane/GCS_Mavlink.pde
@@ -1334,21 +1334,23 @@ void GCS_MAVLINK::handleMessage(mavlink_message_t* msg)
         if (mavlink_check_target(packet.target_system,packet.target_component)) break;
         enum ap_var_type p_type;
         AP_Param *vp;
+        char param_name[AP_MAX_NAME_SIZE];
         if (packet.param_index != -1) {
-            vp = AP_Param::find_by_index(packet.param_index, &p_type);
+            AP_Param::ParamToken token;
+            vp = AP_Param::find_by_index(packet.param_index, &p_type, &token);
             if (vp == NULL) {
                 gcs_send_text_fmt(PSTR("Unknown parameter index %d"), packet.param_index);
                 break;
             }
+            vp->copy_name_token(&token, param_name, sizeof(param_name), true);
         } else {
             vp = AP_Param::find(packet.param_id, &p_type);
             if (vp == NULL) {
                 gcs_send_text_fmt(PSTR("Unknown parameter %.16s"), packet.param_id);
                 break;
             }
+            strncpy(param_name, packet.param_id, AP_MAX_NAME_SIZE);
         }
-        char param_name[AP_MAX_NAME_SIZE];
-        vp->copy_name(param_name, sizeof(param_name), true);
 
         float value = vp->cast_to_float(p_type);
         mavlink_msg_param_value_send(
@@ -1967,7 +1969,7 @@ GCS_MAVLINK::queued_param_send()
         value = vp->cast_to_float(_queued_parameter_type);
 
         char param_name[AP_MAX_NAME_SIZE];
-        vp->copy_name(param_name, sizeof(param_name), true);
+        vp->copy_name_token(&_queued_parameter_token, param_name, sizeof(param_name), true);
 
         mavlink_msg_param_value_send(
             chan,