Skip to content

Commit

Permalink
Merge branch 'bugfix/fix_ble_conn_fail_in_ci' into 'master'
Browse files Browse the repository at this point in the history 
fix(ble/bluedroid): Optimize CI configuration for Bluedroid example

Closes IDFCI-2628

See merge request espressif/esp-idf!36138
  • Loading branch information
@esp-zhp
esp-zhp committed Jan 8, 2025
2 parents 3f6d1f6 + 0e25572 commit 80b28a9
Show file tree
Hide file tree
Showing 19 changed files with 23 additions and 3 deletions.
1 change: 1 addition & 0 deletions .gitlab/CODEOWNERS
View file
Original file line number Diff line number Diff line change
Expand Up @@ -206,6 +206,7 @@

/tools/ @esp-idf-codeowners/tools
/tools/ble/ @esp-idf-codeowners/app-utilities
/tools/bt/ @esp-idf-codeowners/bluetooth
/tools/catch/ @esp-idf-codeowners/ci
/tools/ci/ @esp-idf-codeowners/ci
/tools/cmake/ @esp-idf-codeowners/build-config
Expand Down
2 changes: 1 addition & 1 deletion components/esp_hid/src/nimble_hidd.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ static int create_hid_db(int device_index)
return rc;
}

static int ble_hid_create_info_db()
static int ble_hid_create_info_db(void)
{
int rc;

Expand Down
2 changes: 1 addition & 1 deletion examples/bluetooth/bluedroid/ble/gatt_client/main/gattc_demo.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -549,7 +549,7 @@ void app_main(void)
extern void bt_hci_log_hci_adv_show(void);
bt_hci_log_hci_data_show();
bt_hci_log_hci_adv_show();
vTaskDelay(1000 / portNUM_PROCESSORS);
vTaskDelay(1000 / portTICK_PERIOD_MS);
}
*/

