michaelh/zephyr
1
0
Fork 0
Code Releases Activity

bluetooth: Host: Rename CS tone antenna configurations

Browse source 
Improves readability by removing the need to check the table
to figure out how many antennas devices A and B are using.

Signed-off-by: Olivier Lesage <olivier.lesage@nordicsemi.no>
This commit is contained in:
Olivier Lesage 2025-02-21 11:04:27 +01:00 • committed by Benjamin Cabé
commit 6f33793b41
5 changed files with 19 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

7
doc/releases/migration-guide-4.2.rst
View file

@ -64,6 +64,13 @@ GPIO
Bluetooth
*********
Bluetooth Host
==============
* The symbols ``BT_LE_CS_TONE_ANTENNA_CONFIGURATION_INDEX_<NUMBER>`` in
:zephyr_file:`include/zephyr/bluetooth/conn.h` have been renamed
to ``BT_LE_CS_TONE_ANTENNA_CONFIGURATION_A<NUMBER>_B<NUMBER>``.
Networking
**********

16
include/zephyr/bluetooth/conn.h
View file

@ -1587,14 +1587,14 @@ enum bt_conn_le_cs_procedure_enable_state {
* - 2:2 configuration, where both A and B support 2 antennas and N_AP = 4
*/
enum bt_conn_le_cs_tone_antenna_config_selection {
BT_LE_CS_TONE_ANTENNA_CONFIGURATION_INDEX_ONE = BT_HCI_OP_LE_CS_ACI_0,
BT_LE_CS_TONE_ANTENNA_CONFIGURATION_INDEX_TWO = BT_HCI_OP_LE_CS_ACI_1,
BT_LE_CS_TONE_ANTENNA_CONFIGURATION_INDEX_THREE = BT_HCI_OP_LE_CS_ACI_2,
BT_LE_CS_TONE_ANTENNA_CONFIGURATION_INDEX_FOUR = BT_HCI_OP_LE_CS_ACI_3,
BT_LE_CS_TONE_ANTENNA_CONFIGURATION_INDEX_FIVE = BT_HCI_OP_LE_CS_ACI_4,
BT_LE_CS_TONE_ANTENNA_CONFIGURATION_INDEX_SIX = BT_HCI_OP_LE_CS_ACI_5,
BT_LE_CS_TONE_ANTENNA_CONFIGURATION_INDEX_SEVEN = BT_HCI_OP_LE_CS_ACI_6,
BT_LE_CS_TONE_ANTENNA_CONFIGURATION_INDEX_EIGHT = BT_HCI_OP_LE_CS_ACI_7,
BT_LE_CS_TONE_ANTENNA_CONFIGURATION_A1_B1 = BT_HCI_OP_LE_CS_ACI_0,
BT_LE_CS_TONE_ANTENNA_CONFIGURATION_A2_B1 = BT_HCI_OP_LE_CS_ACI_1,
BT_LE_CS_TONE_ANTENNA_CONFIGURATION_A3_B1 = BT_HCI_OP_LE_CS_ACI_2,
BT_LE_CS_TONE_ANTENNA_CONFIGURATION_A4_B1 = BT_HCI_OP_LE_CS_ACI_3,
BT_LE_CS_TONE_ANTENNA_CONFIGURATION_A1_B2 = BT_HCI_OP_LE_CS_ACI_4,
BT_LE_CS_TONE_ANTENNA_CONFIGURATION_A1_B3 = BT_HCI_OP_LE_CS_ACI_5,
BT_LE_CS_TONE_ANTENNA_CONFIGURATION_A1_B4 = BT_HCI_OP_LE_CS_ACI_6,
BT_LE_CS_TONE_ANTENNA_CONFIGURATION_A2_B2 = BT_HCI_OP_LE_CS_ACI_7,
};
struct bt_conn_le_cs_procedure_enable_complete {

2
samples/bluetooth/channel_sounding/include/cs_test_params.h
View file

@ -31,7 +31,7 @@ static struct bt_le_cs_test_param test_params_get(enum bt_conn_le_cs_role role)
params.t_fcs_time = 150;
params.t_pm_time = 40;
params.t_sw_time = 0;
params.tone_antenna_config_selection = BT_LE_CS_TONE_ANTENNA_CONFIGURATION_INDEX_ONE;
params.tone_antenna_config_selection = BT_LE_CS_TONE_ANTENNA_CONFIGURATION_A1_B1;
params.initiator_snr_control = BT_LE_CS_SNR_CONTROL_NOT_USED;
params.reflector_snr_control = BT_LE_CS_SNR_CONTROL_NOT_USED;

2
samples/bluetooth/channel_sounding/src/connected_cs_initiator.c
View file

@ -329,7 +329,7 @@ int main(void)
.max_procedure_count = 0,
.min_subevent_len = 6750,
.max_subevent_len = 6750,
.tone_antenna_config_selection = BT_LE_CS_TONE_ANTENNA_CONFIGURATION_INDEX_ONE,
.tone_antenna_config_selection = BT_LE_CS_TONE_ANTENNA_CONFIGURATION_A1_B1,
.phy = BT_LE_CS_PROCEDURE_PHY_1M,
.tx_power_delta = 0x80,
.preferred_peer_antenna = BT_LE_CS_PROCEDURE_PREFERRED_PEER_ANTENNA_1,

4
subsys/bluetooth/host/shell/cs.c
View file

@ -220,7 +220,7 @@ static int cmd_cs_test_simple(const struct shell *sh, size_t argc, char *argv[])
params.t_fcs_time = 120;
params.t_pm_time = 20;
params.t_sw_time = 0;
params.tone_antenna_config_selection = BT_LE_CS_TONE_ANTENNA_CONFIGURATION_INDEX_ONE;
params.tone_antenna_config_selection = BT_LE_CS_TONE_ANTENNA_CONFIGURATION_A1_B1;
params.initiator_snr_control = BT_LE_CS_SNR_CONTROL_NOT_USED;
params.reflector_snr_control = BT_LE_CS_SNR_CONTROL_NOT_USED;
params.drbg_nonce = 0x1234;
@ -638,7 +638,7 @@ static int cmd_set_procedure_parameters(const struct shell *sh, size_t argc, cha
params.max_procedure_count = 1;
params.min_subevent_len = 5000;
params.max_subevent_len = 4000000;
params.tone_antenna_config_selection = BT_LE_CS_TONE_ANTENNA_CONFIGURATION_INDEX_ONE;
params.tone_antenna_config_selection = BT_LE_CS_TONE_ANTENNA_CONFIGURATION_A1_B1;
params.phy = 0x01;
params.tx_power_delta = 0x80;
params.preferred_peer_antenna = 1;