From 01bb9da2a4338f3b270e3444954d06d2c5079a21 Mon Sep 17 00:00:00 2001
From: rbaron <rbaron@rbaron.net>
Date: Wed, 7 Dec 2022 21:43:30 +0100
Subject: [PATCH] Cleanups

---
 code/nrf-connect/samples/zigbee/src/main.c           | 12 ++++--------
 .../samples/zigbee/src/{attrs.h => prst_zb_attrs.h}  |  0
 .../{zb_range_extender.h => prst_zb_endpoint_defs.h} |  0
 3 files changed, 4 insertions(+), 8 deletions(-)
 rename code/nrf-connect/samples/zigbee/src/{attrs.h => prst_zb_attrs.h} (100%)
 rename code/nrf-connect/samples/zigbee/src/{zb_range_extender.h => prst_zb_endpoint_defs.h} (100%)

diff --git a/code/nrf-connect/samples/zigbee/src/main.c b/code/nrf-connect/samples/zigbee/src/main.c
index 0f0441f..ca62941 100644
--- a/code/nrf-connect/samples/zigbee/src/main.c
+++ b/code/nrf-connect/samples/zigbee/src/main.c
@@ -21,9 +21,9 @@
 #include <zigbee/zigbee_app_utils.h>
 #include <zigbee/zigbee_error_handler.h>
 
-#include "attrs.h"
+#include "prst_zb_attrs.h"
+#include "prst_zb_endpoint_defs.h"
 #include "prst_zb_soil_moisture_defs.h"
-#include "zb_range_extender.h"
 
 #define PRST_ZIGBEE_ENDPOINT 10
 #define IDENTIFY_MODE_BUTTON DK_BTN4_MSK
@@ -100,10 +100,6 @@ PRST_ZB_ZCL_DECLARE_SOIL_MOISTURE_ATTRIB_LIST(
     soil_moisture_attr_list,
     &dev_ctx.soil_moisture_attrs.percentage);
 
-// ZB_ZCL_DECLARE_TEMP_MEASUREMENT_ATTRIB_LIST2(
-//     soil_moisture_attr_list2,
-//     &dev_ctx.soil_moisture_attrs.percentage);
-
 void prst_zcl_soil_moisture_init_server(void) {
   zb_zcl_add_cluster_handlers(PRST_ZB_ZCL_ATTR_SOIL_MOISTURE_CLUSTER_ID,
                               ZB_ZCL_CLUSTER_SERVER_ROLE,
@@ -261,9 +257,9 @@ void main(void) {
 
   update_sensors_cb(/*arg=*/0);
 
-  zb_bdb_set_legacy_device_support(1);
+  // zb_bdb_set_legacy_device_support(1);
   zigbee_enable();
-  zb_bdb_set_legacy_device_support(1);
+  // zb_bdb_set_legacy_device_support(1);
 
   // zigbee_configure_sleepy_behavior(/*enable=*/true);
 
diff --git a/code/nrf-connect/samples/zigbee/src/attrs.h b/code/nrf-connect/samples/zigbee/src/prst_zb_attrs.h
similarity index 100%
rename from code/nrf-connect/samples/zigbee/src/attrs.h
rename to code/nrf-connect/samples/zigbee/src/prst_zb_attrs.h
diff --git a/code/nrf-connect/samples/zigbee/src/zb_range_extender.h b/code/nrf-connect/samples/zigbee/src/prst_zb_endpoint_defs.h
similarity index 100%
rename from code/nrf-connect/samples/zigbee/src/zb_range_extender.h
rename to code/nrf-connect/samples/zigbee/src/prst_zb_endpoint_defs.h