Skip to content

Commit

Permalink
Merge branch 'feat/ble_link_estab_event_v5.0' into 'release/v5.0'
Browse files Browse the repository at this point in the history 
feat(nimble): BLE_GAP_EVENT_LINK_ESTAB event to ensure link is established (v5.0)

See merge request espressif/esp-idf!32261
  • Loading branch information
@rahult-github
rahult-github committed Aug 22, 2024
2 parents 3747cb4 + 91a0c33 commit d889c00
Show file tree
Hide file tree
Showing 20 changed files with 22 additions and 21 deletions.
2 changes: 1 addition & 1 deletion components/bt/host/nimble/nimble
Submodule nimble updated 2 files
+20 −1 nimble/host/include/host/ble_gap.h
+17 −0 nimble/host/src/ble_gap.c
2 changes: 1 addition & 1 deletion examples/bluetooth/nimble/ble_enc_adv_data/enc_adv_data_cent/main/main.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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. */
Expand Down
2 changes: 1 addition & 1 deletion examples/bluetooth/nimble/ble_enc_adv_data/enc_adv_data_prph/main/main.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion examples/bluetooth/nimble/ble_htp/htp_cent/main/main.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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. */
Expand Down
2 changes: 1 addition & 1 deletion examples/bluetooth/nimble/ble_htp/htp_prph/main/main.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion examples/bluetooth/nimble/ble_l2cap_coc/coc_blecent/main/main.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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. */
Expand Down
2 changes: 1 addition & 1 deletion examples/bluetooth/nimble/ble_l2cap_coc/coc_bleprph/main/main.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
4 changes: 2 additions & 2 deletions examples/bluetooth/nimble/ble_multi_adv/main/main.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion examples/bluetooth/nimble/ble_phy/phy_cent/main/main.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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. */
Expand Down
2 changes: 1 addition & 1 deletion examples/bluetooth/nimble/ble_phy/phy_prph/main/main.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion examples/bluetooth/nimble/ble_spp/spp_client/main/main.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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. */
Expand Down
2 changes: 1 addition & 1 deletion examples/bluetooth/nimble/ble_spp/spp_server/main/main.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion examples/bluetooth/nimble/blecent/main/main.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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. */
Expand Down
2 changes: 1 addition & 1 deletion examples/bluetooth/nimble/blehr/main/main.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion examples/bluetooth/nimble/bleprph/main/main.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
4 changes: 2 additions & 2 deletions examples/bluetooth/nimble/bleprph_wifi_coex/main/main.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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,
},
Expand Down Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion examples/bluetooth/nimble/power_save/main/main.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion examples/bluetooth/nimble/throughput_app/blecent_throughput/main/main.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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. */
Expand Down
2 changes: 1 addition & 1 deletion examples/bluetooth/nimble/throughput_app/bleprph_throughput/main/main.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
1 change: 1 addition & 0 deletions tools/ci/check_copyright_ignore.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit d889c00

Please sign in to comment.