From 072d01da2f48e4a6add2f90ba7ed29b6e1f73234 Mon Sep 17 00:00:00 2001 From: Prasad Alatkar Date: Thu, 2 Apr 2020 16:05:36 +0530 Subject: [PATCH 1/2] NimBLE: Reset master and slave states on host reset and fix build failure (backport v4.1) --- components/bt/host/nimble/nimble | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/bt/host/nimble/nimble b/components/bt/host/nimble/nimble index e4e2b50141..0a1604a579 160000 --- a/components/bt/host/nimble/nimble +++ b/components/bt/host/nimble/nimble @@ -1 +1 @@ -Subproject commit e4e2b501410bf60d2f09e62bfd8230074dfaa2c9 +Subproject commit 0a1604a5792d64e2fc5860bfeeabf370a9680656 From acb92c225f3b85f2a9d8794fd69d72a62207e46d Mon Sep 17 00:00:00 2001 From: Prasad Alatkar Date: Fri, 27 Mar 2020 14:05:32 +0800 Subject: [PATCH 2/2] NimBLE: Minor fix in `esp_nimble_cfg` and `bleprph` README (backport v4.1) --- components/bt/host/nimble/port/include/esp_nimble_cfg.h | 2 +- examples/bluetooth/nimble/bleprph/README.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/components/bt/host/nimble/port/include/esp_nimble_cfg.h b/components/bt/host/nimble/port/include/esp_nimble_cfg.h index 9f30d62e77..468905178e 100644 --- a/components/bt/host/nimble/port/include/esp_nimble_cfg.h +++ b/components/bt/host/nimble/port/include/esp_nimble_cfg.h @@ -468,7 +468,7 @@ #endif #ifndef MYNEWT_VAL_BLE_HS_FLOW_CTRL_TX_ON_DISCONNECT -#define MYNEWT_VAL_BLE_HS_FLOW_CTRL_TX_ON_DISCONNECT CONFIG_BT_NIMBLE_FLOW_CTRL_TX_ON_DISCONNECT +#define MYNEWT_VAL_BLE_HS_FLOW_CTRL_TX_ON_DISCONNECT CONFIG_BT_NIMBLE_HS_FLOW_CTRL_TX_ON_DISCONNECT #endif #ifndef MYNEWT_VAL_BLE_HS_PHONY_HCI_ACKS diff --git a/examples/bluetooth/nimble/bleprph/README.md b/examples/bluetooth/nimble/bleprph/README.md index 76c4f23eaf..0fb0ee494a 100644 --- a/examples/bluetooth/nimble/bleprph/README.md +++ b/examples/bluetooth/nimble/bleprph/README.md @@ -10,7 +10,7 @@ This example aims at understanding GATT database configuration, advertisement an It also demonstrates security features of NimBLE stack. SMP parameters like I/O capabilities of device, Bonding flag, MITM protection flag and Secure Connection only mode etc., can be configured through menuconfig options. -For RPA feature (currently Host based privacy feature is supported), use API `ble_hs_pvcy_rpa_config` to enable/disable host based privacy. `own_addr_type` needs to be set to `BLE_ADDR_RANDOM` to use this feature. +For RPA feature (currently Host based privacy feature is supported), use API `ble_hs_pvcy_rpa_config` to enable/disable host based privacy, `own_addr_type` needs to be set to `BLE_ADDR_RANDOM` to use this feature. Please include `ble_hs_pvcy.h` while using this API. As `ble_hs_pvcy_rpa_config` configures host privacy and sets address in controller, it is necessary to call this API after host-controller are synced (e.g. in `bleprph_on_sync` callback). To test this demo, any BLE scanner app can be used.