From 2ed1724fc27dffa779ed1d3b4c5dfaa5d0c1f130 Mon Sep 17 00:00:00 2001 From: lly Date: Thu, 12 Mar 2020 17:48:09 +0800 Subject: [PATCH] ble_mesh: Move dev_role to the end of model_pub --- components/bt/esp_ble_mesh/api/esp_ble_mesh_defs.h | 6 +++--- components/bt/esp_ble_mesh/mesh_core/include/mesh_access.h | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/components/bt/esp_ble_mesh/api/esp_ble_mesh_defs.h b/components/bt/esp_ble_mesh/api/esp_ble_mesh_defs.h index 3a92a12ac..893ac5d24 100644 --- a/components/bt/esp_ble_mesh/api/esp_ble_mesh_defs.h +++ b/components/bt/esp_ble_mesh/api/esp_ble_mesh_defs.h @@ -380,11 +380,11 @@ typedef struct { /** Callback used to update publish message. Initialized by the stack. */ esp_ble_mesh_cb_t update; - /** Role of the device that is going to publish messages */ - uint8_t dev_role; - /** Publish Period Timer. Initialized by the stack. */ struct k_delayed_work timer; + + /** Role of the device that is going to publish messages */ + uint8_t dev_role; } esp_ble_mesh_model_pub_t; /** @def ESP_BLE_MESH_MODEL_PUB_DEFINE diff --git a/components/bt/esp_ble_mesh/mesh_core/include/mesh_access.h b/components/bt/esp_ble_mesh/mesh_core/include/mesh_access.h index 19ba51562..585b5719b 100644 --- a/components/bt/esp_ble_mesh/mesh_core/include/mesh_access.h +++ b/components/bt/esp_ble_mesh/mesh_core/include/mesh_access.h @@ -369,11 +369,11 @@ struct bt_mesh_model_pub { */ int (*update)(struct bt_mesh_model *mod); - /* Change by Espressif, role of the device going to publish messages */ - u8_t dev_role; - /** Publish Period Timer. Only for stack-internal use. */ struct k_delayed_work timer; + + /* Change by Espressif, role of the device going to publish messages */ + u8_t dev_role; }; /** @def BLE_MESH_MODEL_PUB_DEFINE