Skip to content

samples: bluetooth: mesh: add poll toggle to sensor cli #24617

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

samples: bluetooth: mesh: add poll toggle to sensor cli #24617

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions doc/nrf/releases_and_maturity/releases/release-notes-changelog.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -316,6 +316,8 @@ Bluetooth Mesh samples

* :ref:`bluetooth_mesh_sensor_client` sample:

* Added polling toggle to **Button 1** (**Button 0** on nRF54 DKs) to start/stop the periodic Sensor Get loop, ensuring the functionality is available on all supported devices including single-button hardware.

* Updated:

* To demonstrate the Bluetooth :ref:`ug_bt_mesh_nlc` HVAC Integration profile.
Expand All @@ -326,6 +328,10 @@ Bluetooth Mesh samples
* :ref:`bluetooth_mesh_sensor_server`
* :ref:`bluetooth_mesh_sensor_client`

* Button functions.
Assignments are shifted down one index to accommodate the new polling toggle.
The descriptor action has been removed from button actions but is still available through mesh shell commands.

Bluetooth Fast Pair samples
---------------------------

Expand Down
14 changes: 7 additions & 7 deletions samples/bluetooth/mesh/sensor_client/README.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ The models are used for the following purposes:
* Sensor Client gets sensor data from one or more :ref:`Sensor Servers <bt_mesh_sensor_srv_readme>`.

The model handling is implemented in :file:`src/model_handler.c`.
A :c:struct:`k_work_delayable` item is submitted recursively to periodically request sensor data.
Sensor data can be periodically requested using a :c:struct:`k_work_delayable` loop, which can be started and stopped with a button press.

User interface
**************
Expand All @@ -102,27 +102,27 @@ Once the provisioning procedure has completed, the buttons will have the followi
.. group-tab:: nRF21 and nRF52 DKs

Button 1:
Sends a get message for the :c:var:`bt_mesh_sensor_dev_op_temp_range_spec` setting of the :c:var:`bt_mesh_sensor_present_dev_op_temp` sensor.
Toggles the periodic Sensor Get data loop on/off.

Button 2:
Sends a set message for the :c:var:`bt_mesh_sensor_dev_op_temp_range_spec` setting of the :c:var:`bt_mesh_sensor_present_dev_op_temp` sensor, switching between the ranges specified in the :c:var:`temp_ranges` variable.
Sends a get message for the :c:var:`bt_mesh_sensor_dev_op_temp_range_spec` setting of the :c:var:`bt_mesh_sensor_present_dev_op_temp` sensor.

Button 3:
Sends a get message for a descriptor, requesting information about the :c:var:`bt_mesh_sensor_present_dev_op_temp` sensor.
Sends a set message for the :c:var:`bt_mesh_sensor_dev_op_temp_range_spec` setting of the :c:var:`bt_mesh_sensor_present_dev_op_temp` sensor, switching between the ranges specified in the :c:var:`temp_ranges` variable.

Button 4:
Sends a set message for the :c:var:`bt_mesh_sensor_motion_threshold` setting of the :c:var:`bt_mesh_sensor_presence_detected` sensor, switching between the ranges specified in the :c:var:`presence_motion_threshold` variable.

.. group-tab:: nRF54 DKs

Button 0:
Sends a get message for the :c:var:`bt_mesh_sensor_dev_op_temp_range_spec` setting of the :c:var:`bt_mesh_sensor_present_dev_op_temp` sensor.
Toggles the periodic Sensor Get loop (start/stop).

Button 1:
Sends a set message for the :c:var:`bt_mesh_sensor_dev_op_temp_range_spec` setting of the :c:var:`bt_mesh_sensor_present_dev_op_temp` sensor, switching between the ranges specified in the :c:var:`temp_ranges` variable.
Sends a get message for the :c:var:`bt_mesh_sensor_dev_op_temp_range_spec` setting of the :c:var:`bt_mesh_sensor_present_dev_op_temp` sensor.

Button 2:
Sends a get message for a descriptor, requesting information about the :c:var:`bt_mesh_sensor_present_dev_op_temp` sensor.
Sends a set message for the :c:var:`bt_mesh_sensor_dev_op_temp_range_spec` setting of the :c:var:`bt_mesh_sensor_present_dev_op_temp` sensor, switching between the ranges specified in the :c:var:`temp_ranges` variable.

Button 3:
Sends a set message for the :c:var:`bt_mesh_sensor_motion_threshold` setting of the :c:var:`bt_mesh_sensor_presence_detected` sensor, switching between the ranges specified in the :c:var:`presence_motion_threshold` variable.
Expand Down
31 changes: 22 additions & 9 deletions samples/bluetooth/mesh/sensor_client/src/model_handler.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,9 +165,27 @@ static const struct bt_mesh_comp2 comp_p2 = {
#endif

static struct k_work_delayable get_data_work;
static bool poll_active;

static void poll_toggle(void)
{
if (poll_active) {
poll_active = false;
k_work_cancel_delayable(&get_data_work);
printk("Sensor polling stopped\n");
} else {
poll_active = true;
k_work_schedule(&get_data_work, K_NO_WAIT);
printk("Sensor polling started\n");
}
}

static void get_data(struct k_work *work)
{
if (!poll_active) {
return;
}

if (!bt_mesh_is_provisioned()) {
k_work_schedule(&get_data_work, K_MSEC(GET_DATA_INTERVAL));
return;
Expand Down Expand Up @@ -278,14 +296,17 @@ static void button_handler_cb(uint32_t pressed, uint32_t changed)
int err;

if (pressed & changed & BIT(0)) {
poll_toggle();
}
if (pressed & changed & BIT(1)) {
err = bt_mesh_sensor_cli_setting_get(&sensor_cli, NULL,
&bt_mesh_sensor_present_dev_op_temp,
&bt_mesh_sensor_dev_op_temp_range_spec, NULL);
if (err) {
printk("Error getting range setting (%d)\n", err);
}
}
if (pressed & changed & BIT(1)) {
if (pressed & changed & BIT(2)) {
err = setting_set_int(&bt_mesh_sensor_present_dev_op_temp,
&bt_mesh_sensor_dev_op_temp_range_spec,
temp_ranges[temp_idx++]);
Expand All @@ -294,13 +315,6 @@ static void button_handler_cb(uint32_t pressed, uint32_t changed)
}
temp_idx = temp_idx % ARRAY_SIZE(temp_ranges);
}
if (pressed & changed & BIT(2)) {
err = bt_mesh_sensor_cli_desc_get(&sensor_cli, NULL,
&bt_mesh_sensor_present_dev_op_temp, NULL);
if (err) {
printk("Error getting sensor descriptor (%d)\n", err);
}
}
if (pressed & changed & BIT(3)) {
err = setting_set_int(&bt_mesh_sensor_presence_detected,
&bt_mesh_sensor_motion_threshold,
Expand Down Expand Up @@ -391,7 +405,6 @@ const struct bt_mesh_comp *model_handler_init(void)
k_work_init_delayable(&motion_timeout_work, motion_timeout);

dk_button_handler_add(&button_handler);
k_work_schedule(&get_data_work, K_MSEC(GET_DATA_INTERVAL));

return &comp;
}