From 264f8e120e529c29cf9034e6a2810ba1c91720d6 Mon Sep 17 00:00:00 2001 From: Matthias Ringwald Date: Fri, 12 Jul 2019 15:57:47 +0200 Subject: [PATCH] mesh: mesh_proxy_start_advertising_unprovisioned_device gets device uuid from mesh_node --- test/mesh/mesh.c | 4 ++-- test/mesh/mesh_access.c | 2 +- test/mesh/mesh_proxy.c | 3 ++- test/mesh/mesh_proxy.h | 3 +-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/test/mesh/mesh.c b/test/mesh/mesh.c index 76365f94f..00f03def2 100644 --- a/test/mesh/mesh.c +++ b/test/mesh/mesh.c @@ -160,7 +160,7 @@ static void packet_handler (uint8_t packet_type, uint16_t channel, uint8_t *pack // enable PB_GATT if (provisioned == 0){ printf("Advertise Mesh Provisiong Service with Device UUID\n"); - mesh_proxy_start_advertising_unprovisioned_device(mesh_node_get_device_uuid()); + mesh_proxy_start_advertising_unprovisioned_device(); } else { #ifdef ENABLE_MESH_PROXY_SERVER printf("Advertise Mesh Proxy Service with Network ID\n"); @@ -572,7 +572,7 @@ static void stdin_process(char cmd){ case '8': mesh_node_reset(); printf("Mesh Node Reset!\n"); - mesh_proxy_start_advertising_unprovisioned_device(mesh_node_get_device_uuid()); + mesh_proxy_start_advertising_unprovisioned_device(); break; case 'p': printf("+ Public Key OOB Enabled\n"); diff --git a/test/mesh/mesh_access.c b/test/mesh/mesh_access.c index 537823072..cd40e9151 100644 --- a/test/mesh/mesh_access.c +++ b/test/mesh/mesh_access.c @@ -1745,7 +1745,7 @@ void mesh_access_setup_without_provisiong_data(void){ beacon_unprovisioned_device_start(device_uuid, 0); #endif #ifdef ENABLE_MESH_PB_GATT - mesh_proxy_start_advertising_unprovisioned_device(device_uuid); + mesh_proxy_start_advertising_unprovisioned_device(); #endif } diff --git a/test/mesh/mesh_proxy.c b/test/mesh/mesh_proxy.c index dd0c1def2..92e0df347 100644 --- a/test/mesh/mesh_proxy.c +++ b/test/mesh/mesh_proxy.c @@ -124,7 +124,8 @@ static void mesh_proxy_setup_advertising_unprovisioned(adv_bearer_connectable_ad little_endian_store_16(advertisement_item->adv_data, 27, 0); } -void mesh_proxy_start_advertising_unprovisioned_device(const uint8_t * device_uuid){ +void mesh_proxy_start_advertising_unprovisioned_device(void){ + const uint8_t * device_uuid = mesh_node_get_device_uuid(); mesh_proxy_setup_advertising_unprovisioned(&connectable_advertisement, device_uuid); // setup advertisements adv_bearer_advertisements_add_item(&connectable_advertisement); diff --git a/test/mesh/mesh_proxy.h b/test/mesh/mesh_proxy.h index 62d4f9072..71cac50bb 100644 --- a/test/mesh/mesh_proxy.h +++ b/test/mesh/mesh_proxy.h @@ -60,9 +60,8 @@ void mesh_proxy_init(uint16_t primary_unicast_address); /** * @brief Start Advertising Unprovisioned Device with Device ID - * @param device_uuid */ -void mesh_proxy_start_advertising_unprovisioned_device(const uint8_t * device_uuid); +void mesh_proxy_start_advertising_unprovisioned_device(void); /** * @brief Start Advertising Unprovisioned Device with Device ID