From 5f567c28677d73a03fa42ea86103939491e737ec Mon Sep 17 00:00:00 2001 From: hejiaxin Date: Fri, 4 Sep 2026 11:10:06 +0800 Subject: [PATCH] ci(bt_hfp): Modify hfp examples' ci sdkconfig --- components/bt/host/bluedroid/Kconfig.in | 3 +++ .../host/bluedroid/bta/hf_client/bta_hf_client_sco.c | 3 +++ .../host/bluedroid/btc/profile/std/hf_ag/btc_hf_ag.c | 2 ++ .../bluedroid/classic_bt/hfp_ag/sdkconfig.ci.defaults | 10 ++++++++++ .../bluedroid/classic_bt/hfp_ag/sdkconfig.ci.lc3 | 4 ++++ .../bluedroid/classic_bt/hfp_hf/sdkconfig.ci.defaults | 11 +++++++++++ .../bluedroid/classic_bt/hfp_hf/sdkconfig.ci.lc3 | 4 ++++ 7 files changed, 37 insertions(+) create mode 100644 examples/bluetooth/bluedroid/classic_bt/hfp_ag/sdkconfig.ci.defaults create mode 100644 examples/bluetooth/bluedroid/classic_bt/hfp_ag/sdkconfig.ci.lc3 create mode 100644 examples/bluetooth/bluedroid/classic_bt/hfp_hf/sdkconfig.ci.defaults create mode 100644 examples/bluetooth/bluedroid/classic_bt/hfp_hf/sdkconfig.ci.lc3 diff --git a/components/bt/host/bluedroid/Kconfig.in b/components/bt/host/bluedroid/Kconfig.in index c4857158cc7..8ebe91b647f 100644 --- a/components/bt/host/bluedroid/Kconfig.in +++ b/components/bt/host/bluedroid/Kconfig.in @@ -217,13 +217,16 @@ config BT_HFP_AG_ENABLE choice BT_HFP_AUDIO_DATA_PATH prompt "audio(SCO) data path" depends on BT_HFP_ENABLE + default BT_HFP_AUDIO_DATA_PATH_HCI if IDF_TARGET_ESP32S31 help SCO data path, i.e. HCI or PCM. This option is set using API "esp_bredr_sco_datapath_set" in Bluetooth host. Default SCO data path can also be set in Bluetooth Controller. + ESP32-S31 does not support PCM SCO routing, so only HCI is available. config BT_HFP_AUDIO_DATA_PATH_PCM bool "PCM" + depends on !IDF_TARGET_ESP32S31 config BT_HFP_AUDIO_DATA_PATH_HCI bool "HCI" endchoice diff --git a/components/bt/host/bluedroid/bta/hf_client/bta_hf_client_sco.c b/components/bt/host/bluedroid/bta/hf_client/bta_hf_client_sco.c index 5d17e3880da..a723f105d43 100644 --- a/components/bt/host/bluedroid/bta/hf_client/bta_hf_client_sco.c +++ b/components/bt/host/bluedroid/bta/hf_client/bta_hf_client_sco.c @@ -49,6 +49,7 @@ static BOOLEAN bta_hf_client_is_transparent_codec(tBTM_SCO_CODEC_TYPE codec) return (codec == BTM_SCO_CODEC_MSBC || codec == BTM_SCO_CODEC_LC3); } +#if (BTM_SCO_HCI_INCLUDED == TRUE ) static UINT32 bta_hf_client_sco_get_pcm_rate(tBTM_SCO_CODEC_TYPE codec) { if (codec == BTM_SCO_CODEC_LC3) { @@ -59,6 +60,8 @@ static UINT32 bta_hf_client_sco_get_pcm_rate(tBTM_SCO_CODEC_TYPE codec) } return BTA_HFP_SCO_SAMP_RATE_8K; } +#endif + #define BTA_HF_CLIENT_ESCO_PARAM_IDX_CVSD_S1 4 /* eSCO setting for CVSD S1 */ static const tBTM_ESCO_PARAMS bta_hf_client_esco_params[] = { diff --git a/components/bt/host/bluedroid/btc/profile/std/hf_ag/btc_hf_ag.c b/components/bt/host/bluedroid/btc/profile/std/hf_ag/btc_hf_ag.c index d334ebb7bef..60657c942fb 100644 --- a/components/bt/host/bluedroid/btc/profile/std/hf_ag/btc_hf_ag.c +++ b/components/bt/host/bluedroid/btc/profile/std/hf_ag/btc_hf_ag.c @@ -203,6 +203,7 @@ static BOOLEAN is_connected(int idx, bt_bdaddr_t *bd_addr) return FALSE; } +#if (BTM_WBS_INCLUDED == TRUE) static esp_hf_codec_mode_t btc_hf_bta_codec_to_esp(tBTA_AG_PEER_CODEC codec) { if (codec == BTA_AG_CODEC_NONE) { @@ -219,6 +220,7 @@ static esp_hf_codec_mode_t btc_hf_bta_codec_to_esp(tBTA_AG_PEER_CODEC codec) } return ESP_HF_CODEC_NONE; } +#endif static tBTA_AG_PEER_CODEC btc_hf_esp_codec_to_bta(esp_hf_codec_mode_t mode) { diff --git a/examples/bluetooth/bluedroid/classic_bt/hfp_ag/sdkconfig.ci.defaults b/examples/bluetooth/bluedroid/classic_bt/hfp_ag/sdkconfig.ci.defaults new file mode 100644 index 00000000000..9586b714780 --- /dev/null +++ b/examples/bluetooth/bluedroid/classic_bt/hfp_ag/sdkconfig.ci.defaults @@ -0,0 +1,10 @@ +# Override some defaults so BT stack is enabled and +# Classic BT is enabled +CONFIG_BT_ENABLED=y +CONFIG_BT_BLE_ENABLED=n +CONFIG_BTDM_CTRL_MODE_BR_EDR_ONLY=y +CONFIG_BTDM_CTRL_BR_EDR_MAX_SYNC_CONN=1 +CONFIG_BT_BLUEDROID_ENABLED=y +CONFIG_BT_CLASSIC_ENABLED=y +CONFIG_BT_HFP_ENABLE=y +CONFIG_BT_HFP_AG_ENABLE=y diff --git a/examples/bluetooth/bluedroid/classic_bt/hfp_ag/sdkconfig.ci.lc3 b/examples/bluetooth/bluedroid/classic_bt/hfp_ag/sdkconfig.ci.lc3 new file mode 100644 index 00000000000..383d7177ee1 --- /dev/null +++ b/examples/bluetooth/bluedroid/classic_bt/hfp_ag/sdkconfig.ci.lc3 @@ -0,0 +1,4 @@ +CONFIG_BT_HFP_AUDIO_DATA_PATH_HCI=y +CONFIG_BT_HFP_USE_EXTERNAL_CODEC=y +CONFIG_BT_HFP_LC3_ENABLE=y +CONFIG_EXAMPLE_ENABLE_CONSOLE_REPL=n diff --git a/examples/bluetooth/bluedroid/classic_bt/hfp_hf/sdkconfig.ci.defaults b/examples/bluetooth/bluedroid/classic_bt/hfp_hf/sdkconfig.ci.defaults new file mode 100644 index 00000000000..643ce88d5da --- /dev/null +++ b/examples/bluetooth/bluedroid/classic_bt/hfp_hf/sdkconfig.ci.defaults @@ -0,0 +1,11 @@ +# Override some defaults so BT stack is enabled and +# Classic BT is enabled +CONFIG_BT_ENABLED=y +CONFIG_BT_BLE_ENABLED=n +CONFIG_BTDM_CTRL_MODE_BR_EDR_ONLY=y +CONFIG_BTDM_CTRL_BR_EDR_MAX_SYNC_CONN=1 +CONFIG_BT_BLUEDROID_ENABLED=y +CONFIG_BT_CLASSIC_ENABLED=y +CONFIG_BT_HFP_ENABLE=y +CONFIG_BT_HFP_CLIENT_ENABLE=y +CONFIG_BT_PBAC_ENABLED=y diff --git a/examples/bluetooth/bluedroid/classic_bt/hfp_hf/sdkconfig.ci.lc3 b/examples/bluetooth/bluedroid/classic_bt/hfp_hf/sdkconfig.ci.lc3 new file mode 100644 index 00000000000..383d7177ee1 --- /dev/null +++ b/examples/bluetooth/bluedroid/classic_bt/hfp_hf/sdkconfig.ci.lc3 @@ -0,0 +1,4 @@ +CONFIG_BT_HFP_AUDIO_DATA_PATH_HCI=y +CONFIG_BT_HFP_USE_EXTERNAL_CODEC=y +CONFIG_BT_HFP_LC3_ENABLE=y +CONFIG_EXAMPLE_ENABLE_CONSOLE_REPL=n