blackbeard420/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf synced 2025-03-09 17:19:09 -04:00
Code Issues Projects Releases Wiki Activity

Merge branch 'test/bqb_test_bt_classic_hid_v5.0' into 'release/v5.0'

Browse Source 
feat(bt/bqb): Add setting local di record function for specific hid case of bqb auto test (backport v5.0)

See merge request espressif/esp-idf!25834
This commit is contained in:
Wang Meng Yang 2023-09-18 11:05:35 +08:00
commit b212ab6176
5 changed files with 29 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
components/bt/host/bluedroid/bta/hd/bta_hd_main.c
View File

@ -317,4 +317,21 @@ static const char *bta_hd_state_code(tBTA_HD_STATE state_code)
return "<unknown>";
}
}
#if BT_HID_DEVICE_BQB_INCLUDED
tBTA_STATUS bta_hd_bqb_set_local_di_record(void)
{
tBTA_STATUS status = BTA_FAILURE;
tBTA_DI_RECORD bqb_device_info;
bqb_device_info.vendor = 0;
bqb_device_info.vendor_id_source = 0xff; // BTA_HH_VENDOR_ID_INVALID
bqb_device_info.product = 1;
bqb_device_info.version = 0;
bqb_device_info.primary_record = TRUE;
return BTA_DmSetLocalDiRecord(&bqb_device_info, &bta_hd_cb.sdp_handle);
}
#endif /* BT_HID_DEVICE_BQB_INCLUDED */
#endif /* BTA_HD_INCLUDED */

6
components/bt/host/bluedroid/common/include/common/bt_target.h
View File

@ -2011,6 +2011,12 @@
#define HID_DEV_FLUSH_TO 0xffff
#endif
#if (BTA_HD_INCLUDED == TRUE) && (HID_DEV_INCLUDED == TRUE) && (BT_CLASSIC_BQB_INCLUDED == TRUE)
#define BT_HID_DEVICE_BQB_INCLUDED TRUE
#else
#define BT_HID_DEVICE_BQB_INCLUDED FALSE
#endif
/*************************************************************************
** Definitions for Both HID-Host & Device
*/

18
components/esp_hid/src/esp_hidd.c
View File

@ -1,16 +1,8 @@
// Copyright 2017-2019 Espressif Systems (Shanghai) PTE LTD
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
/*
* SPDX-FileCopyrightText: 2017-2023 Espressif Systems (Shanghai) CO LTD
*
* SPDX-License-Identifier: Apache-2.0
*/
#include "esp_hidd.h"
#include "esp_hidd_private.h"

2
examples/bluetooth/bluedroid/classic_bt/bt_hid_mouse_device/main/main.c
View File

@ -1,5 +1,5 @@
/*
* SPDX-FileCopyrightText: 2021-2022 Espressif Systems (Shanghai) CO LTD
* SPDX-FileCopyrightText: 2021-2023 Espressif Systems (Shanghai) CO LTD
*
* SPDX-License-Identifier: Unlicense OR CC0-1.0
*/

1
tools/ci/check_copyright_ignore.txt
View File

@ -445,7 +445,6 @@ components/esp_hid/private/bt_hidd.h
components/esp_hid/private/bt_hidh.h
components/esp_hid/private/esp_hidd_private.h
components/esp_hid/src/esp_hid_common.c
components/esp_hid/src/esp_hidd.c
components/esp_hid/test/hid_descriptor.h
components/esp_hid/test/test_esp_hid.c
components/esp_hw_support/include/esp_clk.h