Expand Down
1 change: 1 addition & 0 deletions examples/bluetooth/bluedroid/ble/gatt_client/sdkconfig.ci.cfg_test
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
CONFIG_EXAMPLE_CI_ID=4
CONFIG_EXAMPLE_CI_PIPELINE_ID=${CI_PIPELINE_ID}
CONFIG_BT_GATTC_CONNECT_RETRY_COUNT=20
1 change: 1 addition & 0 deletions examples/bluetooth/bluedroid/ble/gatt_client/sdkconfig.ci.esp32c2_cfg_test
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@ CONFIG_EXAMPLE_CI_ID=4
CONFIG_IDF_TARGET="esp32c2"
CONFIG_XTAL_FREQ_26=y
CONFIG_EXAMPLE_CI_PIPELINE_ID=${CI_PIPELINE_ID}
CONFIG_BT_GATTC_CONNECT_RETRY_COUNT=20
1 change: 1 addition & 0 deletions examples/bluetooth/bluedroid/ble/gatt_client/sdkconfig.ci.esp32c2_init_deinit
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,4 @@
CONFIG_IDF_TARGET="esp32c2"
CONFIG_XTAL_FREQ_26=y
CONFIG_EXAMPLE_INIT_DEINIT_LOOP=y
CONFIG_BT_GATTC_CONNECT_RETRY_COUNT=20
1 change: 1 addition & 0 deletions examples/bluetooth/bluedroid/ble/gatt_client/sdkconfig.ci.esp32c2_xtal26m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@ CONFIG_EXAMPLE_CI_ID=3
CONFIG_IDF_TARGET="esp32c2"
CONFIG_XTAL_FREQ_26=y
CONFIG_EXAMPLE_CI_PIPELINE_ID=${CI_PIPELINE_ID}
CONFIG_BT_GATTC_CONNECT_RETRY_COUNT=20
1 change: 1 addition & 0 deletions examples/bluetooth/bluedroid/ble/gatt_client/sdkconfig.ci.init_deinit
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,4 @@
# CONFIG_BT_BLE_42_FEATURES_SUPPORTED is not set
# CONFIG_BT_BLE_50_FEATURES_SUPPORTED is not set
CONFIG_EXAMPLE_INIT_DEINIT_LOOP=y
CONFIG_BT_GATTC_CONNECT_RETRY_COUNT=20
1 change: 1 addition & 0 deletions examples/bluetooth/bluedroid/ble/gatt_client/sdkconfig.ci.name
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
CONFIG_EXAMPLE_CI_ID=3
CONFIG_EXAMPLE_CI_PIPELINE_ID=${CI_PIPELINE_ID}
CONFIG_BT_GATTC_CONNECT_RETRY_COUNT=20
1 change: 1 addition & 0 deletions examples/bluetooth/bluedroid/ble/gatt_security_client/sdkconfig.ci.esp32c2_xtal26m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@ CONFIG_EXAMPLE_CI_ID=5
CONFIG_IDF_TARGET="esp32c2"
CONFIG_XTAL_FREQ_26=y
CONFIG_EXAMPLE_CI_PIPELINE_ID=${CI_PIPELINE_ID}
CONFIG_BT_GATTC_CONNECT_RETRY_COUNT=20
1 change: 1 addition & 0 deletions examples/bluetooth/bluedroid/ble/gatt_security_client/sdkconfig.ci.name
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
CONFIG_EXAMPLE_CI_ID=5
CONFIG_EXAMPLE_CI_PIPELINE_ID=${CI_PIPELINE_ID}
CONFIG_BT_GATTC_CONNECT_RETRY_COUNT=20
1 change: 1 addition & 0 deletions examples/bluetooth/bluedroid/ble_50/ble50_security_client/sdkconfig.ci.cfg_test
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
CONFIG_EXAMPLE_CI_ID=7
CONFIG_EXAMPLE_CI_PIPELINE_ID=${CI_PIPELINE_ID}
CONFIG_BT_GATTC_CONNECT_RETRY_COUNT=20
1 change: 1 addition & 0 deletions examples/bluetooth/bluedroid/ble_50/ble50_security_client/sdkconfig.ci.esp32c2_cfg_test
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@ CONFIG_EXAMPLE_CI_ID=7
CONFIG_IDF_TARGET="esp32c2"
CONFIG_XTAL_FREQ_26=y
CONFIG_EXAMPLE_CI_PIPELINE_ID=${CI_PIPELINE_ID}
CONFIG_BT_GATTC_CONNECT_RETRY_COUNT=20
1 change: 1 addition & 0 deletions examples/bluetooth/bluedroid/ble_50/ble50_security_client/sdkconfig.ci.esp32c2_xtal26m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@ CONFIG_EXAMPLE_CI_ID=6
CONFIG_IDF_TARGET="esp32c2"
CONFIG_XTAL_FREQ_26=y
CONFIG_EXAMPLE_CI_PIPELINE_ID=${CI_PIPELINE_ID}
CONFIG_BT_GATTC_CONNECT_RETRY_COUNT=20
1 change: 1 addition & 0 deletions examples/bluetooth/bluedroid/ble_50/ble50_security_client/sdkconfig.ci.name
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
CONFIG_EXAMPLE_CI_ID=6
CONFIG_EXAMPLE_CI_PIPELINE_ID=${CI_PIPELINE_ID}
CONFIG_BT_GATTC_CONNECT_RETRY_COUNT=20
3 changes: 3 additions & 0 deletions examples/bluetooth/blufi/sdkconfig.ci.nimble
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
CONFIG_BT_ENABLED=y
CONFIG_BT_NIMBLE_ENABLED=y
CONFIG_BT_NIMBLE_BLUFI_ENABLE=y
2 changes: 2 additions & 0 deletions examples/bluetooth/esp_hid_device/sdkconfig.ci.nimble
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
CONFIG_BT_ENABLED=y
CONFIG_BT_NIMBLE_ENABLED=y
2 changes: 2 additions & 0 deletions examples/bluetooth/esp_hid_host/sdkconfig.ci.nimble
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
CONFIG_BT_ENABLED=y
CONFIG_BT_NIMBLE_ENABLED=y
2 changes: 1 addition & 1 deletion tools/bt/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ while (1)
extern void bt_hci_log_hci_adv_show(void);
bt_hci_log_hci_data_show(); // Display HCI data logs
bt_hci_log_hci_adv_show(); // Display HCI advertisement logs
vTaskDelay(1000 / portNUM_PROCESSORS);
vTaskDelay(1000 / portTICK_PERIOD_MS);
}
```

Expand Down

0 comments on commit 80b28a9

Please sign in to comment.