bluetooth: rename HRS central to HRS client

Rename HRS central to HRS client, both service and sample.

Signed-off-by: Eivind Jølsgard <[email protected]>

Author: eivindj-nordic

doc/nrf-bm/api/api.rst

@@ -212,12 +212,12 @@ Heart Rate Service
 
 .. doxygengroup:: ble_hrs
 
-.. _api_ble_hrs_central:
+.. _api_ble_hrs_client:
 
-Heart Rate Service Central
+Heart Rate Service Client
 ==========================
 
-.. doxygengroup:: ble_hrs_central
+.. doxygengroup:: ble_hrs_client
 
 .. _api_human_interface_device_service:
 

…s/bluetooth/services/ble_hrs_central.rst …es/bluetooth/services/ble_hrs_client.rstdoc/nrf-bm/libraries/bluetooth/services/ble_hrs_central.rst renamed to doc/nrf-bm/libraries/bluetooth/services/ble_hrs_client.rst doc/nrf-bm/libraries/bluetooth/services/ble_hrs_central.rst renamed to doc/nrf-bm/libraries/bluetooth/services/ble_hrs_client.rst

@@ -17,16 +17,16 @@ The HRS Client retrieves information such as the sensor location from a device t
 Configuration
 *************
 
-Set the :kconfig:option:`CONFIG_BLE_HRS_CENTRAL` Kconfig option to enable the service.
+Set the :kconfig:option:`CONFIG_BLE_HRS_CLIENT` Kconfig option to enable the service.
 
-Set the maximum number of RR intervals for each HRM notification using the :kconfig:option:`CONFIG_BLE_HRS_CENTRAL_RR_INTERVALS_MAX_COUNT` Kconfig option.
+Set the maximum number of RR intervals for each HRM notification using the :kconfig:option:`CONFIG_BLE_HRS_CLIENT_RR_INTERVALS_MAX_COUNT` Kconfig option.
 
 Initialization
 ==============
 
-The service instance is declared using the :c:macro:`BLE_HRS_CENTRAL_DEF` macro, specifying the name of the instance.
-To initialize the service, call the :c:func:`ble_hrs_central_init` function.
-See the :c:struct:`ble_hrs_central_config` structure for configuration details, in addition to the HRS specification.
+The service instance is declared using the :c:macro:`BLE_HRS_CLIENT_DEF` macro, specifying the name of the instance.
+To initialize the service, call the :c:func:`ble_hrs_client_init` function.
+See the :c:struct:`ble_hrs_client_config` structure for configuration details, in addition to the HRS specification.
 
 Usage
 *****
@@ -35,10 +35,10 @@ Applications can use the :ref:`lib_ble_scan` library for detecting advertising d
 
 Upon connection, the application can use the :ref:`lib_ble_db_discovery` library to discover the peer's database.
 Call the :c:func:`ble_hrs_on_db_disc_evt` function on callback events from the Database Discovery library.
-This function sends the :c:enumerator:`BLE_HRS_CENTRAL_EVT_DISCOVERY_COMPLETE` event to the application if the Heart Rate Service is discovered in the peer's database.
-The application must call the :c:func:`ble_hrs_central_handles_assign` function to associate the link with the HRS Client instance.
+This function sends the :c:enumerator:`BLE_HRS_CLIENT_EVT_DISCOVERY_COMPLETE` event to the application if the Heart Rate Service is discovered in the peer's database.
+The application must call the :c:func:`ble_hrs_client_handles_assign` function to associate the link with the HRS Client instance.
 
-Upon Heart Rate Service discovery, the application can call the :c:func:`ble_hrs_central_hrm_notif_enable` function to request the peer to start sending Heart Rate Measurement notifications.
+Upon Heart Rate Service discovery, the application can call the :c:func:`ble_hrs_client_hrm_notif_enable` function to request the peer to start sending Heart Rate Measurement notifications.
 
 Dependencies
 ************
@@ -54,7 +54,7 @@ The library is expected to be used with the :ref:`lib_ble_scan` |BMshort| librar
 API documentation
 *****************
 
-| Header file: :file:`include/bm/bluetooth/services/ble_hrs_central.h`
-| Source files: :file:`subsys/bluetooth/services/ble_hrs_central/`
+| Header file: :file:`include/bm/bluetooth/services/ble_hrs_client.h`
+| Source files: :file:`subsys/bluetooth/services/ble_hrs_client/`
 
