Merge pull request #7 from schoolpost/libraryfix

arduino esp32 1.0.5 library fix
schoolpost · Mar 6, 2021 · 99d89f7 · 99d89f7
2 parents f3947f4 + 7015aa8
commit 99d89f7
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 7 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -0,0 +1,5 @@
+{
+    "files.associations": {
+        "*.yaml": "home-assistant"
+    }
+}
diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # BlueMagic32
 
-![](https://img.shields.io/badge/Version-1.0.1-green.svg) ![](https://img.shields.io/badge/BlackmagicCameraControl-1.3-green.svg)
+![](https://img.shields.io/badge/Version-1.0.2-green.svg) ![](https://img.shields.io/badge/BlackmagicCameraControl-1.3-green.svg) ![](https://img.shields.io/badge/arduino--esp32-1.0.5-green.svg)
 
 Arduino ESP32 Library for connecting to Blackmagic Cameras using Bluetooth Low Energy.
 

diff --git a/src/BlueMagicCameraConnection.cpp b/src/BlueMagicCameraConnection.cpp
@@ -159,10 +159,6 @@ class MyAdvertisedDeviceCallbacks : public BLEAdvertisedDeviceCallbacks
     {
       advertisedDevice.getScan()->stop();
     }
-    else
-    {
-      advertisedDevice.getScan()->erase(advertisedDevice.getAddress());
-    }
   }
 };
 
@@ -405,8 +401,13 @@ BlueMagicCameraController *BlueMagicCameraConnection::connect(uint8_t index)
 
   if (scanned)
   {
-    address = _bleScan->getResults().getDevice(index).getAddress();
-    ok = connectToServer(address);
+    int count = _bleScan->getResults().getCount();
+    if (count > 0)
+    {
+      int foundIndex = count - 1;
+      address = _bleScan->getResults().getDevice(foundIndex).getAddress();
+      ok = connectToServer(address);
+    }
   }
   else
   {