Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

applications: nrf_desktop: Add state machine and forced scan state to BLE scan module #12107

Merged
merged 3 commits into from
Aug 23, 2023
Merged

applications: nrf_desktop: Add state machine and forced scan state to BLE scan module #12107

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4f3add0
applications: nrf_desktop: Increase L2CAP TX buffer count on dongles
MarekPieta Aug 23, 2023
c4f2f99
applications: nrf_desktop: Add state machine to BLE scan module
MarekPieta Aug 17, 2023
16c244c
applications: nrf_desktop: Introduce forced scan state
MarekPieta Aug 22, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion applications/nrf_desktop/configuration/nrf52820dongle_nrf52820/prj.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ CONFIG_BT_LL_SW_SPLIT=y

CONFIG_BT_BUF_ACL_TX_SIZE=35
CONFIG_BT_CTLR_DATA_LENGTH_MAX=35
CONFIG_BT_L2CAP_TX_BUF_COUNT=4
CONFIG_BT_L2CAP_TX_BUF_COUNT=6

CONFIG_ENTROPY_CC3XX=n

Expand Down
2 changes: 1 addition & 1 deletion applications/nrf_desktop/configuration/nrf52820dongle_nrf52820/prj_release.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ CONFIG_BT_LL_SW_SPLIT=y

CONFIG_BT_BUF_ACL_TX_SIZE=35
CONFIG_BT_CTLR_DATA_LENGTH_MAX=35
CONFIG_BT_L2CAP_TX_BUF_COUNT=4
CONFIG_BT_L2CAP_TX_BUF_COUNT=6

CONFIG_ENTROPY_CC3XX=n

Expand Down
2 changes: 1 addition & 1 deletion applications/nrf_desktop/configuration/nrf52833dk_nrf52820/prj.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ CONFIG_BT_LL_SW_SPLIT=y

CONFIG_BT_BUF_ACL_TX_SIZE=35
CONFIG_BT_CTLR_DATA_LENGTH_MAX=35
CONFIG_BT_L2CAP_TX_BUF_COUNT=4
CONFIG_BT_L2CAP_TX_BUF_COUNT=6

CONFIG_ENTROPY_CC3XX=n

Expand Down
2 changes: 1 addition & 1 deletion applications/nrf_desktop/configuration/nrf52833dk_nrf52820/prj_release.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ CONFIG_BT_LL_SW_SPLIT=y

CONFIG_BT_BUF_ACL_TX_SIZE=35
CONFIG_BT_CTLR_DATA_LENGTH_MAX=35
CONFIG_BT_L2CAP_TX_BUF_COUNT=4
CONFIG_BT_L2CAP_TX_BUF_COUNT=6

CONFIG_ENTROPY_CC3XX=n

Expand Down
2 changes: 1 addition & 1 deletion applications/nrf_desktop/configuration/nrf52833dk_nrf52833/prj.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ CONFIG_BT_CTLR_TX_PWR_DYNAMIC_CONTROL=y
CONFIG_BT_BUF_ACL_TX_SIZE=35
CONFIG_BT_CTLR_DATA_LENGTH_MAX=35
CONFIG_BT_CTLR_SDC_MAX_CONN_EVENT_LEN_DEFAULT=3000
CONFIG_BT_L2CAP_TX_BUF_COUNT=4
CONFIG_BT_L2CAP_TX_BUF_COUNT=6

################################################################################

Expand Down
2 changes: 1 addition & 1 deletion applications/nrf_desktop/configuration/nrf52833dk_nrf52833/prj_release.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ CONFIG_BT_CTLR_TX_PWR_DYNAMIC_CONTROL=y
CONFIG_BT_BUF_ACL_TX_SIZE=35
CONFIG_BT_CTLR_DATA_LENGTH_MAX=35
CONFIG_BT_CTLR_SDC_MAX_CONN_EVENT_LEN_DEFAULT=3000
CONFIG_BT_L2CAP_TX_BUF_COUNT=4
CONFIG_BT_L2CAP_TX_BUF_COUNT=6

################################################################################
# Bootloader Configuration
Expand Down
2 changes: 1 addition & 1 deletion applications/nrf_desktop/configuration/nrf52833dongle_nrf52833/prj.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ CONFIG_BT_CTLR_TX_PWR_DYNAMIC_CONTROL=y
CONFIG_BT_BUF_ACL_TX_SIZE=35
CONFIG_BT_CTLR_DATA_LENGTH_MAX=35
CONFIG_BT_CTLR_SDC_MAX_CONN_EVENT_LEN_DEFAULT=3000
CONFIG_BT_L2CAP_TX_BUF_COUNT=4
CONFIG_BT_L2CAP_TX_BUF_COUNT=6

################################################################################

Expand Down
2 changes: 1 addition & 1 deletion applications/nrf_desktop/configuration/nrf52833dongle_nrf52833/prj_release.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ CONFIG_BT_CTLR_TX_PWR_DYNAMIC_CONTROL=y
CONFIG_BT_BUF_ACL_TX_SIZE=35
CONFIG_BT_CTLR_DATA_LENGTH_MAX=35
CONFIG_BT_CTLR_SDC_MAX_CONN_EVENT_LEN_DEFAULT=3000
CONFIG_BT_L2CAP_TX_BUF_COUNT=4
CONFIG_BT_L2CAP_TX_BUF_COUNT=6

