alex/esp-idf
alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2024-10-05 20:47:46 -04:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge branch 'bugfix/fixed_task_invokation_after_pairing_v5.2' into 'release/v5.2'

Browse Source 
fix(nimble): Fixed the call to ble_hid_task_startup after pairing (v5.2)

See merge request espressif/esp-idf!29695
This commit is contained in:
Rahul Tank 2024-03-20 17:36:43 +08:00
commit 962d9de65e
3 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/bt/host/nimble/nimble

@ -1 +1 @@
Subproject commit c0dd77a8355dd82d0bc1b501e6d118a91eb14df1
Subproject commit 28844aaa7fa5dd2587ea4fb297e0a71af8c5465c

11
examples/bluetooth/esp_hid_device/main/esp_hid_gap.c
View File

@ -1,5 +1,5 @@
/*
* SPDX-FileCopyrightText: 2021-2023 Espressif Systems (Shanghai) CO LTD
* SPDX-FileCopyrightText: 2021-2024 Espressif Systems (Shanghai) CO LTD
*
* SPDX-License-Identifier: Unlicense OR CC0-1.0
*/
@ -22,6 +22,8 @@
#include "host/ble_hs_adv.h"
#include "nimble/ble.h"
#include "host/ble_sm.h"
#else
#include "esp_bt_device.h"
#endif
static const char *TAG = "ESP_HID_GAP";
@ -725,9 +727,13 @@ esp_err_t esp_hid_ble_gap_adv_start(void)
return esp_ble_gap_start_advertising(&hidd_adv_params);
}
#endif /* CONFIG_BT_BLE_ENABLED */
#if CONFIG_BT_NIMBLE_ENABLED
static struct ble_hs_adv_fields fields;
#define GATT_SVR_SVC_HID_UUID 0x1812
extern void ble_hid_task_start_up(void);
static struct ble_hs_adv_fields fields;
esp_err_t esp_hid_ble_gap_adv_init(uint16_t appearance, const char *device_name)
{
ble_uuid16_t *uuid16, *uuid16_1;
@ -834,6 +840,7 @@ nimble_hid_gap_event(struct ble_gap_event *event, void *arg)
event->enc_change.status);
rc = ble_gap_conn_find(event->enc_change.conn_handle, &desc);
assert(rc == 0);
ble_hid_task_start_up();
return 0;
case BLE_GAP_EVENT_NOTIFY_TX:

2
examples/bluetooth/esp_hid_host/main/esp_hid_gap.c
View File

@ -22,6 +22,8 @@
#include "nimble/ble.h"
#include "host/ble_sm.h"
#define BLE_HID_SVC_UUID 0x1812 /* HID Service*/
#else
#include "esp_bt_device.h"
#endif
static const char *TAG = "ESP_HID_GAP";