Update ESP32 example (#660)

Co-authored-by: Florian <[email protected]>

Author: 1technophile

.github/workflows/build.yml

@@ -125,5 +125,3 @@ jobs:
         run: cmake --build .
       - name: Test
         run: ctest --output-on-failure -V -C Debug .
-
-  

examples/ESP32/ScanAndDecode/ScanAndDecode.ino

@@ -12,7 +12,7 @@ TheengsDecoder decoder;
 
 StaticJsonDocument<512> doc;
 
-class MyAdvertisedDeviceCallbacks: public NimBLEAdvertisedDeviceCallbacks {
+class scanCallbacks : public NimBLEScanCallbacks {
 
   std::string convertServiceData(std::string deviceServiceData) {
     int serviceDataLength = (int)deviceServiceData.length();
@@ -33,13 +33,11 @@ class MyAdvertisedDeviceCallbacks: public NimBLEAdvertisedDeviceCallbacks {
       BLEdata["name"] = (char*)advertisedDevice->getName().c_str();
 
     if (advertisedDevice->haveManufacturerData()) {
-      char* manufacturerdata = BLEUtils::buildHexData(NULL, (uint8_t*)advertisedDevice->getManufacturerData().data(), advertisedDevice->getManufacturerData().length());
+      std::string manufacturerdata = advertisedDevice->getManufacturerData();
       BLEdata["manufacturerdata"] = manufacturerdata;
-      free(manufacturerdata);
     }
 
-    if (advertisedDevice->haveRSSI())
-      BLEdata["rssi"] = (int)advertisedDevice->getRSSI();
+    BLEdata["rssi"] = (int)advertisedDevice->getRSSI();
 
     if (advertisedDevice->haveTXPower())
       BLEdata["txpower"] = (int8_t)advertisedDevice->getTXPower();
@@ -68,7 +66,7 @@ class MyAdvertisedDeviceCallbacks: public NimBLEAdvertisedDeviceCallbacks {
       Serial.println("");
     }
   }
-};
+} scanCallbacks;
 
 void setup() {
   Serial.begin(115200);
@@ -79,7 +77,7 @@ void setup() {
 
   pBLEScan = NimBLEDevice::getScan(); //create new scan
   // Set the callback for when devices are discovered, no duplicates.
-  pBLEScan->setAdvertisedDeviceCallbacks(new MyAdvertisedDeviceCallbacks(), false);
+  pBLEScan->setScanCallbacks(&scanCallbacks, false);
   pBLEScan->setActiveScan(true); // Set active scanning, this will get more data from the advertiser.
   pBLEScan->setInterval(97); // How often the scan occurs / switches channels; in milliseconds,
   pBLEScan->setWindow(37);  // How long to scan during the interval; in milliseconds.
@@ -90,7 +88,7 @@ void loop() {
   // If an error occurs that stops the scan, it will be restarted here.
   if(pBLEScan->isScanning() == false) {
       // Start scan with: duration = 0 seconds(forever), no scan end callback, not a continuation of a previous scan.
-      pBLEScan->start(0, nullptr, false);
+      pBLEScan->start(0, false, false);
   }
 
   delay(2000);

examples/ESP32/ScanAndDecode/platformio.ini

@@ -2,8 +2,8 @@
 src_dir = .
 
 [libraries]
-arduinojson = [email protected].3
-ble = https://github.com/h2zero/NimBLE-Arduino.git#1.3.1
+arduinojson = [email protected].5
+ble = https://github.com/h2zero/NimBLE-Arduino.git#2.3.4
 
 [env]
 lib_extra_dirs = ../../../