################################################################################
# Bootloader Configuration
Expand Down
2 changes: 1 addition & 1 deletion applications/nrf_desktop/configuration/nrf52840dk_nrf52840/prj_dongle.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ CONFIG_BT_CTLR_TX_PWR_DYNAMIC_CONTROL=y
CONFIG_BT_BUF_ACL_TX_SIZE=35
CONFIG_BT_CTLR_DATA_LENGTH_MAX=35
CONFIG_BT_CTLR_SDC_MAX_CONN_EVENT_LEN_DEFAULT=3000
CONFIG_BT_L2CAP_TX_BUF_COUNT=4
CONFIG_BT_L2CAP_TX_BUF_COUNT=6

CONFIG_ENTROPY_CC3XX=n

Expand Down
2 changes: 1 addition & 1 deletion applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/prj.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ CONFIG_BT_CTLR_TX_PWR_DYNAMIC_CONTROL=y
CONFIG_BT_BUF_ACL_TX_SIZE=35
CONFIG_BT_CTLR_DATA_LENGTH_MAX=35
CONFIG_BT_CTLR_SDC_MAX_CONN_EVENT_LEN_DEFAULT=3000
CONFIG_BT_L2CAP_TX_BUF_COUNT=4
CONFIG_BT_L2CAP_TX_BUF_COUNT=6

CONFIG_ENTROPY_CC3XX=n

Expand Down
2 changes: 1 addition & 1 deletion applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/prj_3bleconn.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ CONFIG_BT_CTLR_TX_PWR_DYNAMIC_CONTROL=y
CONFIG_BT_BUF_ACL_TX_SIZE=35
CONFIG_BT_CTLR_DATA_LENGTH_MAX=35
CONFIG_BT_CTLR_SDC_MAX_CONN_EVENT_LEN_DEFAULT=2500
CONFIG_BT_L2CAP_TX_BUF_COUNT=4
CONFIG_BT_L2CAP_TX_BUF_COUNT=6

CONFIG_BT_HOGP_REPORTS_MAX=30

Expand Down
2 changes: 1 addition & 1 deletion applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/prj_4llpmconn.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ CONFIG_BT_CTLR_TX_PWR_DYNAMIC_CONTROL=y
CONFIG_BT_BUF_ACL_TX_SIZE=35
CONFIG_BT_CTLR_DATA_LENGTH_MAX=35
CONFIG_BT_CTLR_SDC_MAX_CONN_EVENT_LEN_DEFAULT=3000
CONFIG_BT_L2CAP_TX_BUF_COUNT=5
CONFIG_BT_L2CAP_TX_BUF_COUNT=6

CONFIG_BT_HOGP_REPORTS_MAX=30

Expand Down
2 changes: 1 addition & 1 deletion applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/prj_release.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ CONFIG_BT_CTLR_TX_PWR_DYNAMIC_CONTROL=y
CONFIG_BT_BUF_ACL_TX_SIZE=35
CONFIG_BT_CTLR_DATA_LENGTH_MAX=35
CONFIG_BT_CTLR_SDC_MAX_CONN_EVENT_LEN_DEFAULT=3000
CONFIG_BT_L2CAP_TX_BUF_COUNT=4
CONFIG_BT_L2CAP_TX_BUF_COUNT=6

CONFIG_ENTROPY_CC3XX=n

Expand Down
2 changes: 1 addition & 1 deletion applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/prj_release_4llpmconn.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ CONFIG_BT_CTLR_TX_PWR_DYNAMIC_CONTROL=y
CONFIG_BT_BUF_ACL_TX_SIZE=35
CONFIG_BT_CTLR_DATA_LENGTH_MAX=35
CONFIG_BT_CTLR_SDC_MAX_CONN_EVENT_LEN_DEFAULT=3000
CONFIG_BT_L2CAP_TX_BUF_COUNT=5
CONFIG_BT_L2CAP_TX_BUF_COUNT=6

CONFIG_BT_HOGP_REPORTS_MAX=30

Expand Down
2 changes: 1 addition & 1 deletion applications/nrf_desktop/configuration/nrf5340dk_nrf5340_cpuapp/prj.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ CONFIG_LED_PWM=y
CONFIG_BT_PRIVACY=y

CONFIG_BT_BUF_ACL_TX_SIZE=35
CONFIG_BT_L2CAP_TX_BUF_COUNT=4
CONFIG_BT_L2CAP_TX_BUF_COUNT=6

################################################################################

Expand Down
2 changes: 1 addition & 1 deletion applications/nrf_desktop/configuration/nrf5340dk_nrf5340_cpuapp/prj_release.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ CONFIG_LED_PWM=y
CONFIG_BT_PRIVACY=y

CONFIG_BT_BUF_ACL_TX_SIZE=35
CONFIG_BT_L2CAP_TX_BUF_COUNT=4
CONFIG_BT_L2CAP_TX_BUF_COUNT=6

################################################################################
# Bootloader Configuration
Expand Down
10 changes: 10 additions & 0 deletions applications/nrf_desktop/src/modules/Kconfig.ble_scan
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,16 @@ config DESKTOP_BLE_SCAN_DURATION_S
help
After this time scan is disabled if any peripheral is connected.

config DESKTOP_BLE_FORCED_SCAN_DURATION_S
int "Forced scan duration [s]"
default 4
help
Duration of the forced scan operation in seconds. The module enters a
forced scan state right after boot or wakeup, on successful peripheral
discovery, on peripheral disconnection and on connection failure.

Setting forced scan duration to 0 disables the feature.

config DESKTOP_BLE_SCAN_MOUSE_LIMIT
int "Maximum number of bonded mice"
default 1
Expand Down
Loading
Loading