mirror/btstack
1
0
Fork 0
mirror of https://github.com/bluekitchen/btstack.git synced 2025-04-25 09:02:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

mesh: generic level server rework transition state machine

Browse Source
This commit is contained in:
Matthias Ringwald 2019-11-13 15:44:22 +01:00
parent 794ab91c82
commit 85bee78160
1 changed files with 61 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

97
src/mesh/mesh_generic_level_server.c
View File

@ -77,55 +77,58 @@ static mesh_transition_t * generic_level_server_get_base_transition(mesh_model_t
return &generic_level_server_state->transition_data.base_transition; return &generic_level_server_state->transition_data.base_transition;
} }
static void mesh_server_transition_state_update_stepwise_value(mesh_transition_int16_t * transition){ static void mesh_server_transition_state_emit_change(mesh_transition_int16_t * transition, model_state_update_reason_t reason){
mesh_model_t * generic_level_server_model = transition->base_transition.mesh_model; mesh_model_t * generic_level_server_model = transition->base_transition.mesh_model;
mesh_access_emit_state_update_int16(generic_level_server_model->model_packet_handler,
mesh_access_get_element_index(generic_level_server_model),
generic_level_server_model->model_identifier,
MODEL_STATE_ID_GENERIC_LEVEL,
reason,
transition->current_value);
}
static void mesh_server_transition_state_update_stepwise_value(mesh_transition_int16_t * transition){
if (transition->stepwise_value_increment){ if (transition->stepwise_value_increment){
transition->current_value = add_and_clip_int16(transition->current_value, transition->stepwise_value_increment); transition->current_value = add_and_clip_int16(transition->current_value, transition->stepwise_value_increment);
} else if (transition->delta_from_initial_value){ } else if (transition->delta_from_initial_value){
transition->current_value = add_and_clip_int16(transition->initial_value, transition->delta_from_initial_value); transition->current_value = add_and_clip_int16(transition->initial_value, transition->delta_from_initial_value);
} }
// emit event // publish new value
mesh_access_emit_state_update_int16(generic_level_server_model->model_packet_handler, mesh_access_state_changed(transition->base_transition.mesh_model);
mesh_access_get_element_index(generic_level_server_model),
generic_level_server_model->model_identifier, // notify transition update
MODEL_STATE_ID_GENERIC_LEVEL, mesh_server_transition_state_emit_change(transition, MODEL_STATE_UPDATE_REASON_TRANSITION_ACTIVE);
MODEL_STATE_UPDATE_REASON_TRANSITION_END,
transition->current_value);
} }
static void mesh_server_transition_state_update(mesh_transition_int16_t * transition, uint32_t current_timestamp_ms){ static void mesh_server_transition_state_delayed(mesh_transition_int16_t * transition, uint32_t current_timestamp_ms){
if (transition->base_transition.remaining_delay_time_ms != 0){
transition->base_transition.state = MESH_TRANSITION_STATE_DELAYED; transition->base_transition.state = MESH_TRANSITION_STATE_DELAYED;
transition->base_transition.remaining_delay_time_ms = 0;
transition->base_transition.phase_start_ms = current_timestamp_ms; transition->base_transition.phase_start_ms = current_timestamp_ms;
return;
} }
mesh_model_t * generic_level_server_model = transition->base_transition.mesh_model; static void mesh_server_transition_state_started(mesh_transition_int16_t * transition, uint32_t current_timestamp_ms){
if (transition->base_transition.remaining_transition_time_ms != 0){
transition->base_transition.state = MESH_TRANSITION_STATE_ACTIVE; transition->base_transition.state = MESH_TRANSITION_STATE_ACTIVE;
transition->base_transition.phase_start_ms = current_timestamp_ms; transition->base_transition.phase_start_ms = current_timestamp_ms;
return;
// notify transition completed
mesh_server_transition_state_emit_change(transition, MODEL_STATE_UPDATE_REASON_TRANSITION_START);
} }
transition->current_value = transition->target_value; static void mesh_server_transition_state_done(mesh_transition_int16_t * transition, uint32_t current_timestamp_ms){
transition->base_transition.state = MESH_TRANSITION_STATE_IDLE;
transition->base_transition.remaining_transition_time_ms = 0; transition->base_transition.remaining_transition_time_ms = 0;
transition->current_value = transition->target_value;
// emit event // publish new value
mesh_access_emit_state_update_int16(generic_level_server_model->model_packet_handler, mesh_access_state_changed(transition->base_transition.mesh_model);
mesh_access_get_element_index(generic_level_server_model),
generic_level_server_model->model_identifier, // notify transition completed
MODEL_STATE_ID_GENERIC_LEVEL, mesh_server_transition_state_emit_change(transition, MODEL_STATE_UPDATE_REASON_TRANSITION_END);
MODEL_STATE_UPDATE_REASON_TRANSITION_END,
transition->current_value);
// done, stop transition // done, stop transition
mesh_access_transitions_remove((mesh_transition_t *)transition); mesh_access_transitions_remove((mesh_transition_t *)transition);
} }
static void mesh_server_transition_step(mesh_transition_t * base_transition, transition_event_t event, uint32_t current_timestamp){ static void mesh_server_transition_step(mesh_transition_t * base_transition, transition_event_t event, uint32_t current_timestamp_ms){
uint32_t time_step_ms; uint32_t time_step_ms;
mesh_transition_int16_t * transition = (mesh_transition_int16_t*) base_transition; mesh_transition_int16_t * transition = (mesh_transition_int16_t*) base_transition;
@ -133,37 +136,41 @@ static void mesh_server_transition_step(mesh_transition_t * base_transition, tra
switch (transition->base_transition.state){ switch (transition->base_transition.state){
case MESH_TRANSITION_STATE_IDLE: case MESH_TRANSITION_STATE_IDLE:
if (event != TRANSITION_START) break; if (event != TRANSITION_START) break;
mesh_server_transition_state_update(transition, current_timestamp); mesh_server_transition_state_delayed(transition, current_timestamp_ms);
if (transition->base_transition.remaining_delay_time_ms != 0) break;
mesh_server_transition_state_started(transition, current_timestamp_ms);
if (transition->base_transition.remaining_transition_time_ms != 0) break;
mesh_server_transition_state_done(transition, current_timestamp_ms);
break; break;
case MESH_TRANSITION_STATE_DELAYED: case MESH_TRANSITION_STATE_DELAYED:
if (event != TRANSITION_UPDATE) break; if (event != TRANSITION_UPDATE) break;
time_step_ms = current_timestamp - transition->base_transition.phase_start_ms; time_step_ms = current_timestamp_ms - transition->base_transition.phase_start_ms;
if (transition->base_transition.remaining_delay_time_ms >= time_step_ms){ if (transition->base_transition.remaining_delay_time_ms > time_step_ms){
transition->base_transition.remaining_delay_time_ms -= time_step_ms; transition->base_transition.remaining_delay_time_ms -= time_step_ms;
transition->base_transition.phase_start_ms = current_timestamp; transition->base_transition.phase_start_ms += time_step_ms;
} else { break;
transition->base_transition.remaining_delay_time_ms = 0;
mesh_server_transition_state_update(transition, current_timestamp);
} }
mesh_server_transition_state_started(transition, current_timestamp_ms);
if (transition->base_transition.remaining_transition_time_ms != 0) break;
mesh_server_transition_state_done(transition, current_timestamp_ms);
break; break;
case MESH_TRANSITION_STATE_ACTIVE: case MESH_TRANSITION_STATE_ACTIVE:
if (event != TRANSITION_UPDATE) break; if (event != TRANSITION_UPDATE) break;
time_step_ms = current_timestamp - transition->base_transition.phase_start_ms; time_step_ms = current_timestamp_ms - transition->base_transition.phase_start_ms;
if (transition->base_transition.remaining_transition_time_ms >= time_step_ms){ if (transition->base_transition.remaining_transition_time_ms > time_step_ms){
transition->base_transition.remaining_transition_time_ms -= time_step_ms; transition->base_transition.remaining_transition_time_ms -= time_step_ms;
transition->base_transition.phase_start_ms += time_step_ms;
mesh_server_transition_state_update_stepwise_value(transition); mesh_server_transition_state_update_stepwise_value(transition);
transition->base_transition.phase_start_ms = current_timestamp; break;
} else {
transition->base_transition.remaining_transition_time_ms = 0;
mesh_server_transition_state_update(transition, current_timestamp);
} }
mesh_server_transition_state_done(transition, current_timestamp_ms);
break; break;
default: default:
break; break;
} }
} }
static void mesh_server_transition_setup_transition_or_instantaneous_update_int16(mesh_model_t *mesh_model, uint8_t transition_time_gdtt, uint8_t delay_time_gdtt, model_state_update_reason_t reason){ static void mesh_server_transition_setup_transition_or_instantaneous_update_int16(mesh_model_t *mesh_model, uint8_t transition_time_gdtt, uint8_t delay_time_gdtt, model_state_update_reason_t reason){
mesh_generic_level_state_t * generic_level_server_state = (mesh_generic_level_state_t *)mesh_model->model_data; mesh_generic_level_state_t * generic_level_server_state = (mesh_generic_level_state_t *)mesh_model->model_data;
mesh_transition_t * transition = &generic_level_server_state->transition_data.base_transition; mesh_transition_t * transition = &generic_level_server_state->transition_data.base_transition;
@ -179,12 +186,9 @@ static void mesh_server_transition_setup_transition_or_instantaneous_update_int1
generic_level_server_state->transition_data.transition_speed = 0; generic_level_server_state->transition_data.transition_speed = 0;
mesh_access_transitions_setup(transition, mesh_model, 0, 0, NULL); mesh_access_transitions_setup(transition, mesh_model, 0, 0, NULL);
mesh_access_emit_state_update_int16(mesh_model->model_packet_handler, mesh_transition_int16_t * transition_int16 = (mesh_transition_int16_t*) &generic_level_server_state->transition_data.base_transition;
mesh_access_get_element_index(mesh_model),
mesh_model->model_identifier, mesh_server_transition_state_emit_change(transition_int16, reason);
MODEL_STATE_ID_GENERIC_LEVEL,
reason,
generic_level_server_state->transition_data.current_value);
} }
} }
// Generic Level State // Generic Level State
@ -210,8 +214,9 @@ static mesh_pdu_t * mesh_generic_level_status_message(mesh_model_t *generic_leve
// setup message // setup message
mesh_transport_pdu_t * transport_pdu = NULL; mesh_transport_pdu_t * transport_pdu = NULL;
if (state->transition_data.base_transition.remaining_transition_time_ms != 0) { if (state->transition_data.base_transition.remaining_transition_time_ms != 0) {
uint8_t remaining_time = mesh_access_time_as_gdtt(state->transition_data.base_transition.step_duration_ms, state->transition_data.base_transition.remaining_transition_time_ms);
transport_pdu = mesh_access_setup_segmented_message(&mesh_generic_level_status_transition, state->transition_data.current_value, transport_pdu = mesh_access_setup_segmented_message(&mesh_generic_level_status_transition, state->transition_data.current_value,
state->transition_data.target_value, state->transition_data.base_transition.remaining_transition_time_ms); state->transition_data.target_value, remaining_time);
} else { } else {
transport_pdu = mesh_access_setup_segmented_message(&mesh_generic_level_status_instantaneous, state->transition_data.current_value); transport_pdu = mesh_access_setup_segmented_message(&mesh_generic_level_status_instantaneous, state->transition_data.current_value);
} }