mesh: health server handlers: fault_test, fault_test_unacknowledged, period_get

This commit is contained in:
Milanka Ringwald 2019-07-19 11:53:25 +02:00 committed by Matthias Ringwald
parent 0500a9341c
commit 5ac9386314
3 changed files with 58 additions and 28 deletions

View File

@ -89,6 +89,8 @@ typedef struct {
typedef struct {
btstack_linked_list_t current_faults;
btstack_linked_list_t registered_faults;
uint8_t fast_period_divisor;
} mesh_health_state_t;
#ifdef __cplusplus

View File

@ -70,6 +70,7 @@ const mesh_access_message_t mesh_foundation_health_attention_status = {
MESH_FOUNDATION_OPERATION_ATTENTION_STATUS, "1"
};
// dynamic
static mesh_pdu_t * health_current_status(btstack_linked_list_t * faults, uint32_t opcode, uint16_t company_id){
mesh_transport_pdu_t * transport_pdu = mesh_access_transport_init(opcode);
if (!transport_pdu) return NULL;
@ -93,6 +94,42 @@ static mesh_pdu_t * health_current_status(btstack_linked_list_t * faults, uint32
return (mesh_pdu_t *) transport_pdu;
}
// dynamic
static mesh_pdu_t * health_fault_status(btstack_linked_list_t * faults, uint32_t opcode, uint8_t test_id, uint16_t company_id){
mesh_transport_pdu_t * transport_pdu = mesh_access_transport_init(opcode);
if (!transport_pdu) return NULL;
mesh_access_transport_add_uint8(transport_pdu, test_id);
btstack_linked_list_iterator_t it;
btstack_linked_list_iterator_init(&it, faults);
while (btstack_linked_list_iterator_has_next(&it)){
mesh_fault_t * fault = (mesh_fault_t *) btstack_linked_list_iterator_next(&it);
if (fault->company_id != company_id) continue;
mesh_access_transport_add_uint8(transport_pdu, fault->test_id);
mesh_access_transport_add_uint16(transport_pdu, fault->company_id);
int i;
for (i = 0; i < fault->num_faults; i++){
mesh_access_transport_add_uint8(transport_pdu, fault->faults[i]);
}
return (mesh_pdu_t *) transport_pdu;
}
// no company with company_id found
mesh_access_transport_add_uint8(transport_pdu, 0);
mesh_access_transport_add_uint16(transport_pdu, company_id);
return (mesh_pdu_t *) transport_pdu;
}
// dynamic
static mesh_pdu_t * health_period_status(mesh_model_t * mesh_model, uint32_t opcode){
mesh_health_state_t * state = (mesh_health_state_t *) mesh_model->model_data;
if (state == NULL){
log_error("health_fault_status state == NULL");
}
// setup message
mesh_transport_pdu_t * transport_pdu = mesh_access_setup_segmented_message(&mesh_foundation_health_period_status, state->fast_period_divisor);
return (mesh_pdu_t *) transport_pdu;
}
static void health_fault_get_handler(mesh_model_t *mesh_model, mesh_pdu_t * pdu){
mesh_access_parser_state_t parser;
mesh_access_parser_init(&parser, (mesh_pdu_t*) pdu);
@ -154,6 +191,7 @@ static void health_fault_test_handler(mesh_model_t *mesh_model, mesh_pdu_t * pdu
if (state == NULL){
log_error("mesh_health_state == NULL");
}
mesh_model->processed_pdu = pdu;
uint8_t event[17 ];
int pos = 0;
@ -179,31 +217,6 @@ static void health_fault_test_handler(mesh_model_t *mesh_model, mesh_pdu_t * pdu
event[1] = pos - 2;
(*mesh_model->model_packet_handler)(HCI_EVENT_PACKET, 0, event, pos);
mesh_access_message_processed(pdu);
}
static mesh_pdu_t * health_fault_status(btstack_linked_list_t * faults, uint32_t opcode, uint8_t test_id, uint16_t company_id){
mesh_transport_pdu_t * transport_pdu = mesh_access_transport_init(opcode);
if (!transport_pdu) return NULL;
mesh_access_transport_add_uint8(transport_pdu, test_id);
btstack_linked_list_iterator_t it;
btstack_linked_list_iterator_init(&it, faults);
while (btstack_linked_list_iterator_has_next(&it)){
mesh_fault_t * fault = (mesh_fault_t *) btstack_linked_list_iterator_next(&it);
if (fault->company_id != company_id) continue;
mesh_access_transport_add_uint8(transport_pdu, fault->test_id);
mesh_access_transport_add_uint16(transport_pdu, fault->company_id);
int i;
for (i = 0; i < fault->num_faults; i++){
mesh_access_transport_add_uint8(transport_pdu, fault->faults[i]);
}
return (mesh_pdu_t *) transport_pdu;
}
// no company with company_id found
mesh_access_transport_add_uint8(transport_pdu, 0);
mesh_access_transport_add_uint16(transport_pdu, company_id);
return (mesh_pdu_t *) transport_pdu;
}
void mesh_health_server_report_test_done(uint16_t element_index, uint16_t dest, uint16_t netkey_index, uint16_t appkey_index, uint8_t test_id, uint16_t company_id){
@ -217,17 +230,30 @@ void mesh_health_server_report_test_done(uint16_t element_index, uint16_t dest,
mesh_transport_pdu_t * transport_pdu = (mesh_transport_pdu_t *) health_fault_status(&state->registered_faults, MESH_FOUNDATION_OPERATION_HEALTH_FAULT_STATUS, test_id, company_id);
if (!transport_pdu) return;
health_server_send_message(element_index, dest, netkey_index, appkey_index, (mesh_pdu_t *) transport_pdu);
mesh_access_message_processed(mesh_model->processed_pdu);
}
static void health_fault_test_unacknowledged_handler(mesh_model_t * mesh_model, mesh_pdu_t * pdu){
health_fault_test_handler(mesh_model, pdu);
mesh_access_message_processed(pdu);
}
static void health_period_get_handler(mesh_model_t *mesh_model, mesh_pdu_t * pdu){
mesh_transport_pdu_t * transport_pdu = (mesh_transport_pdu_t *) health_period_status(mesh_model, MESH_FOUNDATION_OPERATION_HEALTH_PERIOD_STATUS);
if (!transport_pdu) return;
health_server_send_message(mesh_access_get_element_address(mesh_model), mesh_pdu_src(pdu), mesh_pdu_netkey_index(pdu), mesh_pdu_appkey_index(pdu),(mesh_pdu_t *) transport_pdu);
mesh_access_message_processed(pdu);
}
// Health Message
const static mesh_operation_t mesh_health_model_operations[] = {
{ MESH_FOUNDATION_OPERATION_HEALTH_FAULT_GET, 2, health_fault_get_handler },
{ MESH_FOUNDATION_OPERATION_HEALTH_FAULT_CLEAR, 2, health_fault_clear_handler },
{ MESH_FOUNDATION_OPERATION_HEALTH_FAULT_CLEAR_UNACKNOWLEDGED, 2, health_fault_clear_unacknowledged_handler },
{ MESH_FOUNDATION_OPERATION_HEALTH_FAULT_TEST, 3, health_fault_test_handler },
// { MESH_FOUNDATION_OPERATION_HEALTH_FAULT_TEST_UNACKNOWLEDGED, 3, health_fault_test_unacknowledged_handler },
// { MESH_FOUNDATION_OPERATION_HEALTH_FAULT_STATUS_UNACKNOWLEDGED, 3, health_fault_test_status_unacknowledged_handler },
// { MESH_FOUNDATION_OPERATION_HEALTH_PERIOD_GET, 2, health_period_get_handler },
{ MESH_FOUNDATION_OPERATION_HEALTH_FAULT_TEST_UNACKNOWLEDGED, 3, health_fault_test_unacknowledged_handler },
{ MESH_FOUNDATION_OPERATION_HEALTH_PERIOD_GET, 0, health_period_get_handler },
// { MESH_FOUNDATION_OPERATION_HEALTH_PERIOD_SET, 2, health_period_set_handler },
// { MESH_FOUNDATION_OPERATION_HEALTH_PERIOD_SET_UNACKNOWLEDGED, 2, health_period_set_unacknowledged_handler },
// { MESH_FOUNDATION_OPERATION_HEALTH_ATTENTION_GET, 2, health_attention_get_handler },

View File

@ -121,6 +121,8 @@ typedef struct mesh_model {
// packet handler for transition events in server, event callback handler in client
btstack_packet_handler_t model_packet_handler;
// used for asynchronous calls in the done command to unblock the message queue
mesh_pdu_t * processed_pdu;
} mesh_model_t;
typedef struct {