From 077413a696f60b29018d1a0f4cca1162cb4b524f Mon Sep 17 00:00:00 2001 From: alperen sener Date: Thu, 19 Dec 2024 12:00:02 +0100 Subject: [PATCH] samples: bluetooth: mesh: Update NLC profile versions to 1.0.1 Updating composition data page 2 records with supported latest NLC profile version. Signed-off-by: alperen sener --- .../mesh/light_ctrl/src/model_handler.c | 10 +++++----- .../mesh/light_dimmer/src/model_handler.c | 8 ++++---- .../mesh/sensor_server/src/model_handler.c | 16 ++++++++-------- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/samples/bluetooth/mesh/light_ctrl/src/model_handler.c b/samples/bluetooth/mesh/light_ctrl/src/model_handler.c index c5f1bbd222e1..225729a2b9e4 100644 --- a/samples/bluetooth/mesh/light_ctrl/src/model_handler.c +++ b/samples/bluetooth/mesh/light_ctrl/src/model_handler.c @@ -26,20 +26,20 @@ static const uint8_t cmp2_elem_offset1[2] = { 0, 1 }; static const uint8_t cmp2_elem_offset2[1] = { 0 }; static const struct bt_mesh_comp2_record comp_rec[2] = { - { + {/* Basic Lightness Controller NLC Profile 1.0.1 */ .id = BT_MESH_NLC_PROFILE_ID_BASIC_LIGHTNESS_CONTROLLER, .version.x = 1, .version.y = 0, - .version.z = 0, + .version.z = 1, .elem_offset_cnt = 2, .elem_offset = cmp2_elem_offset1, .data_len = 0 }, - { - .id = BT_MESH_NLC_PROFILE_ID_ENERGY_MONITOR, /* Energy Monitor NLC Profile 1.0 */ + { /* Energy Monitor NLC Profile 1.0.1 */ + .id = BT_MESH_NLC_PROFILE_ID_ENERGY_MONITOR, .version.x = 1, .version.y = 0, - .version.z = 0, + .version.z = 1, .elem_offset_cnt = 1, .elem_offset = cmp2_elem_offset2, .data_len = 0 diff --git a/samples/bluetooth/mesh/light_dimmer/src/model_handler.c b/samples/bluetooth/mesh/light_dimmer/src/model_handler.c index ba2decb590c5..8d5d054fa6b8 100644 --- a/samples/bluetooth/mesh/light_dimmer/src/model_handler.c +++ b/samples/bluetooth/mesh/light_dimmer/src/model_handler.c @@ -55,20 +55,20 @@ struct scene_btn_ctx { static const uint8_t cmp2_elem_offset[1] = { 0 }; static const struct bt_mesh_comp2_record comp_rec[2] = { - { + {/* Basic Scene Selector NLC Profile 1.0.1*/ .id = BT_MESH_NLC_PROFILE_ID_BASIC_SCENE_SELECTOR, .version.x = 1, .version.y = 0, - .version.z = 0, + .version.z = 1, .elem_offset_cnt = 1, .elem_offset = cmp2_elem_offset, .data_len = 0 }, - { + {/* Dimming Control NLC Profile 1.0.1 */ .id = BT_MESH_NLC_PROFILE_ID_DIMMING_CONTROL, .version.x = 1, .version.y = 0, - .version.z = 0, + .version.z = 1, .elem_offset_cnt = 1, .elem_offset = cmp2_elem_offset, .data_len = 0 diff --git a/samples/bluetooth/mesh/sensor_server/src/model_handler.c b/samples/bluetooth/mesh/sensor_server/src/model_handler.c index 848fb794a0b2..730f485a2ecd 100644 --- a/samples/bluetooth/mesh/sensor_server/src/model_handler.c +++ b/samples/bluetooth/mesh/sensor_server/src/model_handler.c @@ -96,38 +96,38 @@ static const uint8_t cmp2_elem_offset_motion[1] = { 2 }; static const uint8_t cmp2_elem_offset_people_count[1] = { 3 }; static const struct bt_mesh_comp2_record comp_rec[4] = { - { + {/* Ambient Light Sensor NLC Profile 1.0.1 */ .id = BT_MESH_NLC_PROFILE_ID_AMBIENT_LIGHT_SENSOR, .version.x = 1, .version.y = 0, - .version.z = 0, + .version.z = 1, .elem_offset_cnt = 1, .elem_offset = cmp2_elem_offset_ambient_light, .data_len = 0 }, - { + {/* Occupancy Sensor NLC Profile 1.0.1 */ .id = BT_MESH_NLC_PROFILE_ID_OCCUPANCY_SENSOR, .version.x = 1, .version.y = 0, - .version.z = 0, + .version.z = 1, .elem_offset_cnt = 1, .elem_offset = cmp2_elem_offset_presence, .data_len = 0 }, - { + {/* Occupancy Sensor NLC Profile 1.0.1 */ .id = BT_MESH_NLC_PROFILE_ID_OCCUPANCY_SENSOR, .version.x = 1, .version.y = 0, - .version.z = 0, + .version.z = 1, .elem_offset_cnt = 1, .elem_offset = cmp2_elem_offset_motion, .data_len = 0 }, - { + {/* Occupancy Sensor NLC Profile 1.0.1 */ .id = BT_MESH_NLC_PROFILE_ID_OCCUPANCY_SENSOR, .version.x = 1, .version.y = 0, - .version.z = 0, + .version.z = 1, .elem_offset_cnt = 1, .elem_offset = cmp2_elem_offset_people_count, .data_len = 0