info: add legacy uid (uid1)

src/mavsdk_server/src/plugins/info/info_service_impl.h

@@ -67,6 +67,8 @@ class InfoServiceImpl final : public rpc::info::InfoService::Service {
 
         rpc_obj->set_hardware_uid(identification.hardware_uid);
 
+        rpc_obj->set_legacy_uid(identification.legacy_uid);
+
         return rpc_obj;
     }
 
@@ -77,6 +79,8 @@ class InfoServiceImpl final : public rpc::info::InfoService::Service {
 
         obj.hardware_uid = identification.hardware_uid();
 
+        obj.legacy_uid = identification.legacy_uid();
+
         return obj;
     }
 

src/plugins/info/include/plugins/info/info.h

@@ -86,6 +86,8 @@ class Info : public PluginBase {
         std::string
             hardware_uid{}; /**< @brief UID of the hardware. This refers to uid2 of MAVLink. If the
                                system does not support uid2 yet, this is all zeros. */
+        uint64_t legacy_uid{}; /**< @brief Legacy UID of the hardware, referred to as uid in MAVLink
+                                  (formerly exposed during system discovery as UUID). */
     };
 
     /**

src/plugins/info/info.cpp

@@ -62,14 +62,15 @@ std::ostream& operator<<(std::ostream& str, Info::FlightInfo const& flight_info)
 
 bool operator==(const Info::Identification& lhs, const Info::Identification& rhs)
 {
-    return (rhs.hardware_uid == lhs.hardware_uid);
+    return (rhs.hardware_uid == lhs.hardware_uid) && (rhs.legacy_uid == lhs.legacy_uid);
 }
 
 std::ostream& operator<<(std::ostream& str, Info::Identification const& identification)
 {
     str << std::setprecision(15);
     str << "identification:" << '\n' << "{\n";
     str << "    hardware_uid: " << identification.hardware_uid << '\n';
+    str << "    legacy_uid: " << identification.legacy_uid << '\n';
     str << '}';
     return str;
 }

src/plugins/info/info_impl.cpp

@@ -150,6 +150,8 @@ void InfoImpl::process_autopilot_version(const mavlink_message_t& message)
     _identification.hardware_uid =
         translate_binary_to_str(autopilot_version.uid2, sizeof(autopilot_version.uid2));
 
+    _identification.legacy_uid = autopilot_version.uid;
+
     _information_received = true;
 }