From a154282fef7e4f912e434589969ffff4e1da83e9 Mon Sep 17 00:00:00 2001
From: Michael Schaeuble <schaeuble.michael@gmail.com>
Date: Wed, 24 Oct 2018 09:09:49 +0200
Subject: [PATCH] Mavlink: Use UUID for identifier in UTM_GLOBAL_POSITION

---
 src/modules/mavlink/mavlink_messages.cpp | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/modules/mavlink/mavlink_messages.cpp b/src/modules/mavlink/mavlink_messages.cpp
index 4d106f7441..55bf66d207 100644
--- a/src/modules/mavlink/mavlink_messages.cpp
+++ b/src/modules/mavlink/mavlink_messages.cpp
@@ -1775,9 +1775,16 @@ protected:
 			msg.flags |= UTM_DATA_AVAIL_FLAGS_TIME_VALID;
 		}
 
+#ifndef BOARD_HAS_NO_UUID
+		px4_guid_t px4_guid;
+		board_get_px4_guid(px4_guid);
+		static_assert(sizeof(px4_guid_t) == sizeof(msg.uas_id), "GUID byte length mismatch");
+		memcpy(&msg.uas_id, &px4_guid, sizeof(msg.uas_id));
+		msg.flags |= UTM_DATA_AVAIL_FLAGS_UAS_ID_AVAILABLE;
+#else
 		// TODO Fill ID with something reasonable
 		memset(&msg.uas_id[0], 0, sizeof(msg.uas_id));
-		//msg.flags |= UTM_DATA_AVAIL_FLAGS_UAS_ID_AVAILABLE;
+#endif /* BOARD_HAS_NO_UUID */
 
 		// Handle global position
 		if (_global_pos_time > 0) {