samples: bluetooth: mesh: Remove deprecated configs from model handlers

akredalen · nordicjm · commit b8e3ae8702a3 · 2025-09-11T13:21:05.000+01:00
Fixed an issue in some mesh samples where deprecated configs
remained in model handlers but were not enabled in prj.conf.

Updated samples:
- light_ctrl
- light_dimmer
- sensor_client
- sensor_server

Signed-off-by: Stine Åkredalen &lt;stine.akredalen@nordicsemi.no&gt;
diff --git a/samples/bluetooth/mesh/light_ctrl/src/model_handler.c b/samples/bluetooth/mesh/light_ctrl/src/model_handler.c
@@ -21,7 +21,7 @@ struct lightness_ctx {
 	uint32_t rem_time;
 };
 
-#if IS_ENABLED(CONFIG_BT_MESH_NLC_PERF_CONF)
+#if IS_ENABLED(CONFIG_BT_MESH_NLC_PERF_BASELINE)
 static const uint8_t cmp2_elem_offset1[2] = { 0, 1 };
 static const uint8_t cmp2_elem_offset2[1] = { 0 };
 
@@ -272,7 +272,7 @@ void model_handler_start(void)
 {
 	int err;
 
-#if IS_ENABLED(CONFIG_BT_MESH_NLC_PERF_CONF)
+#if IS_ENABLED(CONFIG_BT_MESH_NLC_PERF_BASELINE)
 	if (bt_mesh_comp2_register(&comp_p2)) {
 		printk("Failed to register comp2\n");
 	}
diff --git a/samples/bluetooth/mesh/light_dimmer/src/model_handler.c b/samples/bluetooth/mesh/light_dimmer/src/model_handler.c
@@ -51,7 +51,7 @@ struct scene_btn_ctx {
 	int64_t press_start_time;
 };
 
-#if IS_ENABLED(CONFIG_BT_MESH_NLC_PERF_CONF)
+#if IS_ENABLED(CONFIG_BT_MESH_NLC_PERF_BASELINE)
 static const uint8_t cmp2_elem_offset[1] = { 0 };
 
 static const struct bt_mesh_comp2_record comp_rec[2] = {
@@ -306,7 +306,7 @@ static const struct bt_mesh_comp comp = {
 
 const struct bt_mesh_comp *model_handler_init(void)
 {
-#if IS_ENABLED(CONFIG_BT_MESH_NLC_PERF_CONF)
+#if IS_ENABLED(CONFIG_BT_MESH_NLC_PERF_BASELINE)
 	if (bt_mesh_comp2_register(&comp_p2)) {
 		printf("Failed to register comp2\n");
 	}
diff --git a/samples/bluetooth/mesh/sensor_client/src/model_handler.c b/samples/bluetooth/mesh/sensor_client/src/model_handler.c
@@ -142,7 +142,7 @@ static const struct bt_mesh_sensor_cli_handlers bt_mesh_sensor_cli_handlers = {
 static struct bt_mesh_sensor_cli sensor_cli =
 	BT_MESH_SENSOR_CLI_INIT(&bt_mesh_sensor_cli_handlers);
 
-#if IS_ENABLED(CONFIG_BT_MESH_NLC_PERF_CONF)
+#if IS_ENABLED(CONFIG_BT_MESH_NLC_PERF_BASELINE)
 /* HVAC Integration NLC Profile composition data page 2 */
 static const uint8_t cmp2_elem_offset_hvac[1]; /* Profile uses element 0 */
 
@@ -380,7 +380,7 @@ static const struct bt_mesh_comp comp = {
 
 const struct bt_mesh_comp *model_handler_init(void)
 {
-#if IS_ENABLED(CONFIG_BT_MESH_NLC_PERF_CONF)
+#if IS_ENABLED(CONFIG_BT_MESH_NLC_PERF_BASELINE)
 	if (bt_mesh_comp2_register(&comp_p2)) {
 		printk("Failed to register comp2\n");
 	}
diff --git a/samples/bluetooth/mesh/sensor_server/src/model_handler.c b/samples/bluetooth/mesh/sensor_server/src/model_handler.c
@@ -89,7 +89,7 @@ static uint32_t prev_pres_detect;
 
 static uint32_t prev_mot_sensed;
 
-#if IS_ENABLED(CONFIG_BT_MESH_NLC_PERF_CONF)
+#if IS_ENABLED(CONFIG_BT_MESH_NLC_PERF_BASELINE)
 static const uint8_t cmp2_elem_offset_ambient_light[1] = { 0 };
 static const uint8_t cmp2_elem_offset_presence[1] = { 1 };
 static const uint8_t cmp2_elem_offset_motion[1] = { 2 };
@@ -1085,7 +1085,7 @@ static const struct bt_mesh_comp comp = {
 
 const struct bt_mesh_comp *model_handler_init(void)
 {
-#if IS_ENABLED(CONFIG_BT_MESH_NLC_PERF_CONF)
+#if IS_ENABLED(CONFIG_BT_MESH_NLC_PERF_BASELINE)
 	if (bt_mesh_comp2_register(&comp_p2)) {
 		printf("Failed to register comp2\n");
 	}

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ struct lightness_ctx {`
`21`	`21`	`uint32_t rem_time;`
`22`	`22`	`};`
`23`	`23`
`24`		`-#if IS_ENABLED(CONFIG_BT_MESH_NLC_PERF_CONF)`
	`24`	`+#if IS_ENABLED(CONFIG_BT_MESH_NLC_PERF_BASELINE)`
`25`	`25`	`static const uint8_t cmp2_elem_offset1[2] = { 0, 1 };`
`26`	`26`	`static const uint8_t cmp2_elem_offset2[1] = { 0 };`
`27`	`27`
`@@ -272,7 +272,7 @@ void model_handler_start(void)`
`272`	`272`	`{`
`273`	`273`	`int err;`
`274`	`274`
`275`		`-#if IS_ENABLED(CONFIG_BT_MESH_NLC_PERF_CONF)`
	`275`	`+#if IS_ENABLED(CONFIG_BT_MESH_NLC_PERF_BASELINE)`
`276`	`276`	`if (bt_mesh_comp2_register(&comp_p2)) {`
`277`	`277`	`printk("Failed to register comp2\n");`
`278`	`278`	`}`
Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ struct scene_btn_ctx {`
`51`	`51`	`int64_t press_start_time;`
`52`	`52`	`};`
`53`	`53`
`54`		`-#if IS_ENABLED(CONFIG_BT_MESH_NLC_PERF_CONF)`
	`54`	`+#if IS_ENABLED(CONFIG_BT_MESH_NLC_PERF_BASELINE)`
`55`	`55`	`static const uint8_t cmp2_elem_offset[1] = { 0 };`
`56`	`56`
`57`	`57`	`static const struct bt_mesh_comp2_record comp_rec[2] = {`
`@@ -306,7 +306,7 @@ static const struct bt_mesh_comp comp = {`
`306`	`306`
`307`	`307`	`const struct bt_mesh_comp *model_handler_init(void)`
`308`	`308`	`{`
`309`		`-#if IS_ENABLED(CONFIG_BT_MESH_NLC_PERF_CONF)`
	`309`	`+#if IS_ENABLED(CONFIG_BT_MESH_NLC_PERF_BASELINE)`
`310`	`310`	`if (bt_mesh_comp2_register(&comp_p2)) {`
`311`	`311`	`printf("Failed to register comp2\n");`
`312`	`312`	`}`
Original file line number	Diff line number	Diff line change
`@@ -142,7 +142,7 @@ static const struct bt_mesh_sensor_cli_handlers bt_mesh_sensor_cli_handlers = {`
`142`	`142`	`static struct bt_mesh_sensor_cli sensor_cli =`
`143`	`143`	`BT_MESH_SENSOR_CLI_INIT(&bt_mesh_sensor_cli_handlers);`
`144`	`144`
`145`		`-#if IS_ENABLED(CONFIG_BT_MESH_NLC_PERF_CONF)`
	`145`	`+#if IS_ENABLED(CONFIG_BT_MESH_NLC_PERF_BASELINE)`
`146`	`146`	`/* HVAC Integration NLC Profile composition data page 2 */`
`147`	`147`	`static const uint8_t cmp2_elem_offset_hvac[1]; /* Profile uses element 0 */`
`148`	`148`
`@@ -380,7 +380,7 @@ static const struct bt_mesh_comp comp = {`
`380`	`380`
`381`	`381`	`const struct bt_mesh_comp *model_handler_init(void)`
`382`	`382`	`{`
`383`		`-#if IS_ENABLED(CONFIG_BT_MESH_NLC_PERF_CONF)`
	`383`	`+#if IS_ENABLED(CONFIG_BT_MESH_NLC_PERF_BASELINE)`
`384`	`384`	`if (bt_mesh_comp2_register(&comp_p2)) {`
`385`	`385`	`printk("Failed to register comp2\n");`
`386`	`386`	`}`
Original file line number	Diff line number	Diff line change
`@@ -89,7 +89,7 @@ static uint32_t prev_pres_detect;`
`89`	`89`
`90`	`90`	`static uint32_t prev_mot_sensed;`
`91`	`91`
`92`		`-#if IS_ENABLED(CONFIG_BT_MESH_NLC_PERF_CONF)`
	`92`	`+#if IS_ENABLED(CONFIG_BT_MESH_NLC_PERF_BASELINE)`
`93`	`93`	`static const uint8_t cmp2_elem_offset_ambient_light[1] = { 0 };`
`94`	`94`	`static const uint8_t cmp2_elem_offset_presence[1] = { 1 };`
`95`	`95`	`static const uint8_t cmp2_elem_offset_motion[1] = { 2 };`
`@@ -1085,7 +1085,7 @@ static const struct bt_mesh_comp comp = {`
`1085`	`1085`
`1086`	`1086`	`const struct bt_mesh_comp *model_handler_init(void)`
`1087`	`1087`	`{`
`1088`		`-#if IS_ENABLED(CONFIG_BT_MESH_NLC_PERF_CONF)`
	`1088`	`+#if IS_ENABLED(CONFIG_BT_MESH_NLC_PERF_BASELINE)`
`1089`	`1089`	`if (bt_mesh_comp2_register(&comp_p2)) {`
`1090`	`1090`	`printf("Failed to register comp2\n");`
`1091`	`1091`	`}`