-:ref:`Heart Rate Service API reference <api_ble_hrs_central>`
+:ref:`Heart Rate Service API reference <api_ble_hrs_client>`

doc/nrf-bm/release_notes/release_notes_1.0.0.rst

@@ -425,7 +425,7 @@ Bluetooth LE samples
 
   * :ref:`ble_radio_ntf_sample` sample.
   * :ref:`ble_bms_sample` sample.
-  * :ref:`ble_hrs_central_sample` sample.
+  * :ref:`ble_hrs_client_sample` sample.
 
 * Updated:
 

doc/nrf-bm/release_notes/release_notes_changelog.rst

@@ -87,7 +87,7 @@ No changes since the latest nRF Connect SDK Bare Metal release.
 Bluetooth LE samples
 --------------------
 
-No changes since the latest nRF Connect SDK Bare Metal release.
+* Renamed the ``ble_hrs_central`` sample to the :ref:`ble_hrs_client_sample` sample.
 
 NFC samples
 -----------

…/bm/bluetooth/services/ble_hrs_central.h …e/bm/bluetooth/services/ble_hrs_client.hinclude/bm/bluetooth/services/ble_hrs_central.h renamed to include/bm/bluetooth/services/ble_hrs_client.h include/bm/bluetooth/services/ble_hrs_central.h renamed to include/bm/bluetooth/services/ble_hrs_client.h

@@ -6,7 +6,7 @@
 /**
  * @file
  *
- * @defgroup ble_hrs_central Heart Rate Service Client
+ * @defgroup ble_hrs_client Heart Rate Service Client
  * @{
  * @brief    Heart Rate Service Client.
  *
@@ -23,8 +23,8 @@
  *           the application.
  */
 
-#ifndef BLE_HRS_CENTRAL_H__
-#define BLE_HRS_CENTRAL_H__
+#ifndef BLE_HRS_CLIENT_H__
+#define BLE_HRS_CLIENT_H__
 
 #include <stdint.h>
 #include <ble.h>
