Merge branch 'feature/AEGHB-665' into 'master'

feat(ble): Support config UUID in broadasting

Closes AEGHB-665

See merge request ae_group/esp-iot-solution!1167

Author: XionHsieh1025

components/bluetooth/ble_conn_mgr/CHANGELOG.md

@@ -1,3 +1,11 @@
+# ChangeLog
+
+## v0.1.3 - 2024-12-09
+
+### Enhancements:
+
+* Support Config UUID Information in BLE broadcasting.
+
 ## v0.1.2 - 2024-5-22
 
 ### Bug Fixes:

components/bluetooth/ble_conn_mgr/idf_component.yml

@@ -1,4 +1,4 @@
-version: "0.1.2"
+version: "0.1.3"
 description: A common layer to manage the BLE connection, support both Bluedroid and Nimble
 url: https://github.com/espressif/esp-iot-solution/tree/master/components/bluetooth/ble_conn_mgr
 dependencies:

components/bluetooth/ble_conn_mgr/include/esp_ble_conn_mgr.h

@@ -153,6 +153,7 @@ typedef struct {
     const char *extended_adv_rsp_data;              /*!< Extended advertising responses data */
 
     uint16_t    include_service_uuid: 1;            /*!< If include service UUID in advertising */
+    uint16_t    adv_uuid16;                         /*!< NOTE: Only Support one 16-bit UUID */
 } esp_ble_conn_config_t;
 
 /**

components/bluetooth/ble_conn_mgr/src/esp_nimble.c

@@ -1892,6 +1892,8 @@ esp_err_t esp_ble_conn_init(esp_ble_conn_config_t *config)
 #endif
 
 #else
+    uint8_t offset = 0;
+    esp_nimble_maps_t uuid_data;
     /* Store BLE announce data internally */
     esp_nimble_maps_t announce_data[] = {
         {
@@ -1907,6 +1909,13 @@ esp_err_t esp_ble_conn_init(esp_ble_conn_config_t *config)
         conn_session->adv_data_len += announce_data[i].length + 2;
     }
 
+    if (config->include_service_uuid) {
+        uuid_data.type = BLE_CONN_DATA_UUID16_ALL;
+        uuid_data.length = sizeof(config->adv_uuid16);
+        uuid_data.value = (uint8_t *)(&(config->adv_uuid16));
+        conn_session->adv_data_len += uuid_data.length + 2;
+    }
+
     if (conn_session->adv_data_len > BLE_ADV_DATA_LEN_MAX) {
         ESP_LOGE(TAG, "Advertisement data too long = %d bytes", conn_session->adv_data_len);
         goto ble_init_error;
@@ -1925,6 +1934,14 @@ esp_err_t esp_ble_conn_init(esp_ble_conn_config_t *config)
         conn_session->adv_data_buf[len++] = announce_data[i].type;
         memcpy(&conn_session->adv_data_buf[len], announce_data[i].value, announce_data[i].length);
         len += announce_data[i].length;
+        offset = len;
+    }
+
+    if (config->include_service_uuid) {
+        conn_session->adv_data_buf[offset++] = uuid_data.length + 1;
+        conn_session->adv_data_buf[offset++] = uuid_data.type;
+        memcpy(&conn_session->adv_data_buf[offset], uuid_data.value, uuid_data.length);
+        offset += uuid_data.length;
     }
 
     /* Store BLE scan response data internally */