From aa329b08ce821a32f9562d2e2ae126a99190b989 Mon Sep 17 00:00:00 2001 From: lly Date: Fri, 9 Oct 2020 09:27:49 +0800 Subject: [PATCH] ble_mesh: stack: Move device property to model common part --- components/bt/CMakeLists.txt | 2 +- components/bt/component.mk | 1 + .../mesh_models/{server => common}/device_property.c | 0 .../mesh_models/{server => common}/include/device_property.h | 1 + .../bt/esp_ble_mesh/mesh_models/server/include/server_common.h | 2 -- 5 files changed, 3 insertions(+), 3 deletions(-) rename components/bt/esp_ble_mesh/mesh_models/{server => common}/device_property.c (100%) rename components/bt/esp_ble_mesh/mesh_models/{server => common}/include/device_property.h (99%) diff --git a/components/bt/CMakeLists.txt b/components/bt/CMakeLists.txt index a31f11bca..032d9e74b 100644 --- a/components/bt/CMakeLists.txt +++ b/components/bt/CMakeLists.txt @@ -371,12 +371,12 @@ if(CONFIG_BT_ENABLED) "esp_ble_mesh/mesh_core/settings.c" "esp_ble_mesh/mesh_core/test.c" "esp_ble_mesh/mesh_core/transport.c" + "esp_ble_mesh/mesh_models/common/device_property.c" "esp_ble_mesh/mesh_models/client/client_common.c" "esp_ble_mesh/mesh_models/client/generic_client.c" "esp_ble_mesh/mesh_models/client/lighting_client.c" "esp_ble_mesh/mesh_models/client/sensor_client.c" "esp_ble_mesh/mesh_models/client/time_scene_client.c" - "esp_ble_mesh/mesh_models/server/device_property.c" "esp_ble_mesh/mesh_models/server/generic_server.c" "esp_ble_mesh/mesh_models/server/lighting_server.c" "esp_ble_mesh/mesh_models/server/sensor_server.c" diff --git a/components/bt/component.mk b/components/bt/component.mk index 698e2edb7..dcae29a6c 100644 --- a/components/bt/component.mk +++ b/components/bt/component.mk @@ -156,6 +156,7 @@ COMPONENT_SRCDIRS += esp_ble_mesh/mesh_common \ esp_ble_mesh/mesh_core \ esp_ble_mesh/mesh_core/storage \ esp_ble_mesh/btc \ + esp_ble_mesh/mesh_models/common \ esp_ble_mesh/mesh_models/client \ esp_ble_mesh/mesh_models/server \ esp_ble_mesh/api/core \ diff --git a/components/bt/esp_ble_mesh/mesh_models/server/device_property.c b/components/bt/esp_ble_mesh/mesh_models/common/device_property.c similarity index 100% rename from components/bt/esp_ble_mesh/mesh_models/server/device_property.c rename to components/bt/esp_ble_mesh/mesh_models/common/device_property.c diff --git a/components/bt/esp_ble_mesh/mesh_models/server/include/device_property.h b/components/bt/esp_ble_mesh/mesh_models/common/include/device_property.h similarity index 99% rename from components/bt/esp_ble_mesh/mesh_models/server/include/device_property.h rename to components/bt/esp_ble_mesh/mesh_models/common/include/device_property.h index 35bdc34ef..df432f5a1 100644 --- a/components/bt/esp_ble_mesh/mesh_models/server/include/device_property.h +++ b/components/bt/esp_ble_mesh/mesh_models/common/include/device_property.h @@ -213,6 +213,7 @@ extern "C" { /** * @brief BLE Mesh Device Property IDs */ +#define BLE_MESH_INVALID_DEVICE_PROPERTY_ID 0x0000 #define BLE_MESH_AVERAGE_AMBIENT_TEMPERATURE_IN_A_PERIOD_OF_DAY 0x0001 #define BLE_MESH_AVERAGE_INPUT_CURRENT 0x0002 #define BLE_MESH_AVERAGE_INPUT_VOLTAGE 0x0003 diff --git a/components/bt/esp_ble_mesh/mesh_models/server/include/server_common.h b/components/bt/esp_ble_mesh/mesh_models/server/include/server_common.h index 08d6437b8..835940307 100644 --- a/components/bt/esp_ble_mesh/mesh_models/server/include/server_common.h +++ b/components/bt/esp_ble_mesh/mesh_models/server/include/server_common.h @@ -53,8 +53,6 @@ extern "C" { #define BLE_MESH_UNKNOWN_REMAIN_TIME 0x3F #define BLE_MESH_DEVICE_SPECIFIC_RESOLUTION 10 -#define BLE_MESH_INVALID_DEVICE_PROPERTY_ID 0x0000 - enum { BLE_MESH_TRANS_TIMER_START, /* Proper transition timer has been started */ BLE_MESH_TRANS_FLAG_MAX,