From 4bb9a97daaa991e39e368956cc04d98a36d7bee0 Mon Sep 17 00:00:00 2001
From: Ole Odendahl <oleodendahl@gmail.com>
Date: Wed, 1 May 2024 16:57:24 +0200
Subject: [PATCH] Added ota config parameters to main prj.conf. Toggle default
 is set to `n` for now. Removed obsolete prj_ota.conf file.

---
 code/nrf-connect/samples/zigbee/prj.conf     | 17 ++++
 code/nrf-connect/samples/zigbee/prj_ota.conf | 89 --------------------
 2 files changed, 17 insertions(+), 89 deletions(-)
 delete mode 100644 code/nrf-connect/samples/zigbee/prj_ota.conf

diff --git a/code/nrf-connect/samples/zigbee/prj.conf b/code/nrf-connect/samples/zigbee/prj.conf
index 9e20278..321ca6f 100644
--- a/code/nrf-connect/samples/zigbee/prj.conf
+++ b/code/nrf-connect/samples/zigbee/prj.conf
@@ -70,3 +70,20 @@ CONFIG_ASSERT=y
 # Factory reset method selection. Only hardware revision 2.0.0+ has button SW1. Earlier
 # revisions must select a different method. See Kconfig for options.
 # CONFIG_PRST_ZB_FACTORY_RESET_VIA_SW1=y
+## OTA section
+
+# 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
diff --git a/code/nrf-connect/samples/zigbee/prj_ota.conf b/code/nrf-connect/samples/zigbee/prj_ota.conf
deleted file mode 100644
index 4a10f2f..0000000
--- a/code/nrf-connect/samples/zigbee/prj_ota.conf
+++ /dev/null
@@ -1,89 +0,0 @@
-
-CONFIG_LOG=y
-CONFIG_PWM=y
-CONFIG_I2C=y
-CONFIG_ADC=y
-CONFIG_GPIO=y
-
-CONFIG_USE_SEGGER_RTT=y
-CONFIG_SEGGER_RTT_BUFFER_SIZE_UP=4096
-
-CONFIG_NEWLIB_LIBC=y
-CONFIG_NEWLIB_LIBC_FLOAT_PRINTF=y
-
-CONFIG_SERIAL=n
-
-CONFIG_HEAP_MEM_POOL_SIZE=2048
-CONFIG_MAIN_THREAD_PRIORITY=7
-
-CONFIG_ZIGBEE=y
-CONFIG_ZIGBEE_APP_UTILS=y
-CONFIG_ZIGBEE_ROLE_END_DEVICE=y
-
-# This example requires more workqueue stack
-CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=2048
-
-# Enable nRF ECB driver
-CONFIG_CRYPTO=y
-CONFIG_CRYPTO_NRF_ECB=y
-CONFIG_CRYPTO_INIT_PRIORITY=80
-
-# Networking
-CONFIG_NET_IPV6=n
-CONFIG_NET_IPV6_MLD=n
-CONFIG_NET_IPV6_NBR_CACHE=n
-CONFIG_NET_IPV6_RA_RDNSS=n
-CONFIG_NET_IP_ADDR_CHECK=n
-CONFIG_NET_UDP=n
-
-##
-## ZigBee Channel Selection
-##
-# Get Zigbee to scan every channel.
-CONFIG_ZIGBEE_CHANNEL_SELECTION_MODE_MULTI=y
-# By default only scans channel 11 (ZigBee2MQTT default) and 15 (ZHA default).
-# Comment to scan all channels - this will make pairing consume more energy.
-# CONFIG_ZIGBEE_CHANNEL_MASK=0x8800
-
-# Uncomment to set a specific channel - this will make pairing more energy efficient.
-# CONFIG_ZIGBEE_CHANNEL=15
-
-# Enable API for powering down unused RAM parts.
-# https://developer.nordicsemi.com/nRF_Connect_SDK/doc/1.7.1/nrf/ug_zigbee_configuring.html#power-saving-during-sleep
-CONFIG_RAM_POWER_DOWN_LIBRARY=y
-
-# LittleFS.
-CONFIG_MAIN_STACK_SIZE=2048
-CONFIG_FLASH=y
-CONFIG_FLASH_MAP=y
-CONFIG_FLASH_PAGE_LAYOUT=y
-CONFIG_FILE_SYSTEM=y
-CONFIG_FILE_SYSTEM_LITTLEFS=y
-
-CONFIG_WATCHDOG=y
-CONFIG_HWINFO=y
-CONFIG_ASSERT=y
-
-# Uncomment for debug log level.
-# CONFIG_LOG_DEFAULT_LEVEL=4
-
-# Factory reset method selection. Only hardware revision 2.0.0+ has button SW1. Earlier
-# revisions must select a different method. See Kconfig for options.
-# CONFIG_PRST_ZB_FACTORY_RESET_VIA_SW1=y
-# Disable factory reset.
-
-# OTA update configuration. This is based on the zigbee light switch example from the nrf-connect toolkit.
-CONFIG_ZIGBEE_FOTA=y
-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 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
-CONFIG_NRF_802154_RX_BUFFERS=32