Skip to content

Commit

Permalink
Merge branch 'feature/btdm_ble_full_scan_support' into 'master'
Browse files Browse the repository at this point in the history
component/bt: Added the ble full scan supported feature.

See merge request idf/esp-idf!3820
  • Loading branch information
jack0c committed Nov 30, 2018
2 parents e07c5a2 + 0f3eb97 commit 6bd497f
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 2 deletions.
9 changes: 8 additions & 1 deletion components/bt/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,7 @@ config BT_HCI_UART_BAUDRATE
default 921600
help
UART Baudrate for HCI. Please use standard baudrate.

endmenu

menu "MODEM SLEEP Options"
Expand Down Expand Up @@ -238,7 +239,13 @@ config MESH_DUPLICATE_SCAN_CACHE_SIZE
Maximum number of adv packets which can be recorded in duplicate scan cache for BLE Mesh.
When the maximum amount of device in the filter is reached, the cache will be refreshed.


config BTDM_CONTROLLER_FULL_SCAN_SUPPORTED
bool "BLE full scan feature supported"
depends on BTDM_CONTROLLER_MODE_BLE_ONLY
default n
help
The full scan function is mainly used to provide BLE scan performance.
This is required for scenes with high scan performance requirements, such as BLE Mesh scenes.

endmenu

Expand Down
4 changes: 4 additions & 0 deletions components/bt/bt.c
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@
#define BTDM_CFG_CONTROLLER_RUN_APP_CPU (1<<2)
#define BTDM_CFG_SCAN_DUPLICATE_OPTIONS (1<<3)
#define BTDM_CFG_SEND_ADV_RESERVED_SIZE (1<<4)
#define BTDM_CFG_BLE_FULL_SCAN_SUPPORTED (1<<5)

/* Sleep mode */
#define BTDM_MODEM_SLEEP_MODE_NONE (0)
Expand Down Expand Up @@ -810,6 +811,9 @@ static uint32_t btdm_config_mask_load(void)
#if CONFIG_BTDM_CONTROLLER_PINNED_TO_CORE == 1
mask |= BTDM_CFG_CONTROLLER_RUN_APP_CPU;
#endif
#if CONFIG_BTDM_CONTROLLER_FULL_SCAN_SUPPORTED
mask |= BTDM_CFG_BLE_FULL_SCAN_SUPPORTED;
#endif /* CONFIG_BTDM_CONTROLLER_FULL_SCAN_SUPPORTED */
mask |= BTDM_CFG_SCAN_DUPLICATE_OPTIONS;

mask |= BTDM_CFG_SEND_ADV_RESERVED_SIZE;
Expand Down
2 changes: 1 addition & 1 deletion components/bt/lib
Submodule lib updated 1 files
+ libbtdm_app.a

0 comments on commit 6bd497f

Please sign in to comment.