From 7dcd4bfe53f62076ec3119826fad65f1db86be1f Mon Sep 17 00:00:00 2001
From: Ole Odendahl <oleodendahl@gmail.com>
Date: Wed, 1 May 2024 17:28:41 +0200
Subject: [PATCH] Moving toggled settings to Kconfig for ota updates.

---
 code/nrf-connect/samples/zigbee/Kconfig  | 36 ++++++++++++++++++++++++
 code/nrf-connect/samples/zigbee/prj.conf | 12 --------
 2 files changed, 36 insertions(+), 12 deletions(-)

diff --git a/code/nrf-connect/samples/zigbee/Kconfig b/code/nrf-connect/samples/zigbee/Kconfig
index 6fbb42a..237488f 100644
--- a/code/nrf-connect/samples/zigbee/Kconfig
+++ b/code/nrf-connect/samples/zigbee/Kconfig
@@ -42,3 +42,39 @@ endchoice  # PRST_ZB_FACTORY_RESET_METHOD
 config PRST_ZB_RESTART_WATCHDOG_TIMEOUT_SEC
     int "Duration after the device will restart the rejoin procedure if a network has not been successfully joined."
     default 3600
+
+if ZIGBEE_FOTA
+
+config ZIGBEE_FOTA_ENDPOINT
+    int "Endpoint number for ota zigbee endpoint. Must not be used by another application."
+    default 5
+
+config ZIGBEE_FOTA_COMMENT
+    string
+    default "b-parasite"
+
+config IMG_MANAGER
+    bool "Ensure an MCUboot-compatible binary for ota update is generated."
+    default y
+
+config STREAM_FLASH
+    bool
+    default y
+
+config DFU_TARGET_MCUBOOT
+    bool
+    default y
+
+config IMG_ERASE_PROGRESSIVELY
+    bool
+    default y
+
+config ZIGBEE_FOTA_PROGRESS_EVT
+    bool
+    default y
+
+config NRF_802154_RX_BUFFERS
+    int "Increase the number of RX buffers for ota functionality."
+    default 32
+
+endif
diff --git a/code/nrf-connect/samples/zigbee/prj.conf b/code/nrf-connect/samples/zigbee/prj.conf
index 321ca6f..9dbefe1 100644
--- a/code/nrf-connect/samples/zigbee/prj.conf
+++ b/code/nrf-connect/samples/zigbee/prj.conf
@@ -74,16 +74,4 @@ CONFIG_ASSERT=y
 
 # OTA update configuration. This is based on the zigbee light switch example from the nrf-connect toolkit.
 CONFIG_ZIGBEE_FOTA=n
-CONFIG_ZIGBEE_FOTA_ENDPOINT=5
 CONFIG_MCUBOOT_IMGTOOL_SIGN_VERSION="1.0.0" # Increase this version for generating an update for the devices.
-CONFIG_ZIGBEE_FOTA_COMMENT="b_parasite"
-
-# Ensure an MCUboot-compatible binary for ota update is generated.
-CONFIG_IMG_MANAGER=y
-CONFIG_STREAM_FLASH=y
-CONFIG_DFU_TARGET_MCUBOOT=y
-CONFIG_IMG_ERASE_PROGRESSIVELY=y
-CONFIG_ZIGBEE_FOTA_PROGRESS_EVT=y
-
-# Increase the number of RX buffers, as suggested by zigbee ota sample.
-CONFIG_NRF_802154_RX_BUFFERS=32