lib: bluetooth: ble_conn_params: add conn param update request

Add BLE_GAP_EVT_CONN_PARAM_UPDATE_REQUEST to ble_conn_params library.

Signed-off-by: Eivind Jølsgard <eivind.jolsgard@nordicsemi.no>

Author: eivindj-nordic

doc/nrf-bm/release_notes/release_notes_changelog.rst

@@ -73,7 +73,11 @@ Libraries
 
 * :ref:`lib_ble_conn_params`:
 
-   * Added support for selecting more than one PHY mode (1M, 2M, and Coded) when setting the PHY mode preference with Kconfig.
+   * Added:
+
+      * Support for selecting more than one PHY mode (1M, 2M, and Coded) when setting the PHY mode preference with Kconfig.
+      * Support for the :c:macro:`BLE_GAP_EVT_CONN_PARAM_UPDATE_REQUEST` SoftDevice event.
+
    * Updated the :c:func:`ble_conn_params_phy_radio_mode_set` function to return :c:macro:`NRF_ERROR_INVALID_PARAM` if the ``phy_pref`` parameter contains PHY modes not supported by the SoftDevice.
 
    * Fixed:
@@ -88,6 +92,7 @@ Bluetooth LE Services
 
    * Changed :c:member:`ble_scan_filter_data.addr_filter.addr` and :c:member:`ble_scan_filter_data.name_filter.name` to ``const`` in the :c:struct:`ble_scan_filter_data` structure.
 
+
 Libraries for NFC
 -----------------
 

lib/bluetooth/ble_conn_params/conn_param.c

@@ -144,6 +144,19 @@ static void on_conn_params_update(uint16_t conn_handle, int idx,
 	}
 }
 
+#if defined(CONFIG_SOFTDEVICE_CENTRAL)
+static void on_conn_params_update_request(uint16_t conn_handle, int idx,
+					  const ble_gap_evt_conn_param_update_request_t *evt)
+{
+	uint32_t nrf_err;
+
+	nrf_err = sd_ble_gap_conn_param_update(conn_handle, &links[idx].ppcp);
+	if (nrf_err) {
+		LOG_ERR("Failed to update connection params, nrf_error %#x", nrf_err);
+	}
+}
+#endif /* CONFIG_SOFTDEVICE_CENTRAL */
+
 static void on_ble_evt(const ble_evt_t *evt, void *ctx)
 {
 	const uint16_t conn_handle = evt->evt.common_evt.conn_handle;
@@ -163,7 +176,12 @@ static void on_ble_evt(const ble_evt_t *evt, void *ctx)
 	case BLE_GAP_EVT_CONN_PARAM_UPDATE:
 		on_conn_params_update(conn_handle, idx, &evt->evt.gap_evt.params.conn_param_update);
 		break;
-
+#if defined(CONFIG_SOFTDEVICE_CENTRAL)
+	case BLE_GAP_EVT_CONN_PARAM_UPDATE_REQUEST:
+		on_conn_params_update_request(conn_handle, idx,
+					      &evt->evt.gap_evt.params.conn_param_update_request);
+		break;
+#endif /* CONFIG_SOFTDEVICE_CENTRAL */
 	default:
 		/* Ignore */
 		break;

samples/bluetooth/ble_hrs_central/src/main.c

@@ -154,16 +154,6 @@ static void on_ble_evt(const ble_evt_t *ble_evt, void *ctx)
 		}
 		break;
 
-	case BLE_GAP_EVT_CONN_PARAM_UPDATE_REQUEST:
-		LOG_INF("ble gap event connection parameter update request");
-		nrf_err = sd_ble_gap_conn_param_update(
-			gap_evt->conn_handle,
-			&gap_evt->params.conn_param_update_request.conn_params);
-		if (nrf_err) {
-			LOG_ERR("Failed to update connection params, nrf_error %#x", nrf_err);
-		}
-		break;
-
 	case BLE_GATTC_EVT_TIMEOUT:
 		LOG_INF("GATT Client Timeout");
 		nrf_err = sd_ble_gap_disconnect(ble_evt->evt.gattc_evt.conn_handle,

samples/bluetooth/ble_nus_central/src/main.c

@@ -215,15 +215,6 @@ static void on_ble_evt(ble_evt_t const *ble_evt, void *context)
 			LOG_ERR("gap_sec_params_reply failed, nrf_error %#x", nrf_err);
 		}
 		break;
