Bluetooth: Mesh: Fix dim to dark behavior #12506

ludvigsj · 2023-10-03T13:04:03Z

Fixes issues with Move Set and Delta Set handlers not
handling dimming starting from 0 correctly.

Clamp targets to 0 when dimming down from 0, instead of clamping to
RANGE_MIN, to avoid a message requesting a dim down causing the light
to actually turn on.
Take the gap between 0 and RANGE_MIN into account when computing the
transition time for a move set before this is sent to the application
callback, to avoid a slow transition for dims starting at 0
Update the samples and tester to correctly transition the
lightness state when dimming up from zero when a RANGE_MIN is set.
Update the documentation for the callback to mention this
requirement.
Small bug fixes
- Range converted to actual in delta set to match with the delta and
  target_actual
- Do not compute transition in move set if target == current

NordicBuilder · 2023-10-03T13:07:29Z

Test specification

CI/Jenkins/NRF

Integration Platforms

CI/Jenkins/integration

Test Module	File based changes	Manually selected	West overwrite
test-fw-nrfconnect-ble_mesh	X

Detailed information of selected test modules

Note: This message is automatically posted and updated by the CI

NordicBuilder · 2023-10-03T14:22:57Z

You can find the documentation preview for this PR at this link. It will be updated about 10 minutes after the documentation build succeeds.

Note: This comment is automatically posted by the Documentation Publishing GitHub Action.

tests/bluetooth/tester/src/model_handler.c

subsys/bluetooth/mesh/lightness_srv.c

ludvigsj · 2023-10-04T10:47:14Z

There is an ongoing discussion for specs about the expected behavior here, will leave this PR DNM until discussion about specs is done

mia-ko · 2023-10-04T10:22:39Z

include/bluetooth/mesh/lightness_srv.h

+	 * When performing a non-instantaneous state change, the applicaton must call
+	 * @ref bt_mesh_lightness_start_value. The change must move instantaneously to the start
+	 * value returned by this function and start gradually changing from that point over the
+	 * time specified by the transition.


Suggested change

* When performing a non-instantaneous state change, the applicaton must call

* @ref bt_mesh_lightness_start_value. The change must move instantaneously to the start

* value returned by this function and start gradually changing from that point over the

* time specified by the transition.

* When performing a non-instantaneous state change, the applicaton must call

* @ref bt_mesh_lightness_start_value. The change must move instantaneously

* to the start value returned by this function, and then gradually change from

* that value over time specified by the transition.

mia-ko · 2023-10-04T10:37:08Z

include/bluetooth/mesh/lightness_srv.h

