feedc0de/esp-idf
1
0
Fork 0
forked from espressif/esp-idf
Code Pull Requests Activity

Merge branch 'bugfix/fix_ble_conn_fail_in_ci' into 'master'

Browse Source 
fix(ble/bluedroid): Optimize CI configuration for Bluedroid example

Closes IDFCI-2628

See merge request espressif/esp-idf!36138
This commit is contained in:
Zhang Hai Peng
2025-01-08 10:05:41 +08:00
parent 3f6d1f6496 0e25572b4b
commit 80b28a9816
19 changed files with 23 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitlab/CODEOWNERS
View File

@@ -206,6 +206,7 @@
/tools/ @esp-idf-codeowners/tools /tools/ @esp-idf-codeowners/tools
/tools/ble/ @esp-idf-codeowners/app-utilities /tools/ble/ @esp-idf-codeowners/app-utilities
/tools/bt/ @esp-idf-codeowners/bluetooth
/tools/catch/ @esp-idf-codeowners/ci /tools/catch/ @esp-idf-codeowners/ci
/tools/ci/ @esp-idf-codeowners/ci /tools/ci/ @esp-idf-codeowners/ci
/tools/cmake/ @esp-idf-codeowners/build-config /tools/cmake/ @esp-idf-codeowners/build-config

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

@@ -132,7 +132,7 @@ static int create_hid_db(int device_index)
return rc; return rc;
} }
static int ble_hid_create_info_db() static int ble_hid_create_info_db(void)
{ {
int rc; int rc;

2
examples/bluetooth/bluedroid/ble/gatt_client/main/gattc_demo.c
View File

@@ -549,7 +549,7 @@ void app_main(void)
extern void bt_hci_log_hci_adv_show(void); extern void bt_hci_log_hci_adv_show(void);
bt_hci_log_hci_data_show(); bt_hci_log_hci_data_show();
bt_hci_log_hci_adv_show(); bt_hci_log_hci_adv_show();
vTaskDelay(1000 / portNUM_PROCESSORS); vTaskDelay(1000 / portTICK_PERIOD_MS);
} }
*/ */

1
examples/bluetooth/bluedroid/ble/gatt_client/sdkconfig.ci.cfg_test
View File

@@ -1,2 +1,3 @@
CONFIG_EXAMPLE_CI_ID=4 CONFIG_EXAMPLE_CI_ID=4
CONFIG_EXAMPLE_CI_PIPELINE_ID=${CI_PIPELINE_ID} CONFIG_EXAMPLE_CI_PIPELINE_ID=${CI_PIPELINE_ID}
CONFIG_BT_GATTC_CONNECT_RETRY_COUNT=20

1
examples/bluetooth/bluedroid/ble/gatt_client/sdkconfig.ci.esp32c2_cfg_test
View File

@@ -2,3 +2,4 @@ CONFIG_EXAMPLE_CI_ID=4
CONFIG_IDF_TARGET="esp32c2" CONFIG_IDF_TARGET="esp32c2"
CONFIG_XTAL_FREQ_26=y CONFIG_XTAL_FREQ_26=y
CONFIG_EXAMPLE_CI_PIPELINE_ID=${CI_PIPELINE_ID} CONFIG_EXAMPLE_CI_PIPELINE_ID=${CI_PIPELINE_ID}
CONFIG_BT_GATTC_CONNECT_RETRY_COUNT=20

1
examples/bluetooth/bluedroid/ble/gatt_client/sdkconfig.ci.esp32c2_init_deinit
View File

@@ -6,3 +6,4 @@
CONFIG_IDF_TARGET="esp32c2" CONFIG_IDF_TARGET="esp32c2"
CONFIG_XTAL_FREQ_26=y CONFIG_XTAL_FREQ_26=y
CONFIG_EXAMPLE_INIT_DEINIT_LOOP=y CONFIG_EXAMPLE_INIT_DEINIT_LOOP=y
CONFIG_BT_GATTC_CONNECT_RETRY_COUNT=20

1
examples/bluetooth/bluedroid/ble/gatt_client/sdkconfig.ci.esp32c2_xtal26m
View File

@@ -2,3 +2,4 @@ CONFIG_EXAMPLE_CI_ID=3
CONFIG_IDF_TARGET="esp32c2" CONFIG_IDF_TARGET="esp32c2"
CONFIG_XTAL_FREQ_26=y CONFIG_XTAL_FREQ_26=y
CONFIG_EXAMPLE_CI_PIPELINE_ID=${CI_PIPELINE_ID} CONFIG_EXAMPLE_CI_PIPELINE_ID=${CI_PIPELINE_ID}
CONFIG_BT_GATTC_CONNECT_RETRY_COUNT=20

1
examples/bluetooth/bluedroid/ble/gatt_client/sdkconfig.ci.init_deinit
View File

@@ -4,3 +4,4 @@
# CONFIG_BT_BLE_42_FEATURES_SUPPORTED is not set # CONFIG_BT_BLE_42_FEATURES_SUPPORTED is not set
# CONFIG_BT_BLE_50_FEATURES_SUPPORTED is not set # CONFIG_BT_BLE_50_FEATURES_SUPPORTED is not set
CONFIG_EXAMPLE_INIT_DEINIT_LOOP=y CONFIG_EXAMPLE_INIT_DEINIT_LOOP=y
CONFIG_BT_GATTC_CONNECT_RETRY_COUNT=20

1
examples/bluetooth/bluedroid/ble/gatt_client/sdkconfig.ci.name
View File

