Fixed examples, updated changelog

OpenBluetoothToolbox · Jul 4, 2024 · 171a04c · 171a04c
1 parent 2392971
commit 171a04c
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 9 deletions.
diff --git a/docs/changelog.rst b/docs/changelog.rst
@@ -19,7 +19,7 @@ The format is based on `Keep a Changelog`_, and this project adheres to `Semanti
 
 **Fixed**
 
--
+- (SimpleBluez) Fixed improper handling of non `org.Bluez.Service1` objects within a `org.bluez.Device1` object. *(Thanks Kober Engineering!)*
 
 
 [0.7.X]

diff --git a/examples/simpleble/cpp/connect/connect.cpp b/examples/simpleble/cpp/connect/connect.cpp
@@ -16,7 +16,12 @@ int main() {
 
     std::vector<SimpleBLE::Peripheral> peripherals;
 
-    adapter.set_callback_on_scan_found([&](SimpleBLE::Peripheral peripheral) { peripherals.push_back(peripheral); });
+    adapter.set_callback_on_scan_found([&](SimpleBLE::Peripheral peripheral) {
+        std::cout << "Found device: " << peripheral.identifier() << " [" << peripheral.address() << "]" << std::endl;
+        if (peripheral.is_connectable()) {
+            peripherals.push_back(peripheral);
+        }
+    });
 
     adapter.set_callback_on_scan_start([]() { std::cout << "Scan started." << std::endl; });
     adapter.set_callback_on_scan_stop([]() { std::cout << "Scan stopped." << std::endl; });
@@ -25,10 +30,6 @@ int main() {
 
     std::cout << "The following connectable devices were found:" << std::endl;
     for (size_t i = 0; i < peripherals.size(); i++) {
-        if (!peripherals[i].is_connectable()) {
-            continue;
-        }
-
         std::cout << "[" << i << "] " << peripherals[i].identifier() << " [" << peripherals[i].address() << "]"
                   << std::endl;
     }

diff --git a/examples/simpleble/cpp/notify/notify.cpp b/examples/simpleble/cpp/notify/notify.cpp
@@ -23,7 +23,9 @@ int main() {
 
     adapter.set_callback_on_scan_found([&](SimpleBLE::Peripheral peripheral) {
         std::cout << "Found device: " << peripheral.identifier() << " [" << peripheral.address() << "]" << std::endl;
-        peripherals.push_back(peripheral);
+        if (peripheral.is_connectable()) {
+            peripherals.push_back(peripheral);
+        }
     });
 
     adapter.set_callback_on_scan_start([]() { std::cout << "Scan started." << std::endl; });

diff --git a/examples/simpleble/cpp/read/read.cpp b/examples/simpleble/cpp/read/read.cpp
@@ -22,7 +22,9 @@ int main() {
 
     adapter.set_callback_on_scan_found([&](SimpleBLE::Peripheral peripheral) {
         std::cout << "Found device: " << peripheral.identifier() << " [" << peripheral.address() << "]" << std::endl;
-        peripherals.push_back(peripheral);
+        if (peripheral.is_connectable()) {
+            peripherals.push_back(peripheral);
+        }
     });
 
     adapter.set_callback_on_scan_start([]() { std::cout << "Scan started." << std::endl; });

diff --git a/examples/simpleble/cpp/write/write.cpp b/examples/simpleble/cpp/write/write.cpp
@@ -19,7 +19,9 @@ int main() {
 
     adapter.set_callback_on_scan_found([&](SimpleBLE::Peripheral peripheral) {
         std::cout << "Found device: " << peripheral.identifier() << " [" << peripheral.address() << "]" << std::endl;
-        peripherals.push_back(peripheral);
+        if (peripheral.is_connectable()) {
+            peripherals.push_back(peripheral);
+        }
     });
 
     adapter.set_callback_on_scan_start([]() { std::cout << "Scan started." << std::endl; });