From 460082dcd501aac9a335801c6e5fb5d997c33b56 Mon Sep 17 00:00:00 2001 From: Matthias Ringwald Date: Fri, 19 Jul 2019 18:03:14 +0200 Subject: [PATCH] mesh: fix warnings --- src/mesh/mesh.h | 1 - src/mesh/mesh_network.c | 2 +- src/mesh/mesh_node.h | 2 ++ 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/mesh/mesh.h b/src/mesh/mesh.h index dae04a71d..de4ba4c57 100644 --- a/src/mesh/mesh.h +++ b/src/mesh/mesh.h @@ -94,7 +94,6 @@ void mesh_load_app_keys(void); // Mesh Model to Appkey List void mesh_load_appkey_lists(void); void mesh_delete_appkey_lists(void); -void mesh_model_reset_appkeys(mesh_model_t * mesh_model); uint8_t mesh_model_bind_appkey(mesh_model_t * mesh_model, uint16_t appkey_index); void mesh_model_unbind_appkey(mesh_model_t * mesh_model, uint16_t appkey_index); int mesh_model_contains_appkey(mesh_model_t * mesh_model, uint16_t appkey_index); diff --git a/src/mesh/mesh_network.c b/src/mesh/mesh_network.c index 159583f2b..6b006e7b1 100644 --- a/src/mesh/mesh_network.c +++ b/src/mesh/mesh_network.c @@ -725,7 +725,7 @@ static void mesh_adv_bearer_handle_network_event(uint8_t packet_type, uint16_t c transmission_interval = (transmit_config >> 3) * 10; #ifdef LOG_NETWORK - printf("TX-E-NetworkPDU count %u, interval %u ms (%p): ", adv_bearer_network_pdu, transmission_count, transmission_interval); + printf("TX-E-NetworkPDU (%p) count %u, interval %u ms (%p): ", adv_bearer_network_pdu, transmission_count, transmission_interval); printf_hexdump(adv_bearer_network_pdu->data, adv_bearer_network_pdu->len); #endif diff --git a/src/mesh/mesh_node.h b/src/mesh/mesh_node.h index f7798da75..25c9bb3e2 100644 --- a/src/mesh/mesh_node.h +++ b/src/mesh/mesh_node.h @@ -257,6 +257,8 @@ mesh_model_t * mesh_model_get_configuration_server(void); mesh_model_t * mesh_access_model_for_address_and_model_identifier(uint16_t element_address, uint32_t model_identifier, uint8_t * status); +void mesh_model_reset_appkeys(mesh_model_t * mesh_model); + // Mesh Model Subscriptions int mesh_model_contains_subscription(mesh_model_t * mesh_model, uint16_t address);