Advertising demo with manufacturer data works.

examples/simplebluez/advertise/advertise.cpp

@@ -51,7 +51,9 @@ int main(int argc, char* argv[]) {
     adapter->register_advertisement(advertisement->path());
 
     // Sleep for a bit to allow the adapter to stop discovering.
-    millisecond_delay(3000);
+    millisecond_delay(8000);
+
+    adapter->unregister_advertisement(advertisement->path());
 
     async_thread_active = false;
     while (!async_thread->joinable()) {

simplebluez/include/simplebluez/CustomAdvertisement.h

@@ -1,7 +1,9 @@
 #pragma once
 
 #include <simpledbus/advanced/Proxy.h>
+
 #include <simplebluez/interfaces/LEAdvertisement1.h>
+#include <simpledbus/interfaces/ObjectManager.h>
 
 namespace SimpleBluez {
 
@@ -13,6 +15,7 @@ class CustomAdvertisement : public SimpleDBus::Proxy {
 
   private:
     std::shared_ptr<LEAdvertisement1> le_advertisement1();
+    std::shared_ptr<SimpleDBus::ObjectManager> object_manager();
 };
 
 }  // namespace SimpleBluez

simplebluez/include/simplebluez/CustomAdvertisementManager.h

@@ -19,7 +19,7 @@ class CustomAdvertisementManager : public SimpleDBus::Proxy {
     void remove_advertisement(const std::string& path);
 
   private:
-    std::shared_ptr<SimpleDBus::ObjectManager> object_manager();
+
 };
 
 }  // namespace SimpleBluez

simplebluez/src/Adapter.cpp

@@ -79,6 +79,7 @@ void Adapter::register_advertisement(const std::string& advertisement_path) {
 }
 
 void Adapter::unregister_advertisement(const std::string& advertisement_path) {
+    // TODO: We should keep track of all registered advertisements and unregister them when the adapter is destroyed.
     le_advertising_manager1()->UnregisterAdvertisement(advertisement_path);
 }
 

simplebluez/src/CustomAdvertisement.cpp

@@ -7,8 +7,13 @@ CustomAdvertisement::CustomAdvertisement(std::shared_ptr<SimpleDBus::Connection>
     : Proxy(conn, bus_name, path) {
 
     _interfaces.emplace(std::make_pair("org.bluez.LEAdvertisement1", std::make_shared<LEAdvertisement1>(conn, this)));
+    _interfaces.emplace(std::make_pair("org.freedesktop.DBus.ObjectManager", std::make_shared<SimpleDBus::ObjectManager>(conn, this)));
 }
 
 std::shared_ptr<LEAdvertisement1> CustomAdvertisement::le_advertisement1() {
     return std::dynamic_pointer_cast<LEAdvertisement1>(interface_get("org.bluez.LEAdvertisement1"));
 }
+
+std::shared_ptr<SimpleDBus::ObjectManager> CustomAdvertisement::object_manager() {
+    return std::dynamic_pointer_cast<SimpleDBus::ObjectManager>(interface_get("org.freedesktop.DBus.ObjectManager"));
+}

simplebluez/src/CustomAdvertisementManager.cpp

@@ -5,8 +5,6 @@ using namespace SimpleBluez;
 
 CustomAdvertisementManager::CustomAdvertisementManager(std::shared_ptr<SimpleDBus::Connection> conn, const std::string& bus_name, const std::string& path)
     : Proxy(conn, bus_name, path) {
-
-    _interfaces.emplace(std::make_pair("org.freedesktop.DBus.ObjectManager", std::make_shared<SimpleDBus::ObjectManager>(conn, this)));
 }
 
 std::shared_ptr<SimpleBluez::CustomAdvertisement> CustomAdvertisementManager::create_advertisement(const std::string& path) {
@@ -20,7 +18,3 @@ void CustomAdvertisementManager::remove_advertisement(const std::string& path) {
     const std::string advertisement_path = _path + "/" + path;
     path_remove_child(advertisement_path);
 }
-
-std::shared_ptr<SimpleDBus::ObjectManager> CustomAdvertisementManager::object_manager() {
-    return std::dynamic_pointer_cast<SimpleDBus::ObjectManager>(interface_get("org.freedesktop.DBus.ObjectManager"));
-}

simplebluez/src/interfaces/LEAdvertisement1.cpp

@@ -8,7 +8,10 @@ LEAdvertisement1::LEAdvertisement1(std::shared_ptr<SimpleDBus::Connection> conn,
     // Set all fields to null or empty values
     SetType("peripheral"); // This is the only required field, so we set a default
     // SetServiceUUIDs({}); // Empty vector
-    // SetManufacturerData({}); // Empty map
+
+    std::map<uint16_t, std::vector<uint8_t>> data;
+    data[0x1024] = {0x00, 0x01, 0x02, 0x03, 0x04, 0x05};
+    SetManufacturerData(data); // Empty map
     // SetServiceData({}); // Empty map
     // SetSolicitUUIDs({}); // Empty vector
     // SetData({}); // Empty map

simpledbus/include/simpledbus/base/Holder.h

@@ -1,6 +1,7 @@
 #pragma once
 
 #include <any>
+#include <optional>
 #include <cstdint>
 #include <map>
 #include <string>
@@ -61,6 +62,7 @@ class Holder {
     Type type() const;
     std::string represent();
     std::string signature();
+    void signature_override(const std::string& signature);
 
     // TODO: Deprecate these functions in favor of templated version.
     static Holder create_boolean(bool value);
@@ -120,16 +122,14 @@ class Holder {
 
   private:
     Type _type = NONE;
+    std::optional<std::string> _signature;
 
     bool holder_boolean = false;
     uint64_t holder_integer = 0;
     double holder_double = 0;
-
     std::string holder_string;
     std::vector<Holder> holder_array;
-
-    // Dictionaries are stored within a vector as a tuple of <key_type, key, holder>
-    std::vector<std::tuple<Type, std::any, Holder>> holder_dict;
+    std::vector<std::tuple<Type, std::any, Holder>> holder_dict; // Dictionaries are stored within a vector as a tuple of <key_type, key, holder>
 
     std::vector<std::string> _represent_container();
     std::string _represent_simple();

simpledbus/src/base/Holder.cpp

@@ -271,7 +271,16 @@ std::string Holder::_represent_type(Type type, std::any value) {
     return output.str();
 }
 
+void Holder::signature_override(const std::string& signature) {
+    // TODO: Check that the signature is valid for the Holder type and contents.
+    _signature = signature;
+}
+
 std::string Holder::signature() {
+    if (_signature) {
+        return *_signature;
+    }
+
     std::string output;
     switch (_type) {
         case BOOLEAN:
@@ -343,7 +352,7 @@ std::string Holder::signature() {
                     }
                 }
 
-                if (all_same_value_type) {
+                if (all_same_value_type && first_value_type != ARRAY && first_value_type != DICT) {
                     output += std::get<2>(holder_dict[0])._signature_simple();
                 } else {
                     output += DBUS_TYPE_VARIANT_AS_STRING;