alex/esp-idf
alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2024-10-05 20:47:46 -04:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

ble_mesh: stack: Move device property to model common part

Browse Source
This commit is contained in:
lly 2020-10-09 09:27:49 +08:00 committed by bot
parent e877d96ee2
commit 10a618e7b2
5 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/bt/CMakeLists.txt
View File

@ -389,12 +389,12 @@ if(CONFIG_BT_ENABLED)
"esp_ble_mesh/mesh_core/settings.c" "esp_ble_mesh/mesh_core/settings.c"
"esp_ble_mesh/mesh_core/test.c" "esp_ble_mesh/mesh_core/test.c"
"esp_ble_mesh/mesh_core/transport.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/client_common.c"
"esp_ble_mesh/mesh_models/client/generic_client.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/lighting_client.c"
"esp_ble_mesh/mesh_models/client/sensor_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/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/generic_server.c"
"esp_ble_mesh/mesh_models/server/lighting_server.c" "esp_ble_mesh/mesh_models/server/lighting_server.c"
"esp_ble_mesh/mesh_models/server/sensor_server.c" "esp_ble_mesh/mesh_models/server/sensor_server.c"

1
components/bt/component.mk
View File

@ -154,6 +154,7 @@ COMPONENT_SRCDIRS += esp_ble_mesh/mesh_common \
esp_ble_mesh/mesh_core \ esp_ble_mesh/mesh_core \
esp_ble_mesh/mesh_core/storage \ esp_ble_mesh/mesh_core/storage \
esp_ble_mesh/btc \ esp_ble_mesh/btc \
esp_ble_mesh/mesh_models/common \
esp_ble_mesh/mesh_models/client \ esp_ble_mesh/mesh_models/client \
esp_ble_mesh/mesh_models/server \ esp_ble_mesh/mesh_models/server \
esp_ble_mesh/api/core \ esp_ble_mesh/api/core \

0
components/bt/esp_ble_mesh/mesh_models/server/device_property.c → components/bt/esp_ble_mesh/mesh_models/common/device_property.c
View File

1
components/bt/esp_ble_mesh/mesh_models/server/include/device_property.h → components/bt/esp_ble_mesh/mesh_models/common/include/device_property.h
View File

@ -213,6 +213,7 @@ extern "C" {
/** /**
* @brief BLE Mesh Device Property IDs * @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_AMBIENT_TEMPERATURE_IN_A_PERIOD_OF_DAY 0x0001
#define BLE_MESH_AVERAGE_INPUT_CURRENT 0x0002 #define BLE_MESH_AVERAGE_INPUT_CURRENT 0x0002
#define BLE_MESH_AVERAGE_INPUT_VOLTAGE 0x0003 #define BLE_MESH_AVERAGE_INPUT_VOLTAGE 0x0003

2
components/bt/esp_ble_mesh/mesh_models/server/include/server_common.h
View File

@ -53,8 +53,6 @@ extern "C" {
#define BLE_MESH_UNKNOWN_REMAIN_TIME 0x3F #define BLE_MESH_UNKNOWN_REMAIN_TIME 0x3F
#define BLE_MESH_DEVICE_SPECIFIC_RESOLUTION 10 #define BLE_MESH_DEVICE_SPECIFIC_RESOLUTION 10
#define BLE_MESH_INVALID_DEVICE_PROPERTY_ID 0x0000
enum { enum {
BLE_MESH_TRANS_TIMER_START, /* Proper transition timer has been started */ BLE_MESH_TRANS_TIMER_START, /* Proper transition timer has been started */
BLE_MESH_TRANS_FLAG_MAX, BLE_MESH_TRANS_FLAG_MAX,