From 079d48f6cc104eb20d162eb94f15389ef9f706d6 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Tue, 26 Nov 2013 11:58:18 +1100
Subject: [PATCH] Plane: use log system ID if available

---
 ArduPlane/GCS_Mavlink.pde | 6 ++++++
 ArduPlane/Log.pde         | 6 ++++++
 2 files changed, 12 insertions(+)

diff --git a/ArduPlane/GCS_Mavlink.pde b/ArduPlane/GCS_Mavlink.pde
index d861294e8c..5b25d5f1cb 100644
--- a/ArduPlane/GCS_Mavlink.pde
+++ b/ArduPlane/GCS_Mavlink.pde
@@ -1485,6 +1485,12 @@ void GCS_MAVLINK::handleMessage(mavlink_message_t* msg)
         // mark the firmware version in the tlog
         send_text_P(SEVERITY_LOW, PSTR(FIRMWARE_STRING));
 
+        // send system ID if we can
+        char sysid[40];
+        if (hal.util->get_system_id(sysid)) {
+            mavlink_send_text(chan, SEVERITY_LOW, sysid);
+        }
+
         // Start sending parameters - next call to ::update will kick the first one out
         _queued_parameter = AP_Param::first(&_queued_parameter_token, &_queued_parameter_type);
         _queued_parameter_index = 0;
diff --git a/ArduPlane/Log.pde b/ArduPlane/Log.pde
index c294f28d44..6c7d7b9d74 100644
--- a/ArduPlane/Log.pde
+++ b/ArduPlane/Log.pde
@@ -504,6 +504,12 @@ static void start_logging()
 {
     DataFlash.StartNewLog(sizeof(log_structure)/sizeof(log_structure[0]), log_structure);
     DataFlash.Log_Write_Message_P(PSTR(FIRMWARE_STRING));
+
+    // write system identifier as well if available
+    char sysid[40];
+    if (hal.util->get_system_id(sysid)) {
+        DataFlash.Log_Write_Message(sysid);
+    }
 }
 
 #else // LOGGING_ENABLED