Merge branch 'fix/esp_hid_device_deint_reset_v5.3' into 'release/v5.3'

fix(nimble): Reset HID service during deinit (v5.3)

See merge request espressif/esp-idf!41900

components/bt/host/nimble/Kconfig.in

@@ -290,7 +290,7 @@ menu "GAP"
     config BT_NIMBLE_MAX_CCCDS
         int "Maximum number of CCC descriptors to save across reboots"
         default 8
-        depends on BT_NIMBLE_ENABLED && BT_NIMBLE_NVS_PERSIST
+        depends on BT_NIMBLE_ENABLED
         help
             Defines maximum number of CCC descriptors to save
 
@@ -1216,6 +1216,15 @@ menu "Extra Features"
         help
             This option is used to enable encrypted advertising data.
 
+    config BT_NIMBLE_ADV_UUID_CONCAT
+        bool "concatenate uuids while parsing advertising data"
+        default n
+        depends on BT_NIMBLE_ENABLED
+        help
+            Enables concatenation of multiple UUIDs of the same type while parsing
+            advertising data on the central device. When disabled, only the last
+            parsed UUID of a given type is retained.
+
     config BT_NIMBLE_MAX_EADS
         int "Maximum number of EAD devices to save across reboots"
         default 10

components/bt/host/nimble/port/include/esp_nimble_cfg.h

@@ -118,6 +118,12 @@
 #define MYNEWT_VAL_ENC_ADV_DATA (CONFIG_BT_NIMBLE_ENC_ADV_DATA)
 #endif
 
+#ifndef CONFIG_BT_NIMBLE_ADV_UUID_CONCAT
+#define MYNEWT_VAL_BLE_ADV_UUID_CONCAT (0)
+#else
+#define MYNEWT_VAL_BLE_ADV_UUID_CONCAT (CONFIG_BT_NIMBLE_ADV_UUID_CONCAT)
+#endif
+
 #if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_EXT_ADV)
 #define BLE_SCAN_RSP_DATA_MAX_LEN_N     (1650)
 #else

components/esp_hid/src/nimble_hidd.c

@@ -35,6 +35,11 @@ static const char *TAG = "NIMBLE_HIDD";
 typedef struct esp_ble_hidd_dev_s esp_ble_hidd_dev_t;
 // there can be only one BLE HID device
 static esp_ble_hidd_dev_t *s_dev = NULL;
+/** service index is used to identify the hid service instance
+    of the registered characteristic.
+    Assuming the first instance of the hid service is registered first.
+    Increment service index as the hid services get registered */
+static int service_index = -1;
 
 typedef hidd_report_item_t hidd_le_report_item_t;
 
@@ -183,6 +188,15 @@ static int nimble_hid_stop_gatts(esp_ble_hidd_dev_t *dev)
 
     /* stop gatt database */
     ble_gatts_stop();
+
+    ble_svc_hid_deinit();
+    ble_svc_hid_reset();
+    ble_svc_dis_deinit();
+    ble_svc_bas_deinit();
+    ble_svc_sps_deinit();
+    ble_svc_gatt_deinit();
+    ble_svc_gap_deinit();
+
     return rc;
 }
 
@@ -283,6 +297,7 @@ static int nimble_hidd_dev_deinit(void *devp)
         return ESP_FAIL;
     }
     s_dev = NULL;
+    service_index = -1; // resetting the value
 
     nimble_hid_stop_gatts(dev);
     esp_event_post_to(dev->event_loop_handle, ESP_HIDD_EVENTS, ESP_HIDD_STOP_EVENT, NULL, 0, portMAX_DELAY);
@@ -521,11 +536,6 @@ static int nimble_hid_gap_event(struct ble_gap_event *event, void *arg)
     return 0;
 }
 
-/** service index is used to identify the hid service instance
-    of the registered characteristic.
-    Assuming the first instance of the hid service is registered first.
-    Increment service index as the hid services get registered */
-static int service_index = -1;
 static void nimble_gatt_svr_register_cb(struct ble_gatt_register_ctxt *ctxt, void *arg)
 {
     char buf[BLE_UUID_STR_LEN];

components/esp_hid/src/nimble_hidh.c

@@ -289,7 +289,7 @@ desc_disced(uint16_t conn_handle, const struct ble_gatt_error *error,
 }
 
 /* this api does the following things :
-** does service, characteristic and discriptor discovery and
+** does service, characteristic and descriptor discovery and
 ** fills the hid device information accordingly in dev */
 static void read_device_services(esp_hidh_dev_t *dev)
 {
@@ -466,7 +466,7 @@ static void read_device_services(esp_hidh_dev_t *dev)
                                                  chr_end_handle, desc_disced, descr_result);
                     WAIT_CB();
                     if (status != 0) {
-                        ESP_LOGE(TAG, "failed to find discriptors for characteristic : %d", c);
+                        ESP_LOGE(TAG, "failed to find descriptors for characteristic : %d", c);
                         assert(status == 0);
                     }
                     dcount = dscs_discovered;
@@ -949,6 +949,7 @@ esp_hidh_dev_t *esp_ble_hidh_dev_open(uint8_t *bda, uint8_t address_type)
     dev->report_write = esp_ble_hidh_dev_report_write;
     dev->report_read = esp_ble_hidh_dev_report_read;
     dev->dump = esp_ble_hidh_dev_dump;
+    dev->connected = true;
 
     /* perform service discovery and fill the report maps */
     read_device_services(dev);