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

mesh: health server health_fault_get_handler

Browse Source
This commit is contained in:
Milanka Ringwald 2019-07-11 11:23:26 +02:00 committed by Matthias Ringwald
parent 9a85ed86d6
commit a0f170a870
3 changed files with 11 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
test/mesh/mesh_access.h
View File

@ -178,10 +178,6 @@ typedef struct {
uint8_t faults[MESH_MAX_NUM_FAULTS]; uint8_t faults[MESH_MAX_NUM_FAULTS];
} mesh_fault_t; } mesh_fault_t;
typedef struct {
btstack_linked_list_t faults;
} mesh_health_state_t;
typedef struct mesh_element { typedef struct mesh_element {
// linked list item // linked list item
btstack_linked_item_t item; btstack_linked_item_t item;

5
test/mesh/mesh_generic_model.h
View File

@ -85,6 +85,11 @@ typedef struct {
mesh_transition_int16_t transition_data; mesh_transition_int16_t transition_data;
} mesh_generic_level_state_t; } mesh_generic_level_state_t;
typedef struct {
btstack_linked_list_t current_faults;
btstack_linked_list_t registered_faults;
} mesh_health_state_t;
#ifdef __cplusplus #ifdef __cplusplus
} /* end of extern "C" */ } /* end of extern "C" */
#endif #endif

28
test/mesh/mesh_health_server.c
View File

@ -40,6 +40,7 @@
#include <string.h> #include <string.h>
#include <stdio.h> #include <stdio.h>
#include "mesh_generic_server.h" #include "mesh_generic_server.h"
#include "mesh_generic_model.h"
#include "btstack_util.h" #include "btstack_util.h"
#include "mesh_health_server.h" #include "mesh_health_server.h"
#include "mesh/mesh_network.h" #include "mesh/mesh_network.h"
@ -51,10 +52,10 @@
#include "btstack_memory.h" #include "btstack_memory.h"
#include "btstack_debug.h" #include "btstack_debug.h"
static void health_server_send_message(uint16_t src, uint16_t dest, uint16_t netkey_index, uint16_t appkey_index, mesh_pdu_t *pdu){ static void health_server_send_message(uint16_t src, uint16_t dest, uint16_t netkey_index, uint16_t appkey_index, mesh_pdu_t *pdu, uint32_t ack_opcode){
uint8_t ttl = mesh_foundation_default_ttl_get(); uint8_t ttl = mesh_foundation_default_ttl_get();
mesh_upper_transport_setup_access_pdu_header(pdu, netkey_index, appkey_index, ttl, src, dest, 0); mesh_upper_transport_setup_access_pdu_header(pdu, netkey_index, appkey_index, ttl, src, dest, 0);
mesh_upper_transport_send_access_pdu(pdu); mesh_access_send_acknowledged_pdu(pdu, mesh_access_acknowledged_message_retransmissions(), ack_opcode);
} }
// Health State // Health State
const mesh_access_message_t mesh_foundation_health_period_status = { const mesh_access_message_t mesh_foundation_health_period_status = {
@ -65,15 +66,6 @@ const mesh_access_message_t mesh_foundation_health_attention_status = {
MESH_FOUNDATION_OPERATION_ATTENTION_STATUS, "1" MESH_FOUNDATION_OPERATION_ATTENTION_STATUS, "1"
}; };
// typedef struct {
// // linked list item
// btstack_linked_item_t item;
// uint8_t test_id;
// uint16_t company_id;
// uint16_t num_faults;
// uint8_t faults[MESH_MAX_NUM_FAULTS];
// } mesh_fault_t;
static mesh_pdu_t * health_status(mesh_model_t * mesh_model, uint32_t opcode, uint16_t company_id){ static mesh_pdu_t * health_status(mesh_model_t * mesh_model, uint32_t opcode, uint16_t company_id){
if (mesh_model->element == NULL){ if (mesh_model->element == NULL){
log_error("mesh_model->element == NULL"); log_error("mesh_model->element == NULL");
@ -88,7 +80,7 @@ static mesh_pdu_t * health_status(mesh_model_t * mesh_model, uint32_t opcode, ui
if (!transport_pdu) return NULL; if (!transport_pdu) return NULL;
btstack_linked_list_iterator_t it; btstack_linked_list_iterator_t it;
btstack_linked_list_iterator_init(&it, &state->faults); btstack_linked_list_iterator_init(&it, &state->registered_faults);
while (btstack_linked_list_iterator_has_next(&it)){ while (btstack_linked_list_iterator_has_next(&it)){
mesh_fault_t * fault = (mesh_fault_t *) btstack_linked_list_iterator_next(&it); mesh_fault_t * fault = (mesh_fault_t *) btstack_linked_list_iterator_next(&it);
if (fault->company_id != company_id) continue; if (fault->company_id != company_id) continue;
@ -106,22 +98,14 @@ static mesh_pdu_t * health_status(mesh_model_t * mesh_model, uint32_t opcode, ui
return (mesh_pdu_t *) transport_pdu; return (mesh_pdu_t *) transport_pdu;
} }
// static mesh_pdu_t * health_current_status(mesh_model_t * mesh_model){
// return health_status(mesh_model, MESH_FOUNDATION_OPERATION_HEALTH_CURRENT_STATUS);
// }
static mesh_pdu_t * mesh_health_fault_status_message(mesh_model_t * mesh_model, uint16_t cid){
return health_status(mesh_model, MESH_FOUNDATION_OPERATION_HEALTH_FAULT_STATUS, cid);
}
static void health_fault_get_handler(mesh_model_t *mesh_model, mesh_pdu_t * 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_state_t parser;
mesh_access_parser_init(&parser, (mesh_pdu_t*) pdu); mesh_access_parser_init(&parser, (mesh_pdu_t*) pdu);
uint16_t cid = mesh_access_parser_get_u16(&parser); uint16_t cid = mesh_access_parser_get_u16(&parser);
mesh_transport_pdu_t * transport_pdu = (mesh_transport_pdu_t *) mesh_health_fault_status_message(mesh_model, cid); mesh_transport_pdu_t * transport_pdu = (mesh_transport_pdu_t *) health_status(mesh_model, MESH_FOUNDATION_OPERATION_HEALTH_FAULT_STATUS, cid);
if (!transport_pdu) return; 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); 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_FOUNDATION_OPERATION_HEALTH_FAULT_STATUS);
mesh_access_message_processed(pdu); mesh_access_message_processed(pdu);
} }