Reverted workaround for h2zero/NimBLE-Arduino#826 (#127)

matthias-bs · Jan 28, 2025 · 817e4f2 · 817e4f2
1 parent a6885e7
commit 817e4f2
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 17 deletions.
diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
@@ -83,12 +83,12 @@ jobs:
             "[email protected]"
             "[email protected]"
             "[email protected]"
-            "[email protected].0"
+            "[email protected].1"
             "[email protected]"
             "[email protected]"
             "[email protected]"
             "[email protected]"
-            "[email protected].2"
+            "[email protected].3"
             "[email protected]"
             "[email protected]")
           for i in "${required_libs[@]}"

diff --git a/package.json b/package.json
@@ -28,7 +28,7 @@
     "ESP32Time": "fbiego/ESP32Time#semver:^2.0.6",
     "OneWireNg": "https://github.com/pstolarz/OneWireNg#semver:^0.13.3",
     "Arduino-Temperature-Control-Library": "milesburton/Arduino-Temperature-Control-Library#semver:^4.0.2",
-    "NimBLE-Arduino": "h2zero/NimBLE-Arduino#semver:^2.2.0",
+    "NimBLE-Arduino": "h2zero/NimBLE-Arduino#semver:^2.2.1",
     "ATC_MiThermometer": "matthias-bs/ATC_MiThermometer#semver:^0.4.2",
     "TheengsDecoder": "theengs/decoder#semver:^1.8.4",
     "Preferences": "vshymanskyy/Preferences#semver:^2.1.0",

diff --git a/src/BleSensors/BleSensors.cpp b/src/BleSensors/BleSensors.cpp
@@ -80,15 +80,7 @@ class ScanCallbacks : public NimBLEScanCallbacks
       {
         log_v("BLE device found at index %d", idx);
         device_found = true;
-
-        // Only count the device as found once
-        // Workaround for
-        // https://github.com/h2zero/NimBLE-Arduino/issues/826
-        if (!(*m_sensorData)[idx].found)
-        {
-          (*m_sensorData)[idx].found = true;
-          m_devices_found++;
-        }
+        m_devices_found++;
         break;
       }
     }
@@ -166,7 +158,6 @@ void BleSensors::resetData(void)
   for (int i = 0; i < _known_sensors.size(); i++)
   {
     data[i].valid = false;
-    data[i].found = false;
   }
 }
 
@@ -175,9 +166,7 @@ void BleSensors::resetData(void)
  */
 unsigned BleSensors::getData(uint32_t scanTime, bool activeScan)
 {
-  // setScanFilterMode() is not available for ESP32-S3
-  // see https://github.com/h2zero/NimBLE-Arduino/issues/826
-  //NimBLEDevice::setScanFilterMode(CONFIG_BTDM_SCAN_DUPL_TYPE_DATA_DEVICE);
+  NimBLEDevice::setScanFilterMode(CONFIG_BTDM_SCAN_DUPL_TYPE_DATA_DEVICE);
 
   NimBLEDevice::init("ble-scan");
   _pBLEScan = NimBLEDevice::getScan();

diff --git a/src/BleSensors/BleSensors.h b/src/BleSensors/BleSensors.h
@@ -56,7 +56,6 @@
  * \brief BLE sensor data
  */
 struct BleDataS {
-      bool     found;              //!< device found
       bool     valid;              //!< data valid
       float    temperature;        //!< temperature in degC
       float    humidity;           //!< humidity in %