From 91a0c33322e242f0033565b99c00831cb31be320 Mon Sep 17 00:00:00 2001 From: Rahul Tank Date: Mon, 22 Jul 2024 10:06:18 +0530 Subject: [PATCH] feat(nimble): BLE_GAP_EVENT_LINK_ESTAB event to ensure link established --- components/bt/host/nimble/nimble | 2 +- .../nimble/ble_enc_adv_data/enc_adv_data_cent/main/main.c | 2 +- .../nimble/ble_enc_adv_data/enc_adv_data_prph/main/main.c | 2 +- examples/bluetooth/nimble/ble_htp/htp_cent/main/main.c | 2 +- examples/bluetooth/nimble/ble_htp/htp_prph/main/main.c | 2 +- .../bluetooth/nimble/ble_l2cap_coc/coc_blecent/main/main.c | 2 +- .../bluetooth/nimble/ble_l2cap_coc/coc_bleprph/main/main.c | 2 +- examples/bluetooth/nimble/ble_multi_adv/main/main.c | 4 ++-- examples/bluetooth/nimble/ble_phy/phy_cent/main/main.c | 2 +- examples/bluetooth/nimble/ble_phy/phy_prph/main/main.c | 2 +- examples/bluetooth/nimble/ble_spp/spp_client/main/main.c | 2 +- examples/bluetooth/nimble/ble_spp/spp_server/main/main.c | 2 +- examples/bluetooth/nimble/blecent/main/main.c | 2 +- examples/bluetooth/nimble/blehr/main/main.c | 2 +- examples/bluetooth/nimble/bleprph/main/main.c | 2 +- examples/bluetooth/nimble/bleprph_wifi_coex/main/main.c | 4 ++-- examples/bluetooth/nimble/power_save/main/main.c | 2 +- .../nimble/throughput_app/blecent_throughput/main/main.c | 2 +- .../nimble/throughput_app/bleprph_throughput/main/main.c | 2 +- tools/ci/check_copyright_ignore.txt | 1 + 20 files changed, 22 insertions(+), 21 deletions(-) diff --git a/components/bt/host/nimble/nimble b/components/bt/host/nimble/nimble index 2fbd46dfed..ab8a314d3a 160000 --- a/components/bt/host/nimble/nimble +++ b/components/bt/host/nimble/nimble @@ -1 +1 @@ -Subproject commit 2fbd46dfedbaf795f98429b0cd2ce8845e06d8ce +Subproject commit ab8a314d3a948815e00408b7823bfb77b02230ff diff --git a/examples/bluetooth/nimble/ble_enc_adv_data/enc_adv_data_cent/main/main.c b/examples/bluetooth/nimble/ble_enc_adv_data/enc_adv_data_cent/main/main.c index 6c0b421cc0..127c412312 100644 --- a/examples/bluetooth/nimble/ble_enc_adv_data/enc_adv_data_cent/main/main.c +++ b/examples/bluetooth/nimble/ble_enc_adv_data/enc_adv_data_cent/main/main.c @@ -425,7 +425,7 @@ enc_adv_data_cent_gap_event(struct ble_gap_event *event, void *arg) enc_adv_data_cent_connect_if_interesting(&event->disc); return 0; - case BLE_GAP_EVENT_CONNECT: + case BLE_GAP_EVENT_LINK_ESTAB: /* A new connection was established or a connection attempt failed. */ if (event->connect.status == 0) { /* Connection successfully established. */ diff --git a/examples/bluetooth/nimble/ble_enc_adv_data/enc_adv_data_prph/main/main.c b/examples/bluetooth/nimble/ble_enc_adv_data/enc_adv_data_prph/main/main.c index 8bcd08ccd8..8593f3d441 100644 --- a/examples/bluetooth/nimble/ble_enc_adv_data/enc_adv_data_prph/main/main.c +++ b/examples/bluetooth/nimble/ble_enc_adv_data/enc_adv_data_prph/main/main.c @@ -204,7 +204,7 @@ enc_adv_data_prph_gap_event(struct ble_gap_event *event, void *arg) int rc; switch (event->type) { - case BLE_GAP_EVENT_CONNECT: + case BLE_GAP_EVENT_LINK_ESTAB: /* A new connection was established or a connection attempt failed. */ MODLOG_DFLT(INFO, "connection %s; status=%d ", event->connect.status == 0 ? "established" : "failed", diff --git a/examples/bluetooth/nimble/ble_htp/htp_cent/main/main.c b/examples/bluetooth/nimble/ble_htp/htp_cent/main/main.c index aa06dfb425..798455f230 100644 --- a/examples/bluetooth/nimble/ble_htp/htp_cent/main/main.c +++ b/examples/bluetooth/nimble/ble_htp/htp_cent/main/main.c @@ -488,7 +488,7 @@ ble_htp_cent_gap_event(struct ble_gap_event *event, void *arg) ble_htp_cent_connect_if_interesting(&event->disc); return 0; - case BLE_GAP_EVENT_CONNECT: + case BLE_GAP_EVENT_LINK_ESTAB: /* A new connection was established or a connection attempt failed. */ if (event->connect.status == 0) { /* Connection successfully established. */ diff --git a/examples/bluetooth/nimble/ble_htp/htp_prph/main/main.c b/examples/bluetooth/nimble/ble_htp/htp_prph/main/main.c index 0da9cb9392..df4e8f28d9 100644 --- a/examples/bluetooth/nimble/ble_htp/htp_prph/main/main.c +++ b/examples/bluetooth/nimble/ble_htp/htp_prph/main/main.c @@ -230,7 +230,7 @@ static int ble_htp_prph_gap_event(struct ble_gap_event *event, void *arg) { switch (event->type) { - case BLE_GAP_EVENT_CONNECT: + case BLE_GAP_EVENT_LINK_ESTAB: /* A new connection was established or a connection attempt failed */ MODLOG_DFLT(INFO, "connection %s; status=%d\n", event->connect.status == 0 ? "established" : "failed", diff --git a/examples/bluetooth/nimble/ble_l2cap_coc/coc_blecent/main/main.c b/examples/bluetooth/nimble/ble_l2cap_coc/coc_blecent/main/main.c index de102268bb..5b5cba1422 100644 --- a/examples/bluetooth/nimble/ble_l2cap_coc/coc_blecent/main/main.c +++ b/examples/bluetooth/nimble/ble_l2cap_coc/coc_blecent/main/main.c @@ -412,7 +412,7 @@ blecent_gap_event(struct ble_gap_event *event, void *arg) blecent_connect_if_interesting(&event->disc); return 0; - case BLE_GAP_EVENT_CONNECT: + case BLE_GAP_EVENT_LINK_ESTAB: /* A new connection was established or a connection attempt failed. */ if (event->connect.status == 0) { /* Connection successfully established. */ diff --git a/examples/bluetooth/nimble/ble_l2cap_coc/coc_bleprph/main/main.c b/examples/bluetooth/nimble/ble_l2cap_coc/coc_bleprph/main/main.c index b1b3796752..eb534a3de0 100644 --- a/examples/bluetooth/nimble/ble_l2cap_coc/coc_bleprph/main/main.c +++ b/examples/bluetooth/nimble/ble_l2cap_coc/coc_bleprph/main/main.c @@ -317,7 +317,7 @@ bleprph_gap_event(struct ble_gap_event *event, void *arg) int rc; switch (event->type) { - case BLE_GAP_EVENT_CONNECT: + case BLE_GAP_EVENT_LINK_ESTAB: /* A new connection was established or a connection attempt failed. */ MODLOG_DFLT(INFO, "connection %s; status=%d ", event->connect.status == 0 ? "established" : "failed", diff --git a/examples/bluetooth/nimble/ble_multi_adv/main/main.c b/examples/bluetooth/nimble/ble_multi_adv/main/main.c index 482a96a1be..b1d00f0d8a 100644 --- a/examples/bluetooth/nimble/ble_multi_adv/main/main.c +++ b/examples/bluetooth/nimble/ble_multi_adv/main/main.c @@ -302,7 +302,7 @@ ble_multi_advertise(ble_addr_t addr) static void ble_multi_perform_gatt_proc(ble_addr_t addr) { - /* GATT procedures like notify, indicate can be perfomed now */ + /* GATT procedures like notify, indicate can be performed now */ for (int i = 0; i < BLE_ADV_INSTANCES; i++) { if (memcmp(&addr, &ble_instance_cb[i].addr, sizeof(addr)) == 0) { if (ble_instance_cb[i].cb) { @@ -335,7 +335,7 @@ ble_multi_adv_gap_event(struct ble_gap_event *event, void *arg) int rc; switch (event->type) { - case BLE_GAP_EVENT_CONNECT: + case BLE_GAP_EVENT_LINK_ESTAB: /* A new connection was established or a connection attempt failed. */ MODLOG_DFLT(INFO, "connection %s; status=%d ", event->connect.status == 0 ? "established" : "failed", diff --git a/examples/bluetooth/nimble/ble_phy/phy_cent/main/main.c b/examples/bluetooth/nimble/ble_phy/phy_cent/main/main.c index 9922f4ebd0..772c0d25bf 100644 --- a/examples/bluetooth/nimble/ble_phy/phy_cent/main/main.c +++ b/examples/bluetooth/nimble/ble_phy/phy_cent/main/main.c @@ -347,7 +347,7 @@ blecent_gap_event(struct ble_gap_event *event, void *arg) int rc; switch (event->type) { - case BLE_GAP_EVENT_CONNECT: + case BLE_GAP_EVENT_LINK_ESTAB: /* A new connection was established or a connection attempt failed. */ if (event->connect.status == 0) { /* Connection successfully established. */ diff --git a/examples/bluetooth/nimble/ble_phy/phy_prph/main/main.c b/examples/bluetooth/nimble/ble_phy/phy_prph/main/main.c index 4a616f9226..f1308fd708 100644 --- a/examples/bluetooth/nimble/ble_phy/phy_prph/main/main.c +++ b/examples/bluetooth/nimble/ble_phy/phy_prph/main/main.c @@ -183,7 +183,7 @@ bleprph_gap_event(struct ble_gap_event *event, void *arg) int rc; switch (event->type) { - case BLE_GAP_EVENT_CONNECT: + case BLE_GAP_EVENT_LINK_ESTAB: /* A new connection was established or a connection attempt failed. */ MODLOG_DFLT(INFO, "connection %s; status=%d ", event->connect.status == 0 ? "established" : "failed", diff --git a/examples/bluetooth/nimble/ble_spp/spp_client/main/main.c b/examples/bluetooth/nimble/ble_spp/spp_client/main/main.c index 074199ec18..6cb4a83ead 100644 --- a/examples/bluetooth/nimble/ble_spp/spp_client/main/main.c +++ b/examples/bluetooth/nimble/ble_spp/spp_client/main/main.c @@ -230,7 +230,7 @@ ble_spp_client_gap_event(struct ble_gap_event *event, void *arg) ble_spp_client_connect_if_interesting(&event->disc); return 0; - case BLE_GAP_EVENT_CONNECT: + case BLE_GAP_EVENT_LINK_ESTAB: /* A new connection was established or a connection attempt failed. */ if (event->connect.status == 0) { /* Connection successfully established. */ diff --git a/examples/bluetooth/nimble/ble_spp/spp_server/main/main.c b/examples/bluetooth/nimble/ble_spp/spp_server/main/main.c index 86aa7fe9f8..98cc6a1199 100644 --- a/examples/bluetooth/nimble/ble_spp/spp_server/main/main.c +++ b/examples/bluetooth/nimble/ble_spp/spp_server/main/main.c @@ -141,7 +141,7 @@ ble_spp_server_gap_event(struct ble_gap_event *event, void *arg) int rc; switch (event->type) { - case BLE_GAP_EVENT_CONNECT: + case BLE_GAP_EVENT_LINK_ESTAB: /* A new connection was established or a connection attempt failed. */ MODLOG_DFLT(INFO, "connection %s; status=%d ", event->connect.status == 0 ? "established" : "failed", diff --git a/examples/bluetooth/nimble/blecent/main/main.c b/examples/bluetooth/nimble/blecent/main/main.c index 9b4ddb5d2c..b2dc006940 100644 --- a/examples/bluetooth/nimble/blecent/main/main.c +++ b/examples/bluetooth/nimble/blecent/main/main.c @@ -691,7 +691,7 @@ blecent_gap_event(struct ble_gap_event *event, void *arg) blecent_connect_if_interesting(&event->disc); return 0; - case BLE_GAP_EVENT_CONNECT: + case BLE_GAP_EVENT_LINK_ESTAB: /* A new connection was established or a connection attempt failed. */ if (event->connect.status == 0) { /* Connection successfully established. */ diff --git a/examples/bluetooth/nimble/blehr/main/main.c b/examples/bluetooth/nimble/blehr/main/main.c index b9c7ea991f..9c9a917334 100644 --- a/examples/bluetooth/nimble/blehr/main/main.c +++ b/examples/bluetooth/nimble/blehr/main/main.c @@ -184,7 +184,7 @@ static int blehr_gap_event(struct ble_gap_event *event, void *arg) { switch (event->type) { - case BLE_GAP_EVENT_CONNECT: + case BLE_GAP_EVENT_LINK_ESTAB: /* A new connection was established or a connection attempt failed */ MODLOG_DFLT(INFO, "connection %s; status=%d\n", event->connect.status == 0 ? "established" : "failed", diff --git a/examples/bluetooth/nimble/bleprph/main/main.c b/examples/bluetooth/nimble/bleprph/main/main.c index c62e6478fd..5298bcad1e 100644 --- a/examples/bluetooth/nimble/bleprph/main/main.c +++ b/examples/bluetooth/nimble/bleprph/main/main.c @@ -237,7 +237,7 @@ bleprph_gap_event(struct ble_gap_event *event, void *arg) int rc; switch (event->type) { - case BLE_GAP_EVENT_CONNECT: + case BLE_GAP_EVENT_LINK_ESTAB: /* A new connection was established or a connection attempt failed. */ MODLOG_DFLT(INFO, "connection %s; status=%d ", event->connect.status == 0 ? "established" : "failed", diff --git a/examples/bluetooth/nimble/bleprph_wifi_coex/main/main.c b/examples/bluetooth/nimble/bleprph_wifi_coex/main/main.c index c4eac37c50..670bc983b0 100644 --- a/examples/bluetooth/nimble/bleprph_wifi_coex/main/main.c +++ b/examples/bluetooth/nimble/bleprph_wifi_coex/main/main.c @@ -119,7 +119,7 @@ void wifi_init_sta(void) .ssid = EXAMPLE_ESP_WIFI_SSID, .password = EXAMPLE_ESP_WIFI_PASS, /* Setting a password implies station will connect to all security modes including WEP/WPA. - * However these modes are deprecated and not advisable to be used. Incase your Access point + * However these modes are deprecated and not advisable to be used. In case your Access point * doesn't support WPA2, these mode can be enabled by commenting below line */ .threshold.authmode = WIFI_AUTH_WPA2_PSK, }, @@ -389,7 +389,7 @@ bleprph_gap_event(struct ble_gap_event *event, void *arg) int rc; switch (event->type) { - case BLE_GAP_EVENT_CONNECT: + case BLE_GAP_EVENT_LINK_ESTAB: /* A new connection was established or a connection attempt failed. */ ESP_LOGI(TAG, "connection %s; status=%d ", event->connect.status == 0 ? "established" : "failed", diff --git a/examples/bluetooth/nimble/power_save/main/main.c b/examples/bluetooth/nimble/power_save/main/main.c index 1c5fb14b20..2a1b8e031c 100644 --- a/examples/bluetooth/nimble/power_save/main/main.c +++ b/examples/bluetooth/nimble/power_save/main/main.c @@ -282,7 +282,7 @@ bleprph_gap_event(struct ble_gap_event *event, void *arg) int rc; switch (event->type) { - case BLE_GAP_EVENT_CONNECT: + case BLE_GAP_EVENT_LINK_ESTAB: /* A new connection was established or a connection attempt failed. */ MODLOG_DFLT(INFO, "connection %s; status=%d ", event->connect.status == 0 ? "established" : "failed", diff --git a/examples/bluetooth/nimble/throughput_app/blecent_throughput/main/main.c b/examples/bluetooth/nimble/throughput_app/blecent_throughput/main/main.c index 83e7628296..b58770bc1f 100644 --- a/examples/bluetooth/nimble/throughput_app/blecent_throughput/main/main.c +++ b/examples/bluetooth/nimble/throughput_app/blecent_throughput/main/main.c @@ -538,7 +538,7 @@ blecent_gap_event(struct ble_gap_event *event, void *arg) blecent_connect_if_interesting(&event->disc); return 0; - case BLE_GAP_EVENT_CONNECT: + case BLE_GAP_EVENT_LINK_ESTAB: /* A new connection was established or a connection attempt failed. */ if (event->connect.status == 0) { /* Connection successfully established. */ diff --git a/examples/bluetooth/nimble/throughput_app/bleprph_throughput/main/main.c b/examples/bluetooth/nimble/throughput_app/bleprph_throughput/main/main.c index 0d66133220..6b6bf0c5c2 100644 --- a/examples/bluetooth/nimble/throughput_app/bleprph_throughput/main/main.c +++ b/examples/bluetooth/nimble/throughput_app/bleprph_throughput/main/main.c @@ -238,7 +238,7 @@ gatts_gap_event(struct ble_gap_event *event, void *arg) int rc; switch (event->type) { - case BLE_GAP_EVENT_CONNECT: + case BLE_GAP_EVENT_LINK_ESTAB: /* A new connection was established or a connection attempt failed */ ESP_LOGI(tag, "connection %s; status = %d ", event->connect.status == 0 ? "established" : "failed", diff --git a/tools/ci/check_copyright_ignore.txt b/tools/ci/check_copyright_ignore.txt index eb56428b68..6df24bac44 100644 --- a/tools/ci/check_copyright_ignore.txt +++ b/tools/ci/check_copyright_ignore.txt @@ -1500,6 +1500,7 @@ examples/bluetooth/nimble/blecent/main/blecent.h examples/bluetooth/nimble/blecent/main/main.c examples/bluetooth/nimble/blecent/main/misc.c examples/bluetooth/nimble/blecent/main/peer.c +examples/bluetooth/nimble/blecsc/main/main.c examples/bluetooth/nimble/blehr/blehr_test.py examples/bluetooth/nimble/blehr/main/blehr_sens.h examples/bluetooth/nimble/blehr/main/gatt_svr.c