From 55808ed7e1799946d697f05d410b85134fd5f13f Mon Sep 17 00:00:00 2001
From: rbaron <rbaron@rbaron.net>
Date: Sun, 4 Dec 2022 18:05:07 +0100
Subject: [PATCH] Links prstlib and restructures project to match other samples

---
 .../nrf-connect/samples/zigbee/CMakeLists.txt | 20 +++++++++----------
 code/nrf-connect/samples/zigbee/src/main.c    |  1 +
 .../{include => src}/zb_range_extender.h      |  4 ++++
 .../samples/zigbee/zigbee.code-workspace      | 16 +++++++++++++++
 4 files changed, 31 insertions(+), 10 deletions(-)
 rename code/nrf-connect/samples/zigbee/{include => src}/zb_range_extender.h (98%)
 create mode 100644 code/nrf-connect/samples/zigbee/zigbee.code-workspace

diff --git a/code/nrf-connect/samples/zigbee/CMakeLists.txt b/code/nrf-connect/samples/zigbee/CMakeLists.txt
index 90d0e20..a1bef91 100644
--- a/code/nrf-connect/samples/zigbee/CMakeLists.txt
+++ b/code/nrf-connect/samples/zigbee/CMakeLists.txt
@@ -1,19 +1,19 @@
-#
-# Copyright (c) 2021 Nordic Semiconductor ASA
-#
-# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
-#
-
 cmake_minimum_required(VERSION 3.20.0)
 
+# Pull in the dts/ and boards/ from prstlib.
+set(DTS_ROOT ${CMAKE_CURRENT_SOURCE_DIR}/../../prstlib)
+set(BOARD_ROOT ${CMAKE_CURRENT_SOURCE_DIR}/../../prstlib)
+
 find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
 
-project("Zigbee application template")
+project("b-parasite Zigbee sample")
+
+include_directories(src)
 
-# NORDIC SDK APP START
 target_sources(app PRIVATE
   src/main.c
 )
 
-target_include_directories(app PRIVATE include)
-# NORDIC SDK APP END
+add_subdirectory(../../prstlib prstlib)
+target_include_directories(app PRIVATE ../../prstlib/include)
+target_link_libraries(app PUBLIC prstlib)
\ No newline at end of file
diff --git a/code/nrf-connect/samples/zigbee/src/main.c b/code/nrf-connect/samples/zigbee/src/main.c
index 20af136..1b6b06d 100644
--- a/code/nrf-connect/samples/zigbee/src/main.c
+++ b/code/nrf-connect/samples/zigbee/src/main.c
@@ -10,6 +10,7 @@
  */
 
 #include <dk_buttons_and_leds.h>
+#include <prstlib/adc.h>
 #include <zb_nrf_platform.h>
 #include <zboss_api.h>
 #include <zboss_api_addons.h>
diff --git a/code/nrf-connect/samples/zigbee/include/zb_range_extender.h b/code/nrf-connect/samples/zigbee/src/zb_range_extender.h
similarity index 98%
rename from code/nrf-connect/samples/zigbee/include/zb_range_extender.h
rename to code/nrf-connect/samples/zigbee/src/zb_range_extender.h
index 3165db4..58b9013 100644
--- a/code/nrf-connect/samples/zigbee/include/zb_range_extender.h
+++ b/code/nrf-connect/samples/zigbee/src/zb_range_extender.h
@@ -35,6 +35,10 @@
 /** Number of attribute for reporting on Range extender device */
 #define ZB_RANGE_EXTENDER_REPORT_ATTR_COUNT 0
 
+typedef struct {
+  zb_uint16_t rel_humidity;
+} prst_rel_humidity_t;
+
 #define ZB_DECLARE_RANGE_EXTENDER_CLUSTER_LIST(                             \
     cluster_list_name,                                                      \
     basic_attr_list,                                                        \
diff --git a/code/nrf-connect/samples/zigbee/zigbee.code-workspace b/code/nrf-connect/samples/zigbee/zigbee.code-workspace
new file mode 100644
index 0000000..44c0e47
--- /dev/null
+++ b/code/nrf-connect/samples/zigbee/zigbee.code-workspace
@@ -0,0 +1,16 @@
+{
+	"folders": [
+		{
+			"path": "."
+		},
+		{
+			"path": "../../prstlib"
+		}
+	],
+	"settings": {
+		"C_Cpp.autoAddFileAssociations": false,
+		"nrf-connect.applications": [
+			"${workspaceFolder}"
+		]
+	}
+}
\ No newline at end of file