feat(ble): Update esp-nimble-cpp to latest upstream for API refactor (#347)

* feat(ble): Update esp-nimble-cpp to latest upstream for API refactor
* Update esp-nimble-cpp submodule to latest `main` which matches upstream
* Update `ble_gatt_server`, `gfps_server`, components
* Update affected examples

* fix: use `getPeerInfoByHandle` which is what `getPeerIDInfo` was renamed to

Author: finger563

components/ble_gatt_server/example/main/ble_gatt_server_example.cpp

@@ -41,8 +41,8 @@ extern "C" void app_main(void) {
         .confirm_passkey_callback =
             [&](const NimBLEConnInfo &conn_info, uint32_t passkey) {
               logger.info("Confirming passkey: {}", passkey);
-              NimBLEDevice::injectConfirmPIN(conn_info,
-                                             passkey == NimBLEDevice::getSecurityPasskey());
+              NimBLEDevice::injectConfirmPasskey(conn_info,
+                                                 passkey == NimBLEDevice::getSecurityPasskey());
             },
     });
     ble_gatt_server.init(device_name);

components/ble_gatt_server/include/ble_gatt_server.hpp

@@ -502,7 +502,7 @@ class BleGattServer : public BaseComponent {
     std::vector<NimBLEAddress> connected_addresses;
     auto peer_ids = server_->getPeerDevices();
     for (const auto &peer_id : peer_ids) {
-      auto peer = server_->getPeerIDInfo(peer_id);
+      auto peer = server_->getPeerInfoByHandle(peer_id);
       connected_addresses.push_back(peer.getAddress());
     }
     return connected_addresses;
@@ -518,7 +518,7 @@ class BleGattServer : public BaseComponent {
     std::vector<NimBLEConnInfo> connected_devices_info;
     auto peer_ids = server_->getPeerDevices();
     for (const auto &peer_id : peer_ids) {
-      auto peer = server_->getPeerIDInfo(peer_id);
+      auto peer = server_->getPeerInfoByHandle(peer_id);
       connected_devices_info.push_back(peer);
     }
     return connected_devices_info;
@@ -579,7 +579,7 @@ class BleGattServer : public BaseComponent {
     std::vector<std::string> connected_device_names;
     auto peer_ids = server_->getPeerDevices();
     for (const auto &peer_id : peer_ids) {
-      auto peer = server_->getPeerIDInfo(peer_id);
+      auto peer = server_->getPeerInfoByHandle(peer_id);
       auto peer_name = get_connected_device_name(peer);
       if (!peer_name.empty()) {
         connected_device_names.push_back(peer_name);
@@ -635,7 +635,7 @@ class BleGattServer : public BaseComponent {
     std::vector<int> connected_device_rssi;
     auto peer_ids = server_->getPeerDevices();
     for (const auto &peer_id : peer_ids) {
-      auto peer = server_->getPeerIDInfo(peer_id);
+      auto peer = server_->getPeerInfoByHandle(peer_id);
       auto peer_rssi = get_connected_device_rssi(peer);
       connected_device_rssi.push_back(peer_rssi);
     }
@@ -654,7 +654,7 @@ class BleGattServer : public BaseComponent {
     std::vector<NimBLEAddress> disconnected_devices;
     auto peer_ids = server_->getPeerDevices();
     for (const auto &peer_id : peer_ids) {
-      auto peer = server_->getPeerIDInfo(peer_id);
+      auto peer = server_->getPeerInfoByHandle(peer_id);
       disconnected_devices.push_back(peer.getAddress());
       server_->disconnect(peer_id);
     }

components/ble_gatt_server/include/ble_gatt_server_callbacks.hpp

@@ -17,7 +17,7 @@ class BleGattServerCallbacks : public NimBLEServerCallbacks {
   virtual void onDisconnect(NimBLEServer *server, NimBLEConnInfo &conn_info, int reason) override;
   virtual void onAuthenticationComplete(NimBLEConnInfo &conn_info) override;
   virtual uint32_t onPassKeyDisplay() override;
-  virtual void onConfirmPIN(NimBLEConnInfo &conn_info, uint32_t pass_key) override;
+  virtual void onConfirmPassKey(NimBLEConnInfo &conn_info, uint32_t pass_key) override;
 
 protected:
   friend class BleGattServer;

components/ble_gatt_server/src/ble_gatt_server.cpp

@@ -75,7 +75,7 @@ bool BleGattServer::start_advertising(const AdvertisingParameters &advertising_p
   // configure the advertising parameters
   advertising->setMinInterval(min_interval_units);
   advertising->setMaxInterval(max_interval_units);
-  advertising->setScanResponse(advertising_params.scan_response);
+  advertising->enableScanResponse(advertising_params.scan_response);
 
   if (advertising_params.include_tx_power) {
     advertising->addTxPower();
@@ -90,20 +90,22 @@ bool BleGattServer::start_advertising(const AdvertisingParameters &advertising_p
   if (advertising_params.connectable) {
     if (advertising_params.directed_address) {
       // directed, connectable
-      advertising->setAdvertisementType(BLE_GAP_CONN_MODE_DIR);
+      advertising->setConnectableMode(BLE_GAP_CONN_MODE_DIR);
     } else {
       // undirected, connectable
-      advertising->setAdvertisementType(BLE_GAP_CONN_MODE_UND);
+      advertising->setConnectableMode(BLE_GAP_CONN_MODE_UND);
     }
   } else {
     // non-connectable
-    advertising->setAdvertisementType(BLE_GAP_CONN_MODE_NON);
+    advertising->setConnectableMode(BLE_GAP_CONN_MODE_NON);
   }
 
+  // set the callback
+  advertising->setAdvertisingCompleteCallback(callbacks_.advertisement_complete_callback);
+
   // now actually start advertising
   bool success =
-      advertising->start(advertising_params.duration_ms, callbacks_.advertisement_complete_callback,
-                         advertising_params.directed_address);
+      advertising->start(advertising_params.duration_ms, advertising_params.directed_address);
   if (!success) {
     logger_.error("Failed to start advertising");
   }
@@ -124,13 +126,17 @@ bool BleGattServer::start_advertising(uint32_t duration_ms, NimBLEAddress *direc
   // assume connectable
   if (directed_address) {
     // directed, connectable
-    advertising->setAdvertisementType(BLE_GAP_CONN_MODE_DIR);
+    advertising->setConnectableMode(BLE_GAP_CONN_MODE_DIR);
   } else {
     // undirected, connectable
-    advertising->setAdvertisementType(BLE_GAP_CONN_MODE_UND);
+    advertising->setConnectableMode(BLE_GAP_CONN_MODE_UND);
   }
-  auto success =
-      advertising->start(duration_ms, callbacks_.advertisement_complete_callback, directed_address);
+
+  // set the callback
+  advertising->setAdvertisingCompleteCallback(callbacks_.advertisement_complete_callback);
+
+  // now actually start advertising
+  auto success = advertising->start(duration_ms, directed_address);
   if (!success) {
     logger_.error("Failed to start advertising");
   }

components/ble_gatt_server/src/ble_gatt_server_callbacks.cpp

@@ -64,11 +64,11 @@ uint32_t BleGattServerCallbacks::onPassKeyDisplay() {
     return NimBLEDevice::getSecurityPasskey();
   }
 }
-void BleGattServerCallbacks::onConfirmPIN(NimBLEConnInfo &conn_info, uint32_t pass_key) {
+void BleGattServerCallbacks::onConfirmPassKey(NimBLEConnInfo &conn_info, uint32_t pass_key) {
   if (server_ && server_->callbacks_.confirm_passkey_callback) {
     server_->callbacks_.confirm_passkey_callback(conn_info, pass_key);
   } else {
-    NimBLEDevice::injectConfirmPIN(conn_info, pass_key == NimBLEDevice::getSecurityPasskey());
+    NimBLEDevice::injectConfirmPasskey(conn_info, pass_key == NimBLEDevice::getSecurityPasskey());
   }
 }
 

components/esp-nimble-cpp

@@ -267,7 +267,7 @@ void nearby_platform_SetRemotePasskey(uint32_t passkey) {
   // index)
   auto conn_info = NimBLEDevice::getServer()->getPeerInfo(0);
   // Now actually respond to the pairing request
-  NimBLEDevice::injectConfirmPIN(conn_info, accept);
+  NimBLEDevice::injectConfirmPasskey(conn_info, accept);
 #endif // CONFIG_BT_NIMBLE_ENABLED
 }
 

components/gfps_service/src/nearby_ble.cpp

@@ -40,8 +40,8 @@ extern "C" void app_main(void) {
       .confirm_passkey_callback =
           [&](const NimBLEConnInfo &conn_info, uint32_t passkey) {
             logger.info("Confirming passkey: {}", passkey);
-            NimBLEDevice::injectConfirmPIN(conn_info,
-                                           passkey == NimBLEDevice::getSecurityPasskey());
+            NimBLEDevice::injectConfirmPasskey(conn_info,
+                                               passkey == NimBLEDevice::getSecurityPasskey());
           },
   });
   ble_gatt_server.init(device_name);