info: add vendor and product ID and name

This adds the vendor and product ID and name back.

integration_tests/info.cpp

@@ -44,6 +44,12 @@ TEST_F(SitlTest, Info)
         // FIXME: This is currently 0.
         //EXPECT_NE(version.os_sw_major, 0);
 
+
+        Info::Product product = dc.device().info().get_product();
+
+        std::cout << "Vendor: " << product.vendor_name << std::endl;
+        std::cout << "Product: " << product.product_name << std::endl;
+
         std::this_thread::sleep_for(std::chrono::seconds(1));
     }
 }

plugins/info/info.cpp

@@ -27,4 +27,9 @@ Info::Version Info::get_version() const
     return _impl->get_version();
 }
 
+Info::Product Info::get_product() const
+{
+    return _impl->get_product();
+}
+
 } // namespace dronecore

plugins/info/info.h

@@ -44,8 +44,16 @@ class Info
         int os_sw_minor; /**< @brief Operating system software minor version. */
         int os_sw_patch; /**< @brief Operating system software patch version. */
         char os_sw_git_hash[GIT_HASH_STR_LEN];/**< @brief Operating system software git hash as string. */
-        uint16_t vendor_id; /**< @brief ID of board vendor. */
-        uint16_t product_id; /**< @brief ID of product. */
+    };
+
+    /**
+     * @brief Type containing device product information.
+     */
+    struct Product {
+        int vendor_id; /**< @brief ID of board vendor. */
+        char vendor_name[32]; /**< @brief Name of vendor. */
+        int product_id; /**< @brief ID of product. */
+        char product_name[32]; /**< @brief Name of product. */
     };
 
     /**
@@ -71,6 +79,13 @@ class Info
      */
     Version get_version() const;
 
+    /**
+     * @brief Get device product information.
+     *
+     * @return The product object for the device.
+     */
+    Product get_product() const;
+
     // Non-copyable
     /**
      * @brief Copy Constructor (object is not copyable).

plugins/info/info_impl.cpp

@@ -52,7 +52,7 @@ void InfoImpl::process_autopilot_version(const mavlink_message_t &message)
 
     mavlink_msg_autopilot_version_decode(&message, &autopilot_version);
 
-    Info::Version version = {};
+    Info::Version version {};
 
     version.flight_sw_major = (autopilot_version.flight_sw_version >> (8 * 3)) & 0xFF;
     version.flight_sw_minor = (autopilot_version.flight_sw_version >> (8 * 2)) & 0xFF;
@@ -92,6 +92,18 @@ void InfoImpl::process_autopilot_version(const mavlink_message_t &message)
                             Info::GIT_HASH_STR_LEN);
 
     set_version(version);
+
+    Info::Product product {};
+
+    product.vendor_id = autopilot_version.vendor_id;
+    const char *vendor_name = vendor_id_str(autopilot_version.vendor_id);
+    STRNCPY(product.vendor_name, vendor_name, sizeof(product.vendor_name));
+
+    product.product_id = autopilot_version.product_id;
+    const char *product_name = product_id_str(autopilot_version.product_id);
+    STRNCPY(product.product_name, product_name, sizeof(product.product_name));
+
+    set_product(product);
 }
 
 void InfoImpl::translate_binary_to_str(uint8_t *binary, unsigned binary_len,
@@ -131,11 +143,44 @@ Info::Version InfoImpl::get_version() const
     return _version;
 }
 
+Info::Product InfoImpl::get_product() const
+{
+    std::lock_guard<std::mutex> lock(_product_mutex);
+    return _product;
+}
+
 void InfoImpl::set_version(Info::Version version)
 {
     std::lock_guard<std::mutex> lock(_version_mutex);
     _version = version;
 }
 
+void InfoImpl::set_product(Info::Product product)
+{
+    std::lock_guard<std::mutex> lock(_product_mutex);
+    _product = product;
+}
+
+const char *InfoImpl::vendor_id_str(uint16_t vendor_id)
+{
+    switch (vendor_id) {
+        case 0x26ac:
+            return "Yuneec";
+        default:
+            return "undefined";
+    }
+}
+
+const char *InfoImpl::product_id_str(uint16_t product_id)
+{
+    switch (product_id) {
+        case 0x0010:
+            return "H520";
+        default:
+            return "undefined";
+    }
+}
+
+
 
 } // namespace dronecore

plugins/info/info_impl.h

@@ -16,19 +16,27 @@ class InfoImpl : public PluginImplBase
     uint64_t get_uuid() const;
     bool is_complete() const;
     Info::Version get_version() const;
+    Info::Product get_product() const;
 
     void init() override;
     void deinit() override;
 
 private:
     void set_version(Info::Version version);
+    void set_product(Info::Product product);
 
     void process_heartbeat(const mavlink_message_t &message);
     void process_autopilot_version(const mavlink_message_t &message);
 
     mutable std::mutex _version_mutex;
     Info::Version _version = {};
 
+    mutable std::mutex _product_mutex;
+    Info::Product _product = {};
+
+    static const char *vendor_id_str(uint16_t vendor_id);
+    static const char *product_id_str(uint16_t product_id);
+
     static void translate_binary_to_str(uint8_t *binary, unsigned binary_len,
                                         char *str, unsigned str_len);
 };