-	case BLE_GAP_EVT_CONN_PARAM_UPDATE_REQUEST:
-		/** Accepting parameters requested by peer. */
-		nrf_err = sd_ble_gap_conn_param_update(
-			gap_evt->conn_handle,
-			&gap_evt->params.conn_param_update_request.conn_params);
-		if (nrf_err) {
-			LOG_ERR("gap_conn_param_update failed, nrf_error %#x", nrf_err);
-		}
-		break;
 	case BLE_GAP_EVT_PHY_UPDATE_REQUEST:
 		LOG_DBG("PHY update request");
 		nrf_err = sd_ble_gap_phy_update(ble_evt->evt.gap_evt.conn_handle, &phys);

tests/unit/lib/bluetooth/ble_conn_params/CMakeLists.txt

@@ -10,7 +10,7 @@ find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
 
 project(unit_test_ble_conn_params)
 
-set(SOFTDEVICE_VARIANT "s115")
+set(SOFTDEVICE_VARIANT "s145")
 set(SOFTDEVICE_INCLUDE_DIR "${ZEPHYR_NRF_BM_MODULE_DIR}/components/softdevice/nrf54l/\
 ${SOFTDEVICE_VARIANT}/${SOFTDEVICE_VARIANT}_API/include")
 

tests/unit/lib/bluetooth/ble_conn_params/Kconfig

@@ -17,4 +17,7 @@ config NRF_SDH_BLE_GAP_EVENT_LENGTH
 config NRF_SDH_BLE_GATT_MAX_MTU_SIZE
 	default 24
 
+config SOFTDEVICE_CENTRAL
+	default y
+
 source "Kconfig.zephyr"

tests/unit/lib/bluetooth/ble_conn_params/src/unity_test.c

@@ -996,6 +996,40 @@ void test_ble_evt_conn_param_update_busy(void)
 	TEST_ASSERT_EQUAL(CONN_HANDLE, app_evt.conn_handle);
 }
 
+void test_ble_evt_conn_param_update_request_accepted(void)
+{
+	ble_evt_t ble_evt = {
+		.header.evt_id = BLE_GAP_EVT_CONN_PARAM_UPDATE_REQUEST,
+		.evt.gap_evt = {
+			.conn_handle = CONN_HANDLE,
+			/* Requested conn params are ignored by the central */
+			.params.conn_param_update_request.conn_params = {
+				.conn_sup_timeout = 0x12,
+				.min_conn_interval = 0x13,
+				.max_conn_interval = 0x14,
+				.slave_latency = 0x15,
+			},
+		},
+	};
+	const ble_gap_conn_params_t conn_params_expected = {
+		.conn_sup_timeout = CONFIG_BLE_CONN_PARAMS_SUP_TIMEOUT,
+		.min_conn_interval = CONFIG_BLE_CONN_PARAMS_MIN_CONN_INTERVAL,
+		.max_conn_interval = CONFIG_BLE_CONN_PARAMS_MAX_CONN_INTERVAL,
+		.slave_latency = CONFIG_BLE_CONN_PARAMS_PERIPHERAL_LATENCY,
+	};
+
+	/* Calls from BLE observers. */
+	__cmock_nrf_sdh_ble_idx_get_ExpectAndReturn(CONN_HANDLE, 0);
+	__cmock_nrf_sdh_ble_idx_get_ExpectAndReturn(CONN_HANDLE, 0);
+	__cmock_nrf_sdh_ble_idx_get_ExpectAndReturn(CONN_HANDLE, 0);
+	__cmock_nrf_sdh_ble_idx_get_ExpectAndReturn(CONN_HANDLE, 0);
+
+	__cmock_sd_ble_gap_conn_param_update_ExpectWithArrayAndReturn(
+		CONN_HANDLE, &conn_params_expected, 1, NRF_SUCCESS);
+
+	ble_evt_send(&ble_evt);
+}
+
 void test_ble_evt_data_length_update(void)
 {