@@ -37,27 +37,27 @@ extern "C" {
 #endif
 
 /**
- * @brief Macro for defining a ble_hrs_central instance.
+ * @brief Macro for defining a ble_hrs_client instance.
  *
  * @param _name Name of the instance.
  * @hideinitializer
  */
-#define BLE_HRS_CENTRAL_DEF(_name)                                                                 \
-	static struct ble_hrs_central _name;                                                       \
-	NRF_SDH_BLE_OBSERVER(_name##_obs, ble_hrs_central_on_ble_evt, &_name, USER_LOW)
+#define BLE_HRS_CLIENT_DEF(_name)                                                                 \
+	static struct ble_hrs_client _name;                                                       \
+	NRF_SDH_BLE_OBSERVER(_name##_obs, ble_hrs_client_on_ble_evt, &_name, USER_LOW)
 
 /**
  * @brief HRS Client event type.
  */
-enum ble_hrs_central_evt_type {
+enum ble_hrs_client_evt_type {
 	/** Event indicating that the Heart Rate Service was discovered at the peer. */
-	BLE_HRS_CENTRAL_EVT_DISCOVERY_COMPLETE,
+	BLE_HRS_CLIENT_EVT_DISCOVERY_COMPLETE,
 	/** Event indicating that a notification of the Heart Rate Measurement characteristic was
 	 *  received from the peer.
 	 */
-	BLE_HRS_CENTRAL_EVT_HRM_NOTIFICATION,
+	BLE_HRS_CLIENT_EVT_HRM_NOTIFICATION,
 	/** Error. */
-	BLE_HRS_CENTRAL_EVT_ERROR,
+	BLE_HRS_CLIENT_EVT_ERROR,
 };
 
 /**
@@ -69,7 +69,7 @@ struct ble_hrm {
 	/** Number of RR intervals. */
 	uint8_t rr_intervals_cnt;
 	/** RR intervals. */
-	uint16_t rr_intervals[CONFIG_BLE_HRS_CENTRAL_RR_INTERVALS_MAX_COUNT];
+	uint16_t rr_intervals[CONFIG_BLE_HRS_CLIENT_RR_INTERVALS_MAX_COUNT];
 };
 
 /**
@@ -85,22 +85,22 @@ struct hrs_db {
 /**
  * @brief Heart Rate Event.
  */
-struct ble_hrs_central_evt {
+struct ble_hrs_client_evt {
 	/** Type of the event. */
-	enum ble_hrs_central_evt_type evt_type;
+	enum ble_hrs_client_evt_type evt_type;
 	/** Connection handle on which the Heart Rate service was discovered on the peer device. */
 	uint16_t conn_handle;
 	union {
 		/** Handles related to the Heart Rate, found on the peer device.
-		 *  This is filled if the evt_type is @ref BLE_HRS_CENTRAL_EVT_DISCOVERY_COMPLETE.
+		 *  This is filled if the evt_type is @ref BLE_HRS_CLIENT_EVT_DISCOVERY_COMPLETE.
 		 */
 		struct hrs_db peer_db;
 		/** Heart Rate Measurement received. This is filled if the evt_type
-		 *  is @ref BLE_HRS_CENTRAL_EVT_HRM_NOTIFICATION.
+		 *  is @ref BLE_HRS_CLIENT_EVT_HRM_NOTIFICATION.
 		 */
 		struct ble_hrm hrm;
 		/** Error event. This is filled if the evt_type
-		 *  is @ref BLE_HRS_CENTRAL_EVT_ERROR.
+		 *  is @ref BLE_HRS_CLIENT_EVT_ERROR.
 		 */
 		struct {
 			/** Error reason */
@@ -110,41 +110,41 @@ struct ble_hrs_central_evt {
 };
 
 /** Forward declaration. */
-struct ble_hrs_central;
+struct ble_hrs_client;
 
 /**
  * @brief Event handler type.
  *
  * @details This is the type of the event handler that is to be provided by the application
  *          of this module to receive events.
  */
-typedef void (*ble_hrs_central_evt_handler_t)(struct ble_hrs_central *ble_hrs_central,
-					      struct ble_hrs_central_evt *evt);
+typedef void (*ble_hrs_client_evt_handler_t)(struct ble_hrs_client *ble_hrs_client,
+					      struct ble_hrs_client_evt *evt);
 
 /**
  * @brief Heart Rate Client.
  */
-struct ble_hrs_central {
+struct ble_hrs_client {
 	/** Connection handle, as provided by the SoftDevice. */
 	uint16_t conn_handle;
 	/** Handles related to HRS on the peer. */
 	struct hrs_db peer_hrs_db;
 	/** Application event handler to be called when there
 	 *  is an event related to the Heart Rate Service.
 	 */
-	ble_hrs_central_evt_handler_t evt_handler;
+	ble_hrs_client_evt_handler_t evt_handler;
 	/** Bluetooth LE GATT Queue instance. */
 	const struct ble_gq *gatt_queue;
 };
 
 /**
  * @brief Heart Rate Client configuration structure.
  */
-struct ble_hrs_central_config {
+struct ble_hrs_client_config {
 	/** Event handler to be called by the Heart Rate Client module when
 	 *  there is an event related to the Heart Rate Service.
 	 */
-	ble_hrs_central_evt_handler_t evt_handler;
+	ble_hrs_client_evt_handler_t evt_handler;
 	/** Bluetooth LE GATT Queue instance. */
 	const struct ble_gq *gatt_queue;
 	/** Database discovery instance. */
@@ -158,15 +158,15 @@ struct ble_hrs_central_config {
  *          The module looks for the presence of a Heart Rate Service instance at the peer
  *          when a discovery is started.
  *
- * @param[in] ble_hrs_central Heart Rate Client structure.
- * @param[in] ble_hrs_central_config Heart rate service central configuration.
+ * @param[in] ble_hrs_client Heart Rate Client structure.
+ * @param[in] ble_hrs_client_config Heart rate service client configuration.
  *
  * @retval NRF_SUCCESS On successful initialization.
  * @return Otherwise, this function propagates the error code returned by the
  *         Database Discovery module API @ref ble_db_discovery_service_register.
  */
-uint32_t ble_hrs_central_init(struct ble_hrs_central *ble_hrs_central,
-			      struct ble_hrs_central_config *ble_hrs_central_config);
+uint32_t ble_hrs_client_init(struct ble_hrs_client *ble_hrs_client,
+			      struct ble_hrs_client_config *ble_hrs_client_config);
 
 /**
  * @brief Handle Bluetooth LE events from the SoftDevice.
@@ -179,20 +179,20 @@ uint32_t ble_hrs_central_init(struct ble_hrs_central *ble_hrs_central,
  * @param[in] ble_evt Bluetooth LE event.
  * @param[in] ctx Heart Rate Client structure.
  */
-void ble_hrs_central_on_ble_evt(const ble_evt_t *ble_evt, void *ctx);
+void ble_hrs_client_on_ble_evt(const ble_evt_t *ble_evt, void *ctx);
 
 /**
  * @brief Request the peer to start sending notification of Heart Rate Measurement.
  *
  * @details This function enables notification of the Heart Rate Measurement at the peer
  *          by writing to the CCCD of the Heart Rate Measurement characteristic.
  *
- * @param ble_hrs_central Heart Rate Client structure.
+ * @param ble_hrs_client Heart Rate Client structure.
  *
  * @retval NRF_SUCCESS If the SoftDevice is requested to write to the CCCD of the peer.
  * @return Error code returned  by the SoftDevice API @ref sd_ble_gattc_write.
  */
-uint32_t ble_hrs_central_hrm_notif_enable(struct ble_hrs_central *ble_hrs_central);
+uint32_t ble_hrs_client_hrm_notif_enable(struct ble_hrs_client *ble_hrs_client);
 
 /**
  * @brief Handle events from the Database Discovery module.
@@ -204,12 +204,12 @@ uint32_t ble_hrs_central_hrm_notif_enable(struct ble_hrs_central *ble_hrs_centra
  *          Service was discovered at the peer. The function also populates the event with
  *          service-related information before providing it to the application.
  *
- * @param[in] ble_hrs_central Heart Rate Client structure instance for
+ * @param[in] ble_hrs_client Heart Rate Client structure instance for
  * associating the link.
  * @param[in] evt Event received from the Database Discovery module.
  *
  */
-void ble_hrs_on_db_disc_evt(struct ble_hrs_central *ble_hrs_central,
+void ble_hrs_on_db_disc_evt(struct ble_hrs_client *ble_hrs_client,
 			    const struct ble_db_discovery_evt *evt);
 
 /**
@@ -219,23 +219,23 @@ void ble_hrs_on_db_disc_evt(struct ble_hrs_central *ble_hrs_central,
  *          associate the link to this instance of the module. This association makes it
  *          possible to handle several links and associate each link to a particular
  *          instance of this module. The connection handle and attribute handles are
- *          provided from the discovery event @ref BLE_HRS_CENTRAL_EVT_DISCOVERY_COMPLETE.
+ *          provided from the discovery event @ref BLE_HRS_CLIENT_EVT_DISCOVERY_COMPLETE.
  *
- * @param[in] ble_hrs_central Heart Rate Client structure instance for
+ * @param[in] ble_hrs_client Heart Rate Client structure instance for
  * associating the link.
  * @param[in] conn_handle Connection handle to associate with the given Heart Rate
  * Client Instance.
  * @param[in] peer_hrs_handles Attribute handles for the HRS server you want this HRS_C
  * client to interact with.
  */
-uint32_t ble_hrs_central_handles_assign(struct ble_hrs_central *ble_hrs_central,
+uint32_t ble_hrs_client_handles_assign(struct ble_hrs_client *ble_hrs_client,
 					uint16_t conn_handle,
 					const struct hrs_db *peer_hrs_handles);
 
 #ifdef __cplusplus
 }
 #endif
 
-#endif /* BLE_HRS_CENTRAL_H__ */
+#endif /* BLE_HRS_CLIENT_H__ */
 
 /** @} */

…bluetooth/ble_hrs_central/CMakeLists.txt …/bluetooth/ble_hrs_client/CMakeLists.txtsamples/bluetooth/ble_hrs_central/CMakeLists.txt renamed to samples/bluetooth/ble_hrs_client/CMakeLists.txt samples/bluetooth/ble_hrs_central/CMakeLists.txt renamed to samples/bluetooth/ble_hrs_client/CMakeLists.txt

@@ -7,6 +7,6 @@
 cmake_minimum_required(VERSION 3.20.0)
 
 find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
-project(ble_hrs_central)
+project(ble_hrs_client)
 
 target_sources(app PRIVATE src/main.c)

samples/bluetooth/ble_hrs_central/Kconfig samples/bluetooth/ble_hrs_client/Kconfigsamples/bluetooth/ble_hrs_central/Kconfig renamed to samples/bluetooth/ble_hrs_client/Kconfig

@@ -4,7 +4,7 @@
 # SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
 #
 
-menu "BLE HRS central sample"
+menu "BLE HRS client sample"
 
 config APP_USE_TARGET_PERIPHERAL_NAME
 	bool "Use target peripheral name"
@@ -30,10 +30,10 @@ config APP_TARGET_PERIPHERAL_ADDR
 
 endif # APP_USE_TARGET_PERIPHERAL_ADDR
 
-module=APP_BLE_HRS_CENTRAL_SAMPLE
-module-str=BLE Heart Rate Central Service Sample
+module=APP_BLE_HRS_CLIENT_SAMPLE
+module-str=BLE Heart Rate Client Service Sample
 source "$(ZEPHYR_BASE)/subsys/logging/Kconfig.template.log_config"
 
-endmenu # "BLE HRS central sample"
+endmenu # "BLE HRS client sample"
 
 source "Kconfig.zephyr"

…les/bluetooth/ble_hrs_central/README.rst …ples/bluetooth/ble_hrs_client/README.rstsamples/bluetooth/ble_hrs_central/README.rst renamed to samples/bluetooth/ble_hrs_client/README.rst samples/bluetooth/ble_hrs_central/README.rst renamed to samples/bluetooth/ble_hrs_client/README.rst

@@ -1,13 +1,13 @@
-.. _ble_hrs_central_sample:
+.. _ble_hrs_client_sample:
 
-Bluetooth: Heart Rate Service Central
-#####################################
+Bluetooth: Heart Rate Service Client
+####################################
 
 .. contents::
    :local:
    :depth: 2
 
-The Heart Rate Service Central sample demonstrates how you can implement the Heart Rate profile as a central using |BMlong|.
+The Heart Rate Service Client sample demonstrates how you can implement the Heart Rate profile as a client using |BMlong|.
 
 Requirements
 ************
@@ -71,12 +71,12 @@ This sample scans for devices that advertise with the :ref:`lib_ble_service_hrs`
 When a device is connected, the sample starts the service discovery procedure.
 If this succeeds, the sample subscribes to the Heart Rate Measurement characteristic to receive heart rate notifications.
 
-.. _ble_hrs_central_sample_testing:
+.. _ble_hrs_client_sample_testing:
 
 Building and running
 ********************
 
-This sample can be found under :file:`samples/bluetooth/ble_hrs_central/` in the |BMshort| folder structure.
+This sample can be found under :file:`samples/bluetooth/ble_hrs_client/` in the |BMshort| folder structure.
 
 For details on how to create, configure, and program a sample, see :ref:`getting_started_with_the_samples`.
 
@@ -88,7 +88,7 @@ This sample requires two devices to test, one running this sample and another on
 Complete the following steps to test the sample:
 
 1. Compile and program the application.
-#. In the Serial Terminal, observe that the ``BLE HRS Central sample started`` message is printed.
+#. In the Serial Terminal, observe that the ``BLE HRS Client sample started`` message is printed.
 #. Program the other development kit with the :ref:`ble_hrs_sample` sample and reset it.
 #. Observe that the ``Scan filter match`` message is printed, followed by ``Connecting to target`` and ``Connected``.
 #. Observe that the ``Heart rate service discovered.`` message is printed.

…mples/bluetooth/ble_hrs_central/prj.conf samples/bluetooth/ble_hrs_client/prj.confsamples/bluetooth/ble_hrs_central/prj.conf renamed to samples/bluetooth/ble_hrs_client/prj.conf samples/bluetooth/ble_hrs_central/prj.conf renamed to samples/bluetooth/ble_hrs_client/prj.conf

@@ -14,7 +14,7 @@ CONFIG_MBEDTLS_PSA_CRYPTO_C=y
 CONFIG_PSA_WANT_GENERATE_RANDOM=y
 
 # BLE Heart rate client
-CONFIG_BLE_HRS_CENTRAL=y
+CONFIG_BLE_HRS_CLIENT=y
 
 # BLE connection parameter
 CONFIG_BLE_CONN_PARAMS=y