Skip to content

Commit 46dddc5

Browse files
jhedberghenrikbrixandersen
authored andcommitted
Bluetooth: samples/tests: Update auto PHY usage to recent changes
Remove deprecated Kconfig option usage, and replace it with corresponding options which yield the same behavior as before. Signed-off-by: Johan Hedberg <johan.hedberg@silabs.com>
1 parent eb8426d commit 46dddc5

File tree

34 files changed

+26
-37
lines changed

34 files changed

+26
-37
lines changed

‎samples/bluetooth/central_hr/overlay-phy_coded.conf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ CONFIG_BT_EXT_ADV=y
44
CONFIG_BT_CTLR_PHY_CODED=y
55

66
# Disable auto PHY update, to switch to 2M PHY
7-
CONFIG_BT_AUTO_PHY_UPDATE=n
7+
CONFIG_BT_AUTO_PHY_CENTRAL_NONE=y
88

99
# Increase Scan Data Length, as Complete Local Name is placed in the
1010
# AUX_ADV_IND PDU compared to when it is placed in ADV_SCAN_IND PDU in the case

‎samples/bluetooth/central_hr/sample.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,6 @@ tests:
5959
- nrf5340dk/nrf5340/cpuapp
6060
extra_args:
6161
- CONFIG_BT_EXT_ADV=y
62-
- CONFIG_BT_AUTO_PHY_UPDATE=n
62+
- CONFIG_BT_AUTO_PHY_CENTRAL_NONE=y
6363
tags: bluetooth
6464
sysbuild: true

‎samples/bluetooth/central_multilink/prj.conf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
CONFIG_BT=y
22
CONFIG_BT_CENTRAL=y
3-
CONFIG_BT_AUTO_PHY_UPDATE=n
3+
CONFIG_BT_AUTO_PHY_CENTRAL_NONE=y
44
CONFIG_BT_PRIVACY=y
55

66
CONFIG_BT_MAX_CONN=62

‎samples/bluetooth/channel_sounding/connected_cs/initiator/prj.conf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ CONFIG_BT=y
22
CONFIG_BT_SMP=y
33
CONFIG_BT_CENTRAL=y
44
CONFIG_BT_GAP_AUTO_UPDATE_CONN_PARAMS=n
5-
CONFIG_BT_AUTO_PHY_UPDATE=n
5+
CONFIG_BT_AUTO_PHY_CENTRAL_NONE=y
66
CONFIG_BT_GATT_CLIENT=y
77
CONFIG_BT_GATT_DYNAMIC_DB=y
88
CONFIG_BT_ATT_PREPARE_COUNT=3

‎samples/bluetooth/channel_sounding/connected_cs/reflector/prj.conf‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ CONFIG_BT=y
22
CONFIG_BT_SMP=y
33
CONFIG_BT_PERIPHERAL=y
44
CONFIG_BT_GAP_AUTO_UPDATE_CONN_PARAMS=n
5-
CONFIG_BT_AUTO_PHY_UPDATE=n
65
CONFIG_BT_GATT_CLIENT=y
76
CONFIG_BT_CHANNEL_SOUNDING=y
87

‎samples/bluetooth/peripheral_hr/overlay-phy_coded.conf‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,6 @@ CONFIG_BT_EXT_ADV=y
33
# Enable Coded PHY support
44
CONFIG_BT_CTLR_PHY_CODED=y
55

6-
# Disable auto PHY update, to switch to 2M PHY
7-
CONFIG_BT_AUTO_PHY_UPDATE=n
8-
96
# Increase Advertising Data Length, as Complete Local Name too needs to be
107
# placed in the AUX_ADV_IND PDU compared to when it is placed in ADV_SCAN_IND
118
# PDU in the case of legacy advertising.

‎samples/bluetooth/peripheral_hr/sample.yaml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,6 @@ tests:
9898
- nrf5340dk/nrf5340/cpuapp
9999
extra_args:
100100
- CONFIG_BT_EXT_ADV=y
101-
- CONFIG_BT_AUTO_PHY_UPDATE=n
102101
tags: bluetooth
103102
sysbuild: true
104103
sample.bluetooth.peripheral_hr_rv32m1_vega_openisa_rv32m1_ri5cy:

‎samples/bluetooth/peripheral_identity/prj.conf‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
CONFIG_BT=y
22
CONFIG_BT_PERIPHERAL=y
3-
CONFIG_BT_AUTO_PHY_UPDATE=n
43
CONFIG_BT_PRIVACY=y
54

65
CONFIG_BT_DEVICE_NAME="Zephyr Peripheral"

‎tests/bluetooth/shell/audio.conf‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@ CONFIG_BT_USER_DATA_LEN_UPDATE=y
5050
CONFIG_BT_AUTO_DATA_LEN_UPDATE=y
5151

5252
CONFIG_BT_USER_PHY_UPDATE=y
53-
CONFIG_BT_AUTO_PHY_UPDATE=y
5453

5554
CONFIG_BT_GAP_AUTO_UPDATE_CONN_PARAMS=n
5655
# Set preferred values based on BT_BAP_CONN_PARAM_RELAXED

‎tests/bluetooth/shell/log.conf‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@ CONFIG_BT_USER_DATA_LEN_UPDATE=y
4747
CONFIG_BT_AUTO_DATA_LEN_UPDATE=y
4848

4949
CONFIG_BT_USER_PHY_UPDATE=y
50-
CONFIG_BT_AUTO_PHY_UPDATE=y
5150

5251
CONFIG_BT_ISO_BROADCASTER=y
5352
CONFIG_BT_ISO_SYNC_RECEIVER=y

0 commit comments

Comments
 (0)