Skip to content

Commit e122fc6

Browse files
anhmolteivindj-nordic
authored andcommitted
lib: ble_conn_params: align to spec rename to peripheral latency
Rename slave latency to peripheral latency. Signed-off-by: Andreas Moltumyr <[email protected]>
1 parent a561f96 commit e122fc6

File tree

3 files changed

+20
-20
lines changed

3 files changed

+20
-20
lines changed

lib/ble_conn_params/Kconfig

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ config BLE_CONN_PARAMS_MAX_CONN_INTERVAL
3030
Maximum connection interval in 1.25 ms units.
3131
Min 7.5 ms, Max 4 sec.
3232

33-
config BLE_CONN_PARAMS_SLAVE_LATENCY
34-
int "Slave latency"
33+
config BLE_CONN_PARAMS_PERIPHERAL_LATENCY
34+
int "Peripheral latency"
3535
range 0 499
3636
default 0
3737
help
@@ -45,12 +45,12 @@ config BLE_CONN_PARAMS_SUP_TIMEOUT
4545
Connection supervision timeout in 10 ms units.
4646
Min 100 ms, Max 32 sec.
4747

48-
config BLE_CONN_PARAMS_MAX_SLAVE_LATENCY_DEVIATION
49-
int "Maximum slave latency deviation"
48+
config BLE_CONN_PARAMS_MAX_PERIPHERAL_LATENCY_DEVIATION
49+
int "Maximum peripheral latency deviation"
5050
range 0 499
5151
default 0
5252
help
53-
How much the slave latency can deviate from the desired value.
53+
How much the peripheral latency can deviate from the desired value.
5454

5555
config BLE_CONN_PARAMS_MAX_SUP_TIMEOUT_DEVIATION
5656
int "Maximum supervision timeout deviation (10 ms units)"

lib/ble_conn_params/conn_param.c

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ extern void ble_conn_params_event_send(const struct ble_conn_params_evt *evt);
1717
static const ble_gap_conn_params_t ppcp = {
1818
.min_conn_interval = CONFIG_BLE_CONN_PARAMS_MIN_CONN_INTERVAL,
1919
.max_conn_interval = CONFIG_BLE_CONN_PARAMS_MAX_CONN_INTERVAL,
20-
.slave_latency = CONFIG_BLE_CONN_PARAMS_SLAVE_LATENCY,
20+
.slave_latency = CONFIG_BLE_CONN_PARAMS_PERIPHERAL_LATENCY,
2121
.conn_sup_timeout = CONFIG_BLE_CONN_PARAMS_SUP_TIMEOUT,
2222
};
2323

@@ -44,8 +44,8 @@ static void conn_params_negotiate(uint16_t conn_handle, int idx)
4444

4545
static bool conn_params_can_agree(const ble_gap_conn_params_t *conn_params)
4646
{
47-
uint16_t slave_latency_min;
48-
uint16_t slave_latency_max;
47+
uint16_t peripheral_latency_min;
48+
uint16_t peripheral_latency_max;
4949
uint16_t conn_sup_timeout_min;
5050
uint16_t conn_sup_timeout_max;
5151

@@ -57,16 +57,16 @@ static bool conn_params_can_agree(const ble_gap_conn_params_t *conn_params)
5757
return false;
5858
}
5959

60-
slave_latency_min =
61-
CLAMP(ppcp.slave_latency - CONFIG_BLE_CONN_PARAMS_MAX_SLAVE_LATENCY_DEVIATION, 0,
62-
UINT16_MAX);
63-
slave_latency_max =
64-
CLAMP(ppcp.slave_latency + CONFIG_BLE_CONN_PARAMS_MAX_SLAVE_LATENCY_DEVIATION, 0,
65-
UINT16_MAX);
60+
peripheral_latency_min =
61+
CLAMP(ppcp.slave_latency - CONFIG_BLE_CONN_PARAMS_MAX_PERIPHERAL_LATENCY_DEVIATION,
62+
0, UINT16_MAX);
63+
peripheral_latency_max =
64+
CLAMP(ppcp.slave_latency + CONFIG_BLE_CONN_PARAMS_MAX_PERIPHERAL_LATENCY_DEVIATION,
65+
0, UINT16_MAX);
6666

67-
if (conn_params->slave_latency < slave_latency_min ||
68-
conn_params->slave_latency > slave_latency_max) {
69-
LOG_DBG("Could not agree on slave latency %#x", conn_params->slave_latency);
67+
if (conn_params->slave_latency < peripheral_latency_min ||
68+
conn_params->slave_latency > peripheral_latency_max) {
69+
LOG_DBG("Could not agree on peripheral latency %#x", conn_params->slave_latency);
7070
return false;
7171
}
7272

@@ -105,7 +105,7 @@ static void on_conn_params_update(uint16_t conn_handle, int idx,
105105
const ble_gap_evt_conn_param_update_t *evt)
106106
{
107107
LOG_DBG("GAP connection params updated, conn. interval min %u max %u,"
108-
" slave latency %u, sup. timeout %u",
108+
" peripheral latency %u, sup. timeout %u",
109109
evt->conn_params.min_conn_interval,
110110
evt->conn_params.max_conn_interval,
111111
evt->conn_params.slave_latency,
@@ -186,7 +186,7 @@ static void on_state_evt(enum nrf_sdh_state_evt evt, void *ctx)
186186
return;
187187
}
188188

189-
LOG_DBG("conn. interval min %u max %u, slave latency %u, sup. timeout %u",
189+
LOG_DBG("conn. interval min %u max %u, peripheral latency %u, sup. timeout %u",
190190
ppcp.min_conn_interval, ppcp.max_conn_interval,
191191
ppcp.slave_latency,
192192
ppcp.conn_sup_timeout);

samples/bluetooth/ble_pwr_profiling/prj.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ CONFIG_NRF_SDH_BLE_VS_UUID_COUNT=1
1818
# Connection parameter configurations
1919
CONFIG_BLE_CONN_PARAMS_MAX_CONN_INTERVAL=800
2020
CONFIG_BLE_CONN_PARAMS_SUP_TIMEOUT=1000
21-
CONFIG_BLE_CONN_PARAMS_MAX_SLAVE_LATENCY_DEVIATION=4
21+
CONFIG_BLE_CONN_PARAMS_MAX_PERIPHERAL_LATENCY_DEVIATION=4
2222

2323
# BLE connection parameter
2424
CONFIG_BLE_CONN_PARAMS=y

0 commit comments

Comments
 (0)