espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-07-30 18:57:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix(bt/bluedroid): Optimize compatibility with Android 10 and later devices

Browse Source
This commit is contained in:
zhanghaipeng
2023-10-23 15:47:13 +08:00
parent 6a94399233
commit b35c41aee0
2 changed files with 3 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
components/esp_hid/src/ble_hidd.c
View File

@ -463,7 +463,7 @@ static void hid_event_handler(esp_ble_hidd_dev_t *dev, int device_index, esp_gat
link_report_handles(&dev->devices[device_index], param->add_attr_tab.handles); link_report_handles(&dev->devices[device_index], param->add_attr_tab.handles);
esp_ble_gatts_start_service(dev->devices[device_index].hid_svc.handle); esp_ble_gatts_start_service(dev->devices[device_index].hid_svc.handle);
if ((device_index + 1) < dev->devices_len) { if ((device_index + 1) < dev->devices_len) {
create_hid_db(dev, device_index + 1);//add next device create_hid_db(dev, device_index + 1);//add next device if support
} }
break; break;
} }

29
examples/bluetooth/esp_hid_device/main/esp_hid_device_main.c
View File

@ -42,27 +42,6 @@ typedef struct
#if CONFIG_BT_BLE_ENABLED #if CONFIG_BT_BLE_ENABLED
static local_param_t s_ble_hid_param = {0}; static local_param_t s_ble_hid_param = {0};
const unsigned char hidapiReportMap[] = { //8 bytes input, 8 bytes feature
0x06, 0x00, 0xFF, // Usage Page (Vendor Defined 0xFF00)
0x0A, 0x00, 0x01, // Usage (0x0100)
0xA1, 0x01, // Collection (Application)
0x85, 0x01, // Report ID (1)
0x15, 0x00, // Logical Minimum (0)
0x26, 0xFF, 0x00, // Logical Maximum (255)
0x75, 0x08, // Report Size (8)
0x95, 0x08, // Report Count (8)
0x09, 0x01, // Usage (0x01)
0x82, 0x02, 0x01, // Input (Data,Var,Abs,No Wrap,Linear,Preferred State,No Null Position,Buffered Bytes)
0x95, 0x08, // Report Count (8)
0x09, 0x02, // Usage (0x02)
0xB2, 0x02, 0x01, // Feature (Data,Var,Abs,No Wrap,Linear,Preferred State,No Null Position,Non-volatile,Buffered Bytes)
0x95, 0x08, // Report Count (8)
0x09, 0x03, // Usage (0x03)
0x91, 0x02, // Output (Data,Var,Abs,No Wrap,Linear,Preferred State,No Null Position,Non-volatile)
0xC0, // End Collection
// 38 bytes
};
const unsigned char mediaReportMap[] = { const unsigned char mediaReportMap[] = {
0x05, 0x0C, // Usage Page (Consumer) 0x05, 0x0C, // Usage Page (Consumer)
@ -125,10 +104,6 @@ const unsigned char mediaReportMap[] = {
}; };
static esp_hid_raw_report_map_t ble_report_maps[] = { static esp_hid_raw_report_map_t ble_report_maps[] = {
{
.data = hidapiReportMap,
.len = sizeof(hidapiReportMap)
},
{ {
.data = mediaReportMap, .data = mediaReportMap,
.len = sizeof(mediaReportMap) .len = sizeof(mediaReportMap)
@ -143,7 +118,7 @@ static esp_hid_device_config_t ble_hid_config = {
.manufacturer_name = "Espressif", .manufacturer_name = "Espressif",
.serial_number = "1234567890", .serial_number = "1234567890",
.report_maps = ble_report_maps, .report_maps = ble_report_maps,
.report_maps_len = 2 .report_maps_len = 1
}; };
#define HID_CC_RPT_MUTE 1 #define HID_CC_RPT_MUTE 1
@ -293,7 +268,7 @@ void esp_hidd_send_consumer_value(uint8_t key_cmd, bool key_pressed)
break; break;
} }
} }
esp_hidd_dev_input_set(s_ble_hid_param.hid_dev, 1, HID_RPT_ID_CC_IN, buffer, HID_CC_IN_RPT_LEN); esp_hidd_dev_input_set(s_ble_hid_param.hid_dev, 0, HID_RPT_ID_CC_IN, buffer, HID_CC_IN_RPT_LEN);
return; return;
} }