mirror of
https://github.com/bluekitchen/btstack.git
synced 2025-03-30 07:21:20 +00:00
mesh: add pointer to model to mesh_transition_bool_t
This commit is contained in:
parent
2b25ccf928
commit
27a2526ec0
@ -66,6 +66,11 @@ typedef enum {
|
||||
MODEL_STATE_UPDATE_REASON_APPLICATION_CHANGE
|
||||
} model_state_update_reason_t;
|
||||
|
||||
typedef enum {
|
||||
TRANSITION_START,
|
||||
TRANSITION_UPDATE
|
||||
} transition_event_t;
|
||||
|
||||
typedef enum {
|
||||
MODEL_STATE_ID_GENERIC_ON_OFF = (BLUETOOTH_COMPANY_ID_BLUETOOTH_SIG_INC << 16) | 0u,
|
||||
} model_state_id_t;
|
||||
|
@ -235,18 +235,11 @@ static void mesh_server_transition_bool_init(mesh_transition_bool_t * transition
|
||||
transition->state = MESH_TRANSITION_STATE_IDLE;
|
||||
transition->remaining_transition_time_ms = 0;
|
||||
transition->remaining_delay_time_ms = 0;
|
||||
transition->target_value = 0;
|
||||
transition->current_value = 0;
|
||||
transition->phase_start_ms = 0;
|
||||
transition->target_value = transition->current_value;
|
||||
}
|
||||
|
||||
typedef enum {
|
||||
TRANSITION_START,
|
||||
TRANSITION_UPDATE
|
||||
} transition_event_t;
|
||||
|
||||
static void mesh_server_transition_state_update(mesh_model_t * mesh_model, mesh_transition_bool_t * transition, uint32_t current_timestamp_ms){
|
||||
UNUSED(mesh_model);
|
||||
|
||||
static void mesh_server_transition_state_update(mesh_transition_bool_t * transition, uint32_t current_timestamp_ms){
|
||||
if (transition->remaining_delay_time_ms != 0){
|
||||
transition->state = MESH_TRANSITION_STATE_DELAYED;
|
||||
transition->remaining_delay_time_ms = 0;
|
||||
@ -260,27 +253,28 @@ static void mesh_server_transition_state_update(mesh_model_t * mesh_model, mesh_
|
||||
if (transition->target_value == 1){
|
||||
transition->current_value = 1;
|
||||
// TODO: emit event
|
||||
mesh_server_transition_bool_init(transition);
|
||||
}
|
||||
return;
|
||||
}
|
||||
transition->current_value = transition->target_value;
|
||||
transition->remaining_transition_time_ms = 0;
|
||||
// TODO: emit event
|
||||
mesh_server_transition_bool_init(transition);
|
||||
}
|
||||
|
||||
static void mesh_server_transition_step_bool(mesh_model_t * mesh_model, mesh_transition_bool_t * transition, transition_event_t event, uint32_t current_timestamp){
|
||||
UNUSED(mesh_model);
|
||||
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->state){
|
||||
case MESH_TRANSITION_STATE_IDLE:
|
||||
if (event != TRANSITION_START) break;
|
||||
mesh_server_transition_state_update(mesh_model, transition, current_timestamp);
|
||||
mesh_server_transition_state_update(transition, current_timestamp);
|
||||
break;
|
||||
case MESH_TRANSITION_STATE_DELAYED:
|
||||
switch (event){
|
||||
case TRANSITION_START:
|
||||
mesh_server_transition_state_update(mesh_model, transition, current_timestamp);
|
||||
mesh_server_transition_state_update(transition, current_timestamp);
|
||||
break;
|
||||
case TRANSITION_UPDATE:
|
||||
time_step_ms = current_timestamp - transition->phase_start_ms;
|
||||
@ -288,7 +282,7 @@ static void mesh_server_transition_step_bool(mesh_model_t * mesh_model, mesh_tra
|
||||
transition->remaining_delay_time_ms -= time_step_ms;
|
||||
} else {
|
||||
transition->remaining_delay_time_ms = 0;
|
||||
mesh_server_transition_state_update(mesh_model, transition, current_timestamp);
|
||||
mesh_server_transition_state_update(transition, current_timestamp);
|
||||
}
|
||||
break;
|
||||
default:
|
||||
@ -298,7 +292,7 @@ static void mesh_server_transition_step_bool(mesh_model_t * mesh_model, mesh_tra
|
||||
case MESH_TRANSITION_STATE_ACTIVE:
|
||||
switch (event){
|
||||
case TRANSITION_START:
|
||||
mesh_server_transition_state_update(mesh_model, transition, current_timestamp);
|
||||
mesh_server_transition_state_update(transition, current_timestamp);
|
||||
break;
|
||||
case TRANSITION_UPDATE:
|
||||
time_step_ms = current_timestamp - transition->phase_start_ms;
|
||||
@ -306,7 +300,7 @@ static void mesh_server_transition_step_bool(mesh_model_t * mesh_model, mesh_tra
|
||||
transition->remaining_transition_time_ms -= time_step_ms;
|
||||
} else {
|
||||
transition->remaining_transition_time_ms = 0;
|
||||
mesh_server_transition_state_update(mesh_model, transition, current_timestamp);
|
||||
mesh_server_transition_state_update(transition, current_timestamp);
|
||||
}
|
||||
break;
|
||||
default:
|
||||
|
@ -72,7 +72,10 @@ typedef struct {
|
||||
|
||||
uint32_t phase_start_ms;
|
||||
uint32_t remaining_delay_time_ms;
|
||||
uint32_t remaining_transition_time_ms;
|
||||
uint32_t remaining_transition_time_ms;
|
||||
|
||||
// to send events and/or publish changes
|
||||
mesh_model_t * mesh_model;
|
||||
} mesh_transition_bool_t;
|
||||
|
||||
typedef struct {
|
||||
@ -106,11 +109,11 @@ uint8_t mesh_generic_on_off_server_get_value(mesh_model_t *generic_on_off_server
|
||||
|
||||
/**
|
||||
* @brief Call tu update transition step
|
||||
* @param generic_on_off_server_model
|
||||
* @param transition
|
||||
* @param current_time_ms
|
||||
* @param event
|
||||
* @param current_timestamp
|
||||
*/
|
||||
// void mesh_server_transition_step_bool(mesh_model_t *mesh_model, mesh_transition_bool_t * transition, uint32_t current_time_ms);
|
||||
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" */
|
||||
|
Loading…
x
Reference in New Issue
Block a user