+/** @brief Get the starting point for a non-instantaneous change in lightness.
+ *
+ * When performing a non-instantaneous change of the lightness state, the change
+ * should immediately jump to this starting value and then start gradually changing.


Suggested change

* should immediately jump to this starting value and then start gradually changing.

* should immediately jump to this starting value and then gradually start changing.

mia-ko · 2023-10-04T10:43:26Z

subsys/bluetooth/mesh/lightness_srv.c

+		/* Do not clamp to range when dimming down from zero, to avoid
+		 * a dim down to cause the light to turn on.


Suggested change

/* Do not clamp to range when dimming down from zero, to avoid

* a dim down to cause the light to turn on.

/* Do not clamp to range when dimming down from zero to avoid

* the light to turn on when dimmed down.

mia-ko · 2023-10-04T10:45:59Z

subsys/bluetooth/mesh/lightness_srv.c

+		/* Clamp the value to the lightness range to prevent it be moved
+		 * back to zero in binding with Generic Level state.


Suggested change

/* Clamp the value to the lightness range to prevent it be moved

* back to zero in binding with Generic Level state.

/* Clamp the value to the lightness range to prevent that it moves

* back to zero in binding with Generic Level state.

This commit fixes issues with Move Set and Delta Set handlers not handling dimming starting from 0 correctly. * Clamp targets to 0 when dimming down from 0, instead of clamping to RANGE_MIN, to avoid a message requesting a dim down causing the light to actually turn on. * Take the gap between 0 and RANGE_MIN into account when computing the transition time for a move set before this is sent to the application callback, to avoid a slow transition for dims starting at 0 * Small bug fixes * Range converted to actual in delta set to match with the delta and target_actual * Do not compute transition in move set if target == current Signed-off-by: Ludvig Samuelsen Jordet <[email protected]>

This updates the samples and tester to correctly transition the lightness state when dimming up from zero when a RANGE_MIN is set. It also updates the documentation for the callback to mention this requirement. Signed-off-by: Ludvig Samuelsen Jordet <[email protected]>

ludvigsj requested a review from carlescufi as a code owner October 3, 2023 13:04

github-actions bot added ble mesh Label for ble mesh PRbot. Add this if PR is related to ble mesh and you need to get review. changelog-entry-required Update changelog before merge. Remove label if entry is not needed or already added. labels Oct 3, 2023

ludvigsj force-pushed the develop/NCSDK-23472_Dim_to_dark branch from 2f01e4b to 51bdc9f Compare October 3, 2023 13:10

ludvigsj changed the title ~~Develop/ncsdk 23472 dim to dark~~ Bluetooth: Mesh: Fix dim to dark behavior Oct 3, 2023

ludvigsj force-pushed the develop/NCSDK-23472_Dim_to_dark branch from 51bdc9f to 2712d9b Compare October 3, 2023 13:43

ludvigsj added the doc-required PR must not be merged without tech writer approval. label Oct 3, 2023

ludvigsj requested a review from mia-ko October 3, 2023 13:44

PavelVPV reviewed Oct 3, 2023

View reviewed changes

tests/bluetooth/tester/src/model_handler.c Outdated Show resolved Hide resolved

subsys/bluetooth/mesh/lightness_srv.c Outdated Show resolved Hide resolved

ludvigsj force-pushed the develop/NCSDK-23472_Dim_to_dark branch from 2712d9b to 19765fc Compare October 4, 2023 07:30

github-actions bot removed the doc-required PR must not be merged without tech writer approval. label Oct 4, 2023

ludvigsj requested a review from PavelVPV October 4, 2023 07:31

PavelVPV approved these changes Oct 4, 2023

View reviewed changes

ludvigsj added the DNM label Oct 4, 2023

mia-ko requested changes Oct 4, 2023

View reviewed changes

ludvigsj force-pushed the develop/NCSDK-23472_Dim_to_dark branch from 19765fc to a408ae7 Compare October 10, 2023 11:26

ludvigsj requested review from mia-ko and PavelVPV October 10, 2023 11:27

ludvigsj added 2 commits October 10, 2023 13:33

ludvigsj force-pushed the develop/NCSDK-23472_Dim_to_dark branch from a408ae7 to 4910bdf Compare October 10, 2023 11:34

ludvigsj added this to the 2.5.0 milestone Oct 10, 2023

ludvigsj removed the DNM label Oct 10, 2023

mia-ko approved these changes Oct 10, 2023

View reviewed changes

PavelVPV approved these changes Oct 10, 2023

View reviewed changes

rlubos merged commit 6976648 into nrfconnect:main Oct 10, 2023
14 of 15 checks passed

ludvigsj deleted the develop/NCSDK-23472_Dim_to_dark branch April 18, 2024 08:58

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Bluetooth: Mesh: Fix dim to dark behavior #12506

Bluetooth: Mesh: Fix dim to dark behavior #12506

ludvigsj commented Oct 3, 2023

NordicBuilder commented Oct 3, 2023 •

edited

Loading

NordicBuilder commented Oct 3, 2023

ludvigsj commented Oct 4, 2023

mia-ko Oct 4, 2023

mia-ko Oct 4, 2023

mia-ko Oct 4, 2023

mia-ko Oct 4, 2023

	* should immediately jump to this starting value and then start gradually changing.
	* should immediately jump to this starting value and then gradually start changing.

		/* Do not clamp to range when dimming down from zero, to avoid
		* a dim down to cause the light to turn on.

		/* Clamp the value to the lightness range to prevent it be moved
		* back to zero in binding with Generic Level state.

Bluetooth: Mesh: Fix dim to dark behavior #12506

Bluetooth: Mesh: Fix dim to dark behavior #12506

Conversation

ludvigsj commented Oct 3, 2023

NordicBuilder commented Oct 3, 2023 • edited Loading

Test specification

CI/Jenkins/NRF

CI/Jenkins/integration

NordicBuilder commented Oct 3, 2023

ludvigsj commented Oct 4, 2023

mia-ko Oct 4, 2023

Choose a reason for hiding this comment

mia-ko Oct 4, 2023

Choose a reason for hiding this comment

mia-ko Oct 4, 2023

Choose a reason for hiding this comment

mia-ko Oct 4, 2023

Choose a reason for hiding this comment

NordicBuilder commented Oct 3, 2023 •

edited

Loading