Skip to content

Commit

Permalink
samples: mesh: corrected implemenation of gen. move message handlers
Browse files Browse the repository at this point in the history 
After receiving Generic Level Move set/set_unack message, generic
level state should move towards positive or negative extreme end
(which is depend upon sign of delta value) till it not get interruped.
This commit has introduced this feature.

Signed-off-by: Vikrant More <vikrant8051@gmail.com>
  • Loading branch information
@vikrant8052 @jhedberg
vikrant8052 authored and jhedberg committed May 10, 2019
1 parent 36a6ada commit 0cf1991
Show file tree
Hide file tree
Showing 3 changed files with 160 additions and 104 deletions.
168 changes: 71 additions & 97 deletions samples/boards/nrf52/mesh/onoff_level_lighting_vnd_app/src/mesh/device_composition.c
View file
Expand Up @@ -209,6 +209,7 @@ static void gen_onoff_set_unack(struct bt_mesh_model *model,
state->target_onoff = onoff;
state->transition->tt = tt;
state->transition->delay = delay;
state->transition->type = ONOFF_TT;

if (state->target_onoff != state->onoff) {
onoff_tt_values(state);
Expand Down Expand Up @@ -283,6 +284,7 @@ static void gen_onoff_set(struct bt_mesh_model *model,
state->target_onoff = onoff;
state->transition->tt = tt;
state->transition->delay = delay;
state->transition->type = ONOFF_TT;

if (state->target_onoff != state->onoff) {
onoff_tt_values(state);
Expand Down Expand Up @@ -338,9 +340,15 @@ static void gen_level_get(struct bt_mesh_model *model,
}

if (state->transition->counter) {
calculate_rt(state->transition);
net_buf_simple_add_le16(msg, state->target_level);
net_buf_simple_add_u8(msg, state->transition->rt);
if (state->transition->type == LEVEL_TT_MOVE ||
state->transition->type == LEVEL_TEMP_TT_MOVE) {
net_buf_simple_add_le16(msg, state->target_level);
net_buf_simple_add_u8(msg, UNKNOWN_VALUE);
} else {
calculate_rt(state->transition);
net_buf_simple_add_le16(msg, state->target_level);
net_buf_simple_add_u8(msg, state->transition->rt);
}
}

send:
Expand All @@ -367,9 +375,15 @@ void gen_level_publish(struct bt_mesh_model *model)
}

if (state->transition->counter) {
calculate_rt(state->transition);
net_buf_simple_add_le16(msg, state->target_level);
net_buf_simple_add_u8(msg, state->transition->rt);
if (state->transition->type == LEVEL_TT_MOVE ||
state->transition->type == LEVEL_TEMP_TT_MOVE) {
net_buf_simple_add_le16(msg, state->target_level);
net_buf_simple_add_u8(msg, UNKNOWN_VALUE);
} else {
calculate_rt(state->transition);
net_buf_simple_add_le16(msg, state->target_level);
net_buf_simple_add_u8(msg, state->transition->rt);
}
}

publish:
Expand Down Expand Up @@ -426,6 +440,7 @@ static void gen_level_set_unack(struct bt_mesh_model *model,
state->target_level = level;
state->transition->tt = tt;
state->transition->delay = delay;
state->transition->type = UNKNOWN_TT;

if (state->target_level != state->level) {
level_tt_values(state);
Expand All @@ -444,11 +459,11 @@ static void gen_level_set_unack(struct bt_mesh_model *model,

if (bt_mesh_model_elem(model)->addr == elements[0].addr) {
/* Root element */
transition_type = LEVEL_TT;
state->transition->type = LEVEL_TT;
level_lightness_handler(state);
} else if (bt_mesh_model_elem(model)->addr == elements[1].addr) {
/* Secondary element */
transition_type = LEVEL_TEMP_TT;
state->transition->type = LEVEL_TEMP_TT;
level_temp_handler(state);
}
}
Expand Down Expand Up @@ -501,6 +516,7 @@ static void gen_level_set(struct bt_mesh_model *model,
state->target_level = level;
state->transition->tt = tt;
state->transition->delay = delay;
state->transition->type = UNKNOWN_TT;

if (state->target_level != state->level) {
level_tt_values(state);
Expand All @@ -521,11 +537,11 @@ static void gen_level_set(struct bt_mesh_model *model,

if (bt_mesh_model_elem(model)->addr == elements[0].addr) {
/* Root element */
transition_type = LEVEL_TT;
state->transition->type = LEVEL_TT;
level_lightness_handler(state);
} else if (bt_mesh_model_elem(model)->addr == elements[1].addr) {
/* Secondary element */
transition_type = LEVEL_TEMP_TT;
state->transition->type = LEVEL_TEMP_TT;
level_temp_handler(state);
}
}
Expand Down Expand Up @@ -593,6 +609,7 @@ static void gen_delta_set_unack(struct bt_mesh_model *model,
state->target_level = tmp32;
state->transition->tt = tt;
state->transition->delay = delay;
state->transition->type = UNKNOWN_TT;

if (state->target_level != state->level) {
level_tt_values(state);
Expand All @@ -611,12 +628,11 @@ static void gen_delta_set_unack(struct bt_mesh_model *model,

if (bt_mesh_model_elem(model)->addr == elements[0].addr) {
/* Root element */
transition_type = LEVEL_TT_DELTA;
state->transition->type = LEVEL_TT_DELTA;
level_lightness_handler(state);
} else if (bt_mesh_model_elem(model)->addr ==
elements[1].addr) {
} else if (bt_mesh_model_elem(model)->addr == elements[1].addr) {
/* Secondary element */
transition_type = LEVEL_TEMP_TT_DELTA;
state->transition->type = LEVEL_TEMP_TT_DELTA;
level_temp_handler(state);
}
}
Expand Down Expand Up @@ -685,6 +701,7 @@ static void gen_delta_set(struct bt_mesh_model *model,
state->target_level = tmp32;
state->transition->tt = tt;
state->transition->delay = delay;
state->transition->type = UNKNOWN_TT;

if (state->target_level != state->level) {
level_tt_values(state);
Expand All @@ -705,76 +722,21 @@ static void gen_delta_set(struct bt_mesh_model *model,

if (bt_mesh_model_elem(model)->addr == elements[0].addr) {
/* Root element */
transition_type = LEVEL_TT_DELTA;
state->transition->type = LEVEL_TT_DELTA;
level_lightness_handler(state);
} else if (bt_mesh_model_elem(model)->addr == elements[1].addr) {
/* Secondary element */
transition_type = LEVEL_TEMP_TT_DELTA;
state->transition->type = LEVEL_TEMP_TT_DELTA;
level_temp_handler(state);
}
}

static void gen_level_move_get(struct bt_mesh_model *model,
struct bt_mesh_msg_ctx *ctx,
struct net_buf_simple *buf)
{
struct net_buf_simple *msg = NET_BUF_SIMPLE(2 + 5 + 4);
struct generic_level_state *state = model->user_data;

bt_mesh_model_msg_init(msg, BT_MESH_MODEL_OP_GEN_LEVEL_STATUS);
net_buf_simple_add_le16(msg, state->level);

if (state->transition->counter) {
if (state->last_delta < 0) {
net_buf_simple_add_le16(msg, INT16_MIN);
} else { /* 0 should not be possible */
net_buf_simple_add_le16(msg, INT16_MAX);
}

net_buf_simple_add_u8(msg, UNKNOWN_VALUE);
}

if (bt_mesh_model_send(model, ctx, msg, NULL, NULL)) {
printk("Unable to send GEN_LEVEL_SRV Status response\n");
}
}

static void gen_level_move_publish(struct bt_mesh_model *model)
{
int err;
struct net_buf_simple *msg = model->pub->msg;
struct generic_level_state *state = model->user_data;

if (model->pub->addr == BT_MESH_ADDR_UNASSIGNED) {
return;
}

bt_mesh_model_msg_init(msg, BT_MESH_MODEL_OP_GEN_LEVEL_STATUS);
net_buf_simple_add_le16(msg, state->level);

if (state->transition->counter) {
if (state->last_delta < 0) {
net_buf_simple_add_le16(msg, INT16_MIN);
} else { /* 0 should not be possible */
net_buf_simple_add_le16(msg, INT16_MAX);
}

net_buf_simple_add_u8(msg, UNKNOWN_VALUE);
}

err = bt_mesh_model_publish(model);
if (err) {
printk("bt_mesh_model_publish err %d\n", err);
}
}

static void gen_move_set_unack(struct bt_mesh_model *model,
struct bt_mesh_msg_ctx *ctx,
struct net_buf_simple *buf)
{
u8_t tid, tt, delay;
s16_t delta;
s32_t tmp32;
s64_t now;
struct generic_level_state *state = model->user_data;

Expand Down Expand Up @@ -815,21 +777,22 @@ static void gen_move_set_unack(struct bt_mesh_model *model,
state->last_msg_timestamp = now;
state->last_delta = delta;

tmp32 = state->level + delta;
if (tmp32 < INT16_MIN) {
tmp32 = INT16_MIN;
} else if (tmp32 > INT16_MAX) {
tmp32 = INT16_MAX;
if (delta < 0) {
state->target_level = INT16_MIN;
} else if (delta > 0) {
state->target_level = INT16_MAX;
} else if (delta == 0) {
state->target_level = state->level;
}

state->target_level = tmp32;
state->transition->tt = tt;
state->transition->delay = delay;
state->transition->type = UNKNOWN_TT;

if (state->target_level != state->level) {
level_tt_values(state);
level_move_tt_values(state);
} else {
gen_level_move_publish(model);
gen_level_publish(model);
return;
}

Expand All @@ -838,15 +801,16 @@ static void gen_move_set_unack(struct bt_mesh_model *model,
}

state->transition->just_started = true;
gen_level_move_publish(model);

if (bt_mesh_model_elem(model)->addr == elements[0].addr) {
/* Root element */
transition_type = LEVEL_TT_MOVE;
state->transition->type = LEVEL_TT_MOVE;
gen_level_publish(model);
level_lightness_handler(state);
} else if (bt_mesh_model_elem(model)->addr == elements[1].addr) {
/* Secondary element */
transition_type = LEVEL_TEMP_TT_MOVE;
state->transition->type = LEVEL_TEMP_TT_MOVE;
gen_level_publish(model);
level_temp_handler(state);
}
}
Expand All @@ -857,7 +821,6 @@ static void gen_move_set(struct bt_mesh_model *model,
{
u8_t tid, tt, delay;
s16_t delta;
s32_t tmp32;
s64_t now;
struct generic_level_state *state = model->user_data;

Expand All @@ -869,7 +832,7 @@ static void gen_move_set(struct bt_mesh_model *model,
state->last_src_addr == ctx->addr &&
state->last_dst_addr == ctx->recv_dst &&
(now - state->last_msg_timestamp <= K_SECONDS(6))) {
gen_level_move_get(model, ctx, buf);
gen_level_get(model, ctx, buf);
return;
}

Expand Down Expand Up @@ -899,22 +862,23 @@ static void gen_move_set(struct bt_mesh_model *model,
state->last_msg_timestamp = now;
state->last_delta = delta;

tmp32 = state->level + delta;
if (tmp32 < INT16_MIN) {
tmp32 = INT16_MIN;
} else if (tmp32 > INT16_MAX) {
tmp32 = INT16_MAX;
if (delta < 0) {
state->target_level = INT16_MIN;
} else if (delta > 0) {
state->target_level = INT16_MAX;
} else if (delta == 0) {
state->target_level = state->level;
}

state->target_level = tmp32;
state->transition->tt = tt;
state->transition->delay = delay;
state->transition->type = UNKNOWN_TT;

if (state->target_level != state->level) {
level_tt_values(state);
level_move_tt_values(state);
} else {
gen_level_move_get(model, ctx, buf);
gen_level_move_publish(model);
gen_level_get(model, ctx, buf);
gen_level_publish(model);
return;
}

Expand All @@ -923,16 +887,18 @@ static void gen_move_set(struct bt_mesh_model *model,
}

state->transition->just_started = true;
gen_level_move_get(model, ctx, buf);
gen_level_move_publish(model);

if (bt_mesh_model_elem(model)->addr == elements[0].addr) {
/* Root element */
transition_type = LEVEL_TT_MOVE;
state->transition->type = LEVEL_TT_MOVE;
gen_level_get(model, ctx, buf);
gen_level_publish(model);
level_lightness_handler(state);
} else if (bt_mesh_model_elem(model)->addr == elements[1].addr) {
/* Secondary element */
transition_type = LEVEL_TEMP_TT_MOVE;
state->transition->type = LEVEL_TEMP_TT_MOVE;
gen_level_get(model, ctx, buf);
gen_level_publish(model);
level_temp_handler(state);
}
}
Expand Down Expand Up @@ -1313,6 +1279,7 @@ static void light_lightness_set_unack(struct bt_mesh_model *model,
state->target_actual = actual;
state->transition->tt = tt;
state->transition->delay = delay;
state->transition->type = LIGHT_ACTUAL_TT;

if (state->target_actual != state->actual) {
light_lightness_actual_tt_values(state);
Expand Down Expand Up @@ -1386,6 +1353,7 @@ static void light_lightness_set(struct bt_mesh_model *model,
state->target_actual = actual;
state->transition->tt = tt;
state->transition->delay = delay;
state->transition->type = LIGHT_ACTUAL_TT;

if (state->target_actual != state->actual) {
light_lightness_actual_tt_values(state);
Expand Down Expand Up @@ -1511,6 +1479,7 @@ static void light_lightness_linear_set_unack(struct bt_mesh_model *model,
state->target_linear = linear;
state->transition->tt = tt;
state->transition->delay = delay;
state->transition->type = LIGHT_LINEAR_TT;

if (state->target_linear != state->linear) {
light_lightness_linear_tt_values(state);
Expand Down Expand Up @@ -1577,6 +1546,7 @@ static void light_lightness_linear_set(struct bt_mesh_model *model,
state->target_linear = linear;
state->transition->tt = tt;
state->transition->delay = delay;
state->transition->type = LIGHT_LINEAR_TT;

if (state->target_linear != state->linear) {
light_lightness_linear_tt_values(state);
Expand Down Expand Up @@ -1960,6 +1930,7 @@ static void light_ctl_set_unack(struct bt_mesh_model *model,
state->target_delta_uv = delta_uv;
state->transition->tt = tt;
state->transition->delay = delay;
state->transition->type = LIGHT_CTL_TT;

if (state->target_lightness != state->lightness ||
state->target_temp != state->temp ||
Expand Down Expand Up @@ -2046,6 +2017,7 @@ static void light_ctl_set(struct bt_mesh_model *model,
state->target_delta_uv = delta_uv;
state->transition->tt = tt;
state->transition->delay = delay;
state->transition->type = LIGHT_CTL_TT;

if (state->target_lightness != state->lightness ||
state->target_temp != state->temp ||
Expand Down Expand Up @@ -2446,6 +2418,7 @@ static void light_ctl_temp_set_unack(struct bt_mesh_model *model,
state->target_delta_uv = delta_uv;
state->transition->tt = tt;
state->transition->delay = delay;
state->transition->type = LIGHT_CTL_TEMP_TT;

if (state->target_temp != state->temp ||
state->target_delta_uv != state->delta_uv) {
Expand Down Expand Up @@ -2528,6 +2501,7 @@ static void light_ctl_temp_set(struct bt_mesh_model *model,
state->target_delta_uv = delta_uv;
state->transition->tt = tt;
state->transition->delay = delay;
state->transition->type = LIGHT_CTL_TEMP_TT;

if (state->target_temp != state->temp ||
state->target_delta_uv != state->delta_uv) {
Expand Down

0 comments on commit 0cf1991

Please sign in to comment.