@@ -1,2 +1,3 @@
CONFIG_EXAMPLE_CI_ID=3 CONFIG_EXAMPLE_CI_ID=3
CONFIG_EXAMPLE_CI_PIPELINE_ID=${CI_PIPELINE_ID} CONFIG_EXAMPLE_CI_PIPELINE_ID=${CI_PIPELINE_ID}
CONFIG_BT_GATTC_CONNECT_RETRY_COUNT=20

1
examples/bluetooth/bluedroid/ble/gatt_security_client/sdkconfig.ci.esp32c2_xtal26m
View File

@@ -2,3 +2,4 @@ CONFIG_EXAMPLE_CI_ID=5
CONFIG_IDF_TARGET="esp32c2" CONFIG_IDF_TARGET="esp32c2"
CONFIG_XTAL_FREQ_26=y CONFIG_XTAL_FREQ_26=y
CONFIG_EXAMPLE_CI_PIPELINE_ID=${CI_PIPELINE_ID} CONFIG_EXAMPLE_CI_PIPELINE_ID=${CI_PIPELINE_ID}
CONFIG_BT_GATTC_CONNECT_RETRY_COUNT=20

1
examples/bluetooth/bluedroid/ble/gatt_security_client/sdkconfig.ci.name
View File

@@ -1,2 +1,3 @@
CONFIG_EXAMPLE_CI_ID=5 CONFIG_EXAMPLE_CI_ID=5
CONFIG_EXAMPLE_CI_PIPELINE_ID=${CI_PIPELINE_ID} CONFIG_EXAMPLE_CI_PIPELINE_ID=${CI_PIPELINE_ID}
CONFIG_BT_GATTC_CONNECT_RETRY_COUNT=20

1
examples/bluetooth/bluedroid/ble_50/ble50_security_client/sdkconfig.ci.cfg_test
View File

@@ -1,2 +1,3 @@
CONFIG_EXAMPLE_CI_ID=7 CONFIG_EXAMPLE_CI_ID=7
CONFIG_EXAMPLE_CI_PIPELINE_ID=${CI_PIPELINE_ID} CONFIG_EXAMPLE_CI_PIPELINE_ID=${CI_PIPELINE_ID}
CONFIG_BT_GATTC_CONNECT_RETRY_COUNT=20

1
examples/bluetooth/bluedroid/ble_50/ble50_security_client/sdkconfig.ci.esp32c2_cfg_test
View File

@@ -2,3 +2,4 @@ CONFIG_EXAMPLE_CI_ID=7
CONFIG_IDF_TARGET="esp32c2" CONFIG_IDF_TARGET="esp32c2"
CONFIG_XTAL_FREQ_26=y CONFIG_XTAL_FREQ_26=y
CONFIG_EXAMPLE_CI_PIPELINE_ID=${CI_PIPELINE_ID} CONFIG_EXAMPLE_CI_PIPELINE_ID=${CI_PIPELINE_ID}
CONFIG_BT_GATTC_CONNECT_RETRY_COUNT=20

1
examples/bluetooth/bluedroid/ble_50/ble50_security_client/sdkconfig.ci.esp32c2_xtal26m
View File

@@ -2,3 +2,4 @@ CONFIG_EXAMPLE_CI_ID=6
CONFIG_IDF_TARGET="esp32c2" CONFIG_IDF_TARGET="esp32c2"
CONFIG_XTAL_FREQ_26=y CONFIG_XTAL_FREQ_26=y
CONFIG_EXAMPLE_CI_PIPELINE_ID=${CI_PIPELINE_ID} CONFIG_EXAMPLE_CI_PIPELINE_ID=${CI_PIPELINE_ID}
CONFIG_BT_GATTC_CONNECT_RETRY_COUNT=20

1
examples/bluetooth/bluedroid/ble_50/ble50_security_client/sdkconfig.ci.name
View File

@@ -1,2 +1,3 @@
CONFIG_EXAMPLE_CI_ID=6 CONFIG_EXAMPLE_CI_ID=6
CONFIG_EXAMPLE_CI_PIPELINE_ID=${CI_PIPELINE_ID} CONFIG_EXAMPLE_CI_PIPELINE_ID=${CI_PIPELINE_ID}
CONFIG_BT_GATTC_CONNECT_RETRY_COUNT=20

3
examples/bluetooth/blufi/sdkconfig.ci.nimble Normal file
View File

@@ -0,0 +1,3 @@
CONFIG_BT_ENABLED=y
CONFIG_BT_NIMBLE_ENABLED=y
CONFIG_BT_NIMBLE_BLUFI_ENABLE=y

2
examples/bluetooth/esp_hid_device/sdkconfig.ci.nimble Normal file
View File

@@ -0,0 +1,2 @@
CONFIG_BT_ENABLED=y
CONFIG_BT_NIMBLE_ENABLED=y

2
examples/bluetooth/esp_hid_host/sdkconfig.ci.nimble Normal file
View File

@@ -0,0 +1,2 @@
CONFIG_BT_ENABLED=y
CONFIG_BT_NIMBLE_ENABLED=y

2
tools/bt/README.md
View File

@@ -25,7 +25,7 @@ while (1)
extern void bt_hci_log_hci_adv_show(void); extern void bt_hci_log_hci_adv_show(void);
bt_hci_log_hci_data_show(); // Display HCI data logs bt_hci_log_hci_data_show(); // Display HCI data logs
bt_hci_log_hci_adv_show(); // Display HCI advertisement logs bt_hci_log_hci_adv_show(); // Display HCI advertisement logs
vTaskDelay(1000 / portNUM_PROCESSORS); vTaskDelay(1000 / portTICK_PERIOD_MS);
} }
``` ```