Skip to content

Commit 6f33793

Browse files
olivier-le-sagekartben
authored andcommitted
bluetooth: Host: Rename CS tone antenna configurations
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>
1 parent c7467f0 commit 6f33793

File tree

5 files changed

+19
-12
lines changed

5 files changed

+19
-12
lines changed

doc/releases/migration-guide-4.2.rst

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,13 @@ GPIO
6464
Bluetooth
6565
*********
6666

67+
Bluetooth Host
68+
==============
69+
70+
* The symbols ``BT_LE_CS_TONE_ANTENNA_CONFIGURATION_INDEX_<NUMBER>`` in
71+
:zephyr_file:`include/zephyr/bluetooth/conn.h` have been renamed
72+
to ``BT_LE_CS_TONE_ANTENNA_CONFIGURATION_A<NUMBER>_B<NUMBER>``.
73+
6774
Networking
6875
**********
6976

include/zephyr/bluetooth/conn.h

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1587,14 +1587,14 @@ enum bt_conn_le_cs_procedure_enable_state {
15871587
* - 2:2 configuration, where both A and B support 2 antennas and N_AP = 4
15881588
*/
15891589
enum bt_conn_le_cs_tone_antenna_config_selection {
1590-
BT_LE_CS_TONE_ANTENNA_CONFIGURATION_INDEX_ONE = BT_HCI_OP_LE_CS_ACI_0,
1591-
BT_LE_CS_TONE_ANTENNA_CONFIGURATION_INDEX_TWO = BT_HCI_OP_LE_CS_ACI_1,
1592-
BT_LE_CS_TONE_ANTENNA_CONFIGURATION_INDEX_THREE = BT_HCI_OP_LE_CS_ACI_2,
1593-
BT_LE_CS_TONE_ANTENNA_CONFIGURATION_INDEX_FOUR = BT_HCI_OP_LE_CS_ACI_3,
1594-
BT_LE_CS_TONE_ANTENNA_CONFIGURATION_INDEX_FIVE = BT_HCI_OP_LE_CS_ACI_4,
1595-
BT_LE_CS_TONE_ANTENNA_CONFIGURATION_INDEX_SIX = BT_HCI_OP_LE_CS_ACI_5,
1596-
BT_LE_CS_TONE_ANTENNA_CONFIGURATION_INDEX_SEVEN = BT_HCI_OP_LE_CS_ACI_6,
1597-
BT_LE_CS_TONE_ANTENNA_CONFIGURATION_INDEX_EIGHT = BT_HCI_OP_LE_CS_ACI_7,
1590+
BT_LE_CS_TONE_ANTENNA_CONFIGURATION_A1_B1 = BT_HCI_OP_LE_CS_ACI_0,
1591+
BT_LE_CS_TONE_ANTENNA_CONFIGURATION_A2_B1 = BT_HCI_OP_LE_CS_ACI_1,
1592+
BT_LE_CS_TONE_ANTENNA_CONFIGURATION_A3_B1 = BT_HCI_OP_LE_CS_ACI_2,
1593+
BT_LE_CS_TONE_ANTENNA_CONFIGURATION_A4_B1 = BT_HCI_OP_LE_CS_ACI_3,
1594+
BT_LE_CS_TONE_ANTENNA_CONFIGURATION_A1_B2 = BT_HCI_OP_LE_CS_ACI_4,
1595+
BT_LE_CS_TONE_ANTENNA_CONFIGURATION_A1_B3 = BT_HCI_OP_LE_CS_ACI_5,
1596+
BT_LE_CS_TONE_ANTENNA_CONFIGURATION_A1_B4 = BT_HCI_OP_LE_CS_ACI_6,
1597+
BT_LE_CS_TONE_ANTENNA_CONFIGURATION_A2_B2 = BT_HCI_OP_LE_CS_ACI_7,
15981598
};
15991599

16001600
struct bt_conn_le_cs_procedure_enable_complete {

samples/bluetooth/channel_sounding/include/cs_test_params.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ static struct bt_le_cs_test_param test_params_get(enum bt_conn_le_cs_role role)
3131
params.t_fcs_time = 150;
3232
params.t_pm_time = 40;
3333
params.t_sw_time = 0;
34-
params.tone_antenna_config_selection = BT_LE_CS_TONE_ANTENNA_CONFIGURATION_INDEX_ONE;
34+
params.tone_antenna_config_selection = BT_LE_CS_TONE_ANTENNA_CONFIGURATION_A1_B1;
3535

3636
params.initiator_snr_control = BT_LE_CS_SNR_CONTROL_NOT_USED;
3737
params.reflector_snr_control = BT_LE_CS_SNR_CONTROL_NOT_USED;

samples/bluetooth/channel_sounding/src/connected_cs_initiator.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -329,7 +329,7 @@ int main(void)
329329
.max_procedure_count = 0,
330330
.min_subevent_len = 6750,
331331
.max_subevent_len = 6750,
332-
.tone_antenna_config_selection = BT_LE_CS_TONE_ANTENNA_CONFIGURATION_INDEX_ONE,
332+
.tone_antenna_config_selection = BT_LE_CS_TONE_ANTENNA_CONFIGURATION_A1_B1,
333333
.phy = BT_LE_CS_PROCEDURE_PHY_1M,
334334
.tx_power_delta = 0x80,
335335
.preferred_peer_antenna = BT_LE_CS_PROCEDURE_PREFERRED_PEER_ANTENNA_1,

subsys/bluetooth/host/shell/cs.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@ static int cmd_cs_test_simple(const struct shell *sh, size_t argc, char *argv[])
220220
params.t_fcs_time = 120;
221221
params.t_pm_time = 20;
222222
params.t_sw_time = 0;
223-
params.tone_antenna_config_selection = BT_LE_CS_TONE_ANTENNA_CONFIGURATION_INDEX_ONE;
223+
params.tone_antenna_config_selection = BT_LE_CS_TONE_ANTENNA_CONFIGURATION_A1_B1;
224224
params.initiator_snr_control = BT_LE_CS_SNR_CONTROL_NOT_USED;
225225
params.reflector_snr_control = BT_LE_CS_SNR_CONTROL_NOT_USED;
226226
params.drbg_nonce = 0x1234;
@@ -638,7 +638,7 @@ static int cmd_set_procedure_parameters(const struct shell *sh, size_t argc, cha
638638
params.max_procedure_count = 1;
639639
params.min_subevent_len = 5000;
640640
params.max_subevent_len = 4000000;
641-
params.tone_antenna_config_selection = BT_LE_CS_TONE_ANTENNA_CONFIGURATION_INDEX_ONE;
641+
params.tone_antenna_config_selection = BT_LE_CS_TONE_ANTENNA_CONFIGURATION_A1_B1;
642642
params.phy = 0x01;
643643
params.tx_power_delta = 0x80;
644644
params.preferred_peer_antenna = 1;

0 commit comments

Comments
 (0)