michaelh/zephyr
1
0
Fork 0
Code Releases Activity

samples: mesh: nrf52: corrected state Binding for Delta Level

Browse source 
Now if transition (instantaneous or non-instantaneous) is due
to delta level, then state binding would be as per it.

This is as per 3.3.2.2.3 of Bluetooth Mesh Model
Specification.

Signed-off-by: Vikrant More <vikrant8051@gmail.com>
This commit is contained in:
Vikrant More 2018-09-04 16:19:57 +05:30 • committed by Johan Hedberg
commit 09e2cf3db0
1 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

10
samples/boards/nrf52/mesh/onoff_level_lighting_vnd_app/src/mesh/transition.c
View file

@ -359,14 +359,18 @@ static void onoff_work_handler(struct k_work *work)
static void level_lightness_work_handler(struct k_work *work) static void level_lightness_work_handler(struct k_work *work)
{ {
u8_t level;
struct generic_level_state *state = &gen_level_srv_root_user_data; struct generic_level_state *state = &gen_level_srv_root_user_data;
switch (enable_transition) { switch (enable_transition) {
case LEVEL_TT: case LEVEL_TT:
level = LEVEL;
break; break;
case LEVEL_TT_DELTA: case LEVEL_TT_DELTA:
level = DELTA_LEVEL;
break; break;
case LEVEL_TT_MOVE: case LEVEL_TT_MOVE:
level = LEVEL;
break; break;
default: default:
k_timer_stop(&level_lightness_transition_timer); k_timer_stop(&level_lightness_transition_timer);
@ -377,7 +381,7 @@ static void level_lightness_work_handler(struct k_work *work)
state->is_new_transition_start = false; state->is_new_transition_start = false;
if (state->tt_counter == 0) { if (state->tt_counter == 0) {
state_binding(LEVEL, IGNORE_TEMP); state_binding(level, IGNORE_TEMP);
update_light_state(); update_light_state();
k_timer_stop(&level_lightness_transition_timer); k_timer_stop(&level_lightness_transition_timer);
@ -393,14 +397,14 @@ static void level_lightness_work_handler(struct k_work *work)
state->level -= state->tt_delta; state->level -= state->tt_delta;
state_binding(LEVEL, IGNORE_TEMP); state_binding(level, IGNORE_TEMP);
update_light_state(); update_light_state();
} }
if (state->tt_counter == 0) { if (state->tt_counter == 0) {
state->level = state->target_level; state->level = state->target_level;
state_binding(LEVEL, IGNORE_TEMP); state_binding(level, IGNORE_TEMP);
update_light_state(); update_light_state();
k_timer_stop(&level_lightness_transition_timer); k_timer_stop(&level_lightness_transition_timer);