mirror/btstack
1
0
Fork 0
mirror of https://github.com/bluekitchen/btstack.git synced 2025-02-27 03:39:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

mesh: keep active transitions in list, handle transitions with one timer

Browse Source
This commit is contained in:
Milanka Ringwald 2019-06-18 14:32:41 +02:00 committed by Matthias Ringwald
parent 617a1deb87
commit 08c82f9b83
4 changed files with 152 additions and 112 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

92
test/mesh/mesh_access.c
View File

@ -61,6 +61,9 @@ static uint16_t mid_counter;
static const btstack_tlv_t * btstack_tlv_singleton_impl;
static void * btstack_tlv_singleton_context;
static btstack_linked_list_t transitions;
static btstack_timer_source_t transitions_timer;
static void mesh_access_setup_tlv(void){
if (btstack_tlv_singleton_impl) return;
btstack_tlv_get_instance(&btstack_tlv_singleton_impl, &btstack_tlv_singleton_context);
@ -89,6 +92,95 @@ void mesh_access_emit_state_update_bool(btstack_packet_handler_t * event_handler
(*event_handler)(HCI_EVENT_PACKET, 0, event, sizeof(event));
}
static uint8_t mesh_get_num_steps_from_gdtt(uint8_t transition_time_gdtt){
return transition_time_gdtt >> 2;
}
static uint32_t mesh_get_transition_step_ms_from_gdtt(uint8_t transition_time_gdtt){
mesh_default_transition_step_resolution_t step_resolution = (mesh_default_transition_step_resolution_t) (transition_time_gdtt & 0x03u);
switch (step_resolution){
case MESH_DEFAULT_TRANSITION_STEP_RESOLUTION_100ms:
return 100;
case MESH_DEFAULT_TRANSITION_STEP_RESOLUTION_1s:
return 1000;
case MESH_DEFAULT_TRANSITION_STEP_RESOLUTION_10s:
return 10000;
case MESH_DEFAULT_TRANSITION_STEP_RESOLUTION_10min:
return 600000;
default:
return 0;
}
}
void mesh_access_transitions_add(mesh_transition_t * transition, uint8_t transition_time_gdtt, uint8_t delay_gdtt){
// Only values of 0x00 through 0x3E shall be used to specify the value of the Transition Number of Steps field
uint8_t num_steps = mesh_get_num_steps_from_gdtt(transition_time_gdtt);
if (num_steps > 0x3E) return;
transition->remaining_delay_time_ms = delay_gdtt * 5;
transition->remaining_transition_time_ms = num_steps * mesh_get_transition_step_ms_from_gdtt(transition_time_gdtt);
transition->phase_start_ms = 0;
transition->state = MESH_TRANSITION_STATE_IDLE;
int transition_already_registered = 0;
btstack_linked_list_iterator_t it;
btstack_linked_list_iterator_init(&it, &transitions);
while (btstack_linked_list_iterator_has_next(&it)){
mesh_transition_t * transition_item = (mesh_transition_t *)btstack_linked_list_iterator_next(&it);
if (transition_item == transition){
transition_already_registered = 1;
break;
}
}
if (transition_already_registered != 0){
btstack_linked_list_add(&transitions, (btstack_linked_item_t *) transition);
}
}
void mesh_access_transitions_remove(mesh_transition_t * transition){
transition->remaining_delay_time_ms = 0;
transition->remaining_transition_time_ms = 0;
transition->phase_start_ms = 0;
transition->state = MESH_TRANSITION_STATE_IDLE;
btstack_linked_list_remove(&transitions, (btstack_linked_item_t *) transition);
}
int mesh_access_get_min_transitions_timeout_ms(void){
// TODO go through transitions and pickup update step
return 100;
}
void mesh_access_transitions_timeout_handler(btstack_timer_source_t * timer){
btstack_linked_list_iterator_t it;
btstack_linked_list_iterator_init(&it, &transitions);
while (btstack_linked_list_iterator_has_next(&it)){
mesh_transition_t * transition = (mesh_transition_t *)btstack_linked_list_iterator_next(&it);
switch (transition->state){
case MESH_TRANSITION_STATE_IDLE:
(transition->transition_callback)(transition, TRANSITION_START, btstack_run_loop_get_time_ms());
break;
default:
(transition->transition_callback)(transition, TRANSITION_UPDATE, btstack_run_loop_get_time_ms());
break;
}
}
btstack_run_loop_set_timer(timer, mesh_access_get_min_transitions_timeout_ms());
btstack_run_loop_add_timer(timer);
}
void mesh_access_transitions_timer_start(void){
btstack_run_loop_remove_timer(&transitions_timer);
btstack_run_loop_set_timer_handler(&transitions_timer, mesh_access_transitions_timeout_handler);
btstack_run_loop_set_timer(&transitions_timer, mesh_access_get_min_transitions_timeout_ms());
btstack_run_loop_add_timer(&transitions_timer);
}
void mesh_access_transitions_timer_stop(void){
btstack_run_loop_remove_timer(&transitions_timer);
}
mesh_element_t * mesh_primary_element(void){
return &primary_element;
}

33
test/mesh/mesh_access.h
View File

@ -57,6 +57,13 @@ extern "C"
struct mesh_model;
struct mesh_element;
typedef enum {
MESH_DEFAULT_TRANSITION_STEP_RESOLUTION_100ms = 0x00u,
MESH_DEFAULT_TRANSITION_STEP_RESOLUTION_1s,
MESH_DEFAULT_TRANSITION_STEP_RESOLUTION_10s,
MESH_DEFAULT_TRANSITION_STEP_RESOLUTION_10min
} mesh_default_transition_step_resolution_t;
typedef enum {
MODEL_STATE_UPDATE_REASON_SET = 0x00u,
// MODEL_STATE_UPDATE_REASON_TRANSITION_START,
@ -71,6 +78,12 @@ typedef enum {
TRANSITION_UPDATE
} transition_event_t;
typedef enum {
MESH_TRANSITION_STATE_IDLE,
MESH_TRANSITION_STATE_DELAYED,
MESH_TRANSITION_STATE_ACTIVE
} mesh_transition_state_t;
typedef enum {
MODEL_STATE_ID_GENERIC_ON_OFF = (BLUETOOTH_COMPANY_ID_BLUETOOTH_SIG_INC << 16) | 0u,
} model_state_id_t;
@ -160,6 +173,23 @@ typedef struct {
const char * format;
} mesh_access_message_t;
typedef struct mesh_transition {
btstack_linked_item_t item;
mesh_transition_state_t state;
mesh_default_transition_step_resolution_t step;
uint32_t phase_start_ms;
uint32_t remaining_delay_time_ms;
uint32_t remaining_transition_time_ms;
// to send events and/or publish changes
mesh_model_t * mesh_model;
// to execute transition
void (* transition_callback)(struct mesh_transition * transition, transition_event_t event, uint32_t current_timestamp);
} mesh_transition_t;
/**
* @brief Init access layer
*/
@ -221,6 +251,9 @@ mesh_model_t * mesh_access_model_for_address_and_model_identifier(uint16_t eleme
void mesh_access_emit_state_update_bool(btstack_packet_handler_t * event_handler, uint8_t element_index, uint32_t model_identifier,
model_state_id_t state_identifier, model_state_update_reason_t reason, uint8_t value);
void mesh_access_transitions_add(mesh_transition_t * transition, uint8_t transition_time_gdtt, uint8_t delay_gdtt);
void mesh_access_transitions_remove(mesh_transition_t * transition);
// Mesh PDU Getter
uint16_t mesh_pdu_src(mesh_pdu_t * pdu);

101
test/mesh/mesh_generic_server.c
View File

@ -50,6 +50,9 @@
#include "btstack_memory.h"
#include "btstack_debug.h"
static mesh_transition_t generic_server_on_off_value_transition;
static void mesh_server_transition_step_bool(mesh_transition_bool_t * transition, transition_event_t event, uint32_t current_timestamp);
static void generic_server_send_message(uint16_t src, uint16_t dest, uint16_t netkey_index, uint16_t appkey_index, mesh_pdu_t *pdu){
uint8_t ttl = mesh_foundation_default_ttl_get();
mesh_upper_transport_setup_access_pdu_header(pdu, netkey_index, appkey_index, ttl, src, dest, 0);
@ -108,35 +111,6 @@ static void generic_on_off_get_handler(mesh_model_t *generic_on_off_server_model
mesh_access_message_processed(pdu);
}
static uint8_t mesh_get_num_steps_from_gdtt(uint8_t transition_time_gdtt){
return transition_time_gdtt >> 2;
}
static uint32_t mesh_get_time_ms_from_gdtt(uint8_t transition_time_gdtt){
uint32_t step_resolution_ms = 0;
uint8_t num_steps = mesh_get_num_steps_from_gdtt(transition_time_gdtt);
mesh_default_transition_step_resolution_t step_resolution = (mesh_default_transition_step_resolution_t) (transition_time_gdtt & 0x03u);
switch (step_resolution){
case MESH_DEFAULT_TRANSITION_STEP_RESOLUTION_100ms:
step_resolution_ms = 100;
break;
case MESH_DEFAULT_TRANSITION_STEP_RESOLUTION_1s:
step_resolution_ms = 1000;
break;
case MESH_DEFAULT_TRANSITION_STEP_RESOLUTION_10s:
step_resolution_ms = 10000;
break;
case MESH_DEFAULT_TRANSITION_STEP_RESOLUTION_10min:
step_resolution_ms = 600000;
break;
default:
break;
}
return num_steps * step_resolution_ms;
}
static void generic_on_off_set_handler(mesh_model_t *generic_on_off_server_model, mesh_pdu_t * pdu){
if (generic_on_off_server_model == NULL){
log_error("generic_on_off_server_model == NULL");
@ -162,17 +136,11 @@ static void generic_on_off_set_handler(mesh_model_t *generic_on_off_server_model
if (mesh_access_parser_available(&parser) == 2){
// Generic Default Transition Time format - num_steps (higher 6 bits), step_resolution (lower 2 bits)
uint8_t transition_time_gdtt = mesh_access_parser_get_u8(&parser);
// Only values of 0x00 through 0x3E shall be used to specify the value of the Transition Number of Steps field
uint8_t num_steps = mesh_get_num_steps_from_gdtt(transition_time_gdtt);
if (num_steps > 0x3E){
}
uint32_t transition_time_ms = mesh_get_time_ms_from_gdtt(transition_time_gdtt);
// Delay is given in 5 millisecond steps
uint16_t delay_ms = mesh_access_parser_get_u8(&parser) * 5;
printf("todo check/set transition timer transition_time %d ms, delay %d ms", transition_time_ms, delay_ms);
//TODO: return;
uint8_t delay_time_gdtt = mesh_access_parser_get_u8(&parser);
generic_server_on_off_value_transition.transition_callback = (void (*)(mesh_transition_t *, transition_event_t, uint32_t)) &mesh_server_transition_step_bool;
mesh_access_transitions_add(&generic_server_on_off_value_transition, transition_time_gdtt, delay_time_gdtt);
return;
}
// Instantanious update
@ -231,12 +199,13 @@ uint8_t mesh_generic_on_off_server_get_value(mesh_model_t *generic_on_off_server
return generic_on_off_server_state->transition_data.current_value;
}
static void mesh_server_transition_bool_init(mesh_transition_bool_t * transition){
static void mesh_server_transition_bool_reset(mesh_transition_bool_t * transition){
transition->base_transition.state = MESH_TRANSITION_STATE_IDLE;
transition->base_transition.remaining_transition_time_ms = 0;
transition->base_transition.remaining_delay_time_ms = 0;
transition->base_transition.phase_start_ms = 0;
transition->target_value = transition->current_value;
mesh_access_transitions_remove(&generic_server_on_off_value_transition);
}
static void mesh_server_transition_state_update(mesh_transition_bool_t * transition, uint32_t current_timestamp_ms){
@ -253,17 +222,17 @@ static void mesh_server_transition_state_update(mesh_transition_bool_t * transit
if (transition->target_value == 1){
transition->current_value = 1;
// TODO: emit event
mesh_server_transition_bool_init(transition);
mesh_server_transition_bool_reset(transition);
}
return;
}
transition->current_value = transition->target_value;
transition->base_transition.remaining_transition_time_ms = 0;
// TODO: emit event
mesh_server_transition_bool_init(transition);
mesh_server_transition_bool_reset(transition);
}
void mesh_server_transition_step_bool(mesh_transition_bool_t * transition, transition_event_t event, uint32_t current_timestamp){
static void mesh_server_transition_step_bool(mesh_transition_bool_t * transition, transition_event_t event, uint32_t current_timestamp){
uint32_t time_step_ms;
switch (transition->base_transition.state){
@ -272,39 +241,23 @@ void mesh_server_transition_step_bool(mesh_transition_bool_t * transition, trans
mesh_server_transition_state_update(transition, current_timestamp);
break;
case MESH_TRANSITION_STATE_DELAYED:
switch (event){
case TRANSITION_START:
mesh_server_transition_state_update(transition, current_timestamp);
break;
case TRANSITION_UPDATE:
time_step_ms = current_timestamp - transition->base_transition.phase_start_ms;
if (transition->base_transition.remaining_delay_time_ms >= time_step_ms){
transition->base_transition.remaining_delay_time_ms -= time_step_ms;
} else {
transition->base_transition.remaining_delay_time_ms = 0;
mesh_server_transition_state_update(transition, current_timestamp);
}
break;
default:
break;
if (event != TRANSITION_UPDATE) break;
time_step_ms = current_timestamp - transition->base_transition.phase_start_ms;
if (transition->base_transition.remaining_delay_time_ms >= time_step_ms){
transition->base_transition.remaining_delay_time_ms -= time_step_ms;
} else {
transition->base_transition.remaining_delay_time_ms = 0;
mesh_server_transition_state_update(transition, current_timestamp);
}
break;
case MESH_TRANSITION_STATE_ACTIVE:
switch (event){
case TRANSITION_START:
mesh_server_transition_state_update(transition, current_timestamp);
break;
case TRANSITION_UPDATE:
time_step_ms = current_timestamp - transition->base_transition.phase_start_ms;
if (transition->base_transition.remaining_transition_time_ms >= time_step_ms){
transition->base_transition.remaining_transition_time_ms -= time_step_ms;
} else {
transition->base_transition.remaining_transition_time_ms = 0;
mesh_server_transition_state_update(transition, current_timestamp);
}
break;
default:
break;
if (event != TRANSITION_UPDATE) break;
time_step_ms = current_timestamp - transition->base_transition.phase_start_ms;
if (transition->base_transition.remaining_transition_time_ms >= time_step_ms){
transition->base_transition.remaining_transition_time_ms -= time_step_ms;
} else {
transition->base_transition.remaining_transition_time_ms = 0;
mesh_server_transition_state_update(transition, current_timestamp);
}
break;
default:

38
test/mesh/mesh_generic_server.h
View File

@ -51,37 +51,6 @@ extern "C"
#define MESH_GENERIC_ON_OFF_SET_UNACKNOWLEDGED 0x8203u
#define MESH_GENERIC_ON_OFF_STATUS 0x8204u
typedef enum {
MESH_DEFAULT_TRANSITION_STEP_RESOLUTION_100ms = 0x00u,
MESH_DEFAULT_TRANSITION_STEP_RESOLUTION_1s,
MESH_DEFAULT_TRANSITION_STEP_RESOLUTION_10s,
MESH_DEFAULT_TRANSITION_STEP_RESOLUTION_10min
} mesh_default_transition_step_resolution_t;
typedef enum {
MESH_TRANSITION_STATE_IDLE,
MESH_TRANSITION_STATE_DELAYED,
MESH_TRANSITION_STATE_ACTIVE
} mesh_transition_state_t;
typedef struct mesh_transition {
btstack_linked_item_t item;
mesh_transition_state_t state;
uint32_t phase_start_ms;
uint32_t remaining_delay_time_ms;
uint32_t remaining_transition_time_ms;
// to send events and/or publish changes
mesh_model_t * mesh_model;
// to execute transition
void (* transition_callback)(struct mesh_transition * transition, transition_event_t event, uint32_t current_timestamp);
} mesh_transition_t;
typedef struct {
mesh_transition_t base_transition;
@ -118,13 +87,6 @@ void mesh_generic_on_off_server_set_value(mesh_model_t *generic_on_off_server_mo
*/
uint8_t mesh_generic_on_off_server_get_value(mesh_model_t *generic_on_off_server_model);
/**
* @brief Call tu update transition step
* @param transition
* @param event
* @param current_timestamp
*/
void mesh_server_transition_step_bool(mesh_transition_bool_t * transition, transition_event_t event, uint32_t current_timestamp);
#ifdef __cplusplus
} /* end of extern "C" */