mirror/btstack
1
0
Fork 0
mirror of https://github.com/bluekitchen/btstack.git synced 2025-01-27 06:35:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

mesh: use element_index instead of element_address in mesh_element_t

Browse Source
This commit is contained in:
Matthias Ringwald 2019-06-14 15:25:07 +02:00
parent 4b924f238a
commit 5c6f2e73f8
3 changed files with 25 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
test/mesh/mesh_access.c
View File

@ -49,7 +49,10 @@
static void mesh_access_message_process_handler(mesh_pdu_t * pdu);
static uint16_t primary_element_address;
static mesh_element_t primary_element;
static uint16_t mesh_element_index_next;
static btstack_linked_list_t mesh_elements;
@ -91,15 +94,15 @@ mesh_element_t * mesh_primary_element(void){
}
void mesh_access_set_primary_element_address(uint16_t unicast_address){
primary_element.unicast_address = unicast_address;
primary_element_address = unicast_address;
}
uint16_t mesh_access_get_primary_element_address(void){
return primary_element.unicast_address;
return primary_element_address;
}
uint8_t mesh_access_get_element_index(mesh_model_t * mesh_model){
return mesh_model->element->unicast_address - mesh_access_get_primary_element_address();
return mesh_model->element->element_index;
}
void mesh_access_set_primary_element_location(uint16_t location){
@ -107,20 +110,30 @@ void mesh_access_set_primary_element_location(uint16_t location){
}
void mesh_element_add(mesh_element_t * element){
element->element_index = mesh_element_index_next++;
btstack_linked_list_add_tail(&mesh_elements, (void*) element);
}
mesh_element_t * mesh_element_for_unicast_address(uint16_t unicast_address){
uint16_t element_index = unicast_address - primary_element_address;
return mesh_element_for_index(element_index);
}
mesh_element_t * mesh_element_for_index(uint16_t element_index){
btstack_linked_list_iterator_t it;
btstack_linked_list_iterator_init(&it, &mesh_elements);
while (btstack_linked_list_iterator_has_next(&it)){
mesh_element_t * element = (mesh_element_t *) btstack_linked_list_iterator_next(&it);
if (element->unicast_address != unicast_address) continue;
if (element->element_index != element_index) continue;
return element;
}
return NULL;
}
uint16_t mesh_access_get_element_address(mesh_model_t * mesh_model){
return primary_element_address + mesh_model->element->element_index;
}
// Model Identifier utilities
uint32_t mesh_model_get_model_identifier(uint16_t vendor_id, uint16_t model_id){

10
test/mesh/mesh_access.h
View File

@ -128,9 +128,9 @@ typedef struct mesh_element {
// linked list item
btstack_linked_item_t item;
// unicast address
uint16_t unicast_address;
// element index
uint16_t element_index;
// LOC
uint16_t loc;
@ -171,8 +171,12 @@ void mesh_element_add(mesh_element_t * element);
uint8_t mesh_access_get_element_index(mesh_model_t * mesh_model);
uint16_t mesh_access_get_element_address(mesh_model_t * mesh_model);
mesh_element_t * mesh_element_for_unicast_address(uint16_t unicast_address);
mesh_element_t * mesh_element_for_index(uint16_t element_index);
void mesh_element_add_model(mesh_element_t * element, mesh_model_t * mesh_model);
// Mesh Element Iterator

2
test/mesh/mesh_generic_server.c
View File

@ -94,7 +94,7 @@ static void mesh_generic_on_off_status_message(mesh_model_t *generic_on_off_serv
if (!transport_pdu) return;
// send as segmented access pdu
generic_server_send_message(generic_on_off_server_model->element->unicast_address, dest, netkey_index, appkey_index, (mesh_pdu_t *) transport_pdu);
generic_server_send_message(mesh_access_get_element_address(generic_on_off_server_model), dest, netkey_index, appkey_index, (mesh_pdu_t *) transport_pdu);
}
static void generic_on_off_get_handler(mesh_model_t *generic_on_off_server_model, mesh_pdu_t * pdu){