From f7347e132ab39bfd2599cd49e265bd283e51628c Mon Sep 17 00:00:00 2001
From: LDAB <l.bispo@live.com>
Date: Sun, 4 Aug 2024 20:13:13 +0200
Subject: [PATCH] Store Images on external flash on HW3

It also changes the configuration flag to be more
feature dependant instead of HW version.
---
 app/Kconfig                                                  | 4 ++++
 app/boards/arm/zswatch_nrf5340/zswatch_nrf5340_cpuapp_3.conf | 2 ++
 app/boards/arm/zswatch_nrf5340/zswatch_nrf5340_cpuapp_4.conf | 2 ++
 app/boards/arm/zswatch_nrf5340/zswatch_nrf5340_cpuapp_5.conf | 4 +++-
 app/boards/nrf5340dk_nrf5340_cpuapp.conf                     | 2 ++
 app/src/ui/utils/Kconfig                                     | 2 ++
 app/src/ui/utils/zsw_ui_utils.h                              | 2 +-
 7 files changed, 16 insertions(+), 2 deletions(-)
 create mode 100644 app/src/ui/utils/Kconfig

diff --git a/app/Kconfig b/app/Kconfig
index e8142fa0..f1777f82 100644
--- a/app/Kconfig
+++ b/app/Kconfig
@@ -256,4 +256,8 @@ menu "ZSWatch"
         rsource "src/applications/trivia/Kconfig"
         rsource "src/applications/ppt_remote/Kconfig"
     endmenu
+
+    menu "UI"
+        rsource "src/ui/utils/Kconfig"
+    endmenu
 endmenu
diff --git a/app/boards/arm/zswatch_nrf5340/zswatch_nrf5340_cpuapp_3.conf b/app/boards/arm/zswatch_nrf5340/zswatch_nrf5340_cpuapp_3.conf
index ed3a9edf..1fbb9e96 100644
--- a/app/boards/arm/zswatch_nrf5340/zswatch_nrf5340_cpuapp_3.conf
+++ b/app/boards/arm/zswatch_nrf5340/zswatch_nrf5340_cpuapp_3.conf
@@ -42,3 +42,5 @@ CONFIG_WATCHFACE_ANALOG=n
 CONFIG_WATCHFACE_MINIMAL=n
 CONFIG_APPLICATIONS_USE_2048=n
 CONFIG_APPLICATIONS_USE_COMPASS=n
+
+CONFIG_STORE_IMAGES_EXTERNAL_FLASH=y
diff --git a/app/boards/arm/zswatch_nrf5340/zswatch_nrf5340_cpuapp_4.conf b/app/boards/arm/zswatch_nrf5340/zswatch_nrf5340_cpuapp_4.conf
index 340d1ba4..58b3ff41 100644
--- a/app/boards/arm/zswatch_nrf5340/zswatch_nrf5340_cpuapp_4.conf
+++ b/app/boards/arm/zswatch_nrf5340/zswatch_nrf5340_cpuapp_4.conf
@@ -36,3 +36,5 @@ CONFIG_PM_PARTITION_REGION_LITTLEFS_EXTERNAL=y
 CONFIG_PM_PARTITION_SIZE_LITTLEFS=0x200000
 
 CONFIG_DEBUG_COREDUMP_BACKEND_OTHER=y
+
+CONFIG_STORE_IMAGES_EXTERNAL_FLASH=y
diff --git a/app/boards/arm/zswatch_nrf5340/zswatch_nrf5340_cpuapp_5.conf b/app/boards/arm/zswatch_nrf5340/zswatch_nrf5340_cpuapp_5.conf
index 50d00823..6d28823e 100644
--- a/app/boards/arm/zswatch_nrf5340/zswatch_nrf5340_cpuapp_5.conf
+++ b/app/boards/arm/zswatch_nrf5340/zswatch_nrf5340_cpuapp_5.conf
@@ -49,4 +49,6 @@ CONFIG_MISC_ENABLE_SYSTEM_RESET=n # Implemented in nPM, hence not needed in FW
 
 # Save som flash temporary
 CONFIG_APPLICATIONS_USE_QR_CODE=n
-CONFIG_APPLICATIONS_USE_X_RAY=n
\ No newline at end of file
+CONFIG_APPLICATIONS_USE_X_RAY=n
+
+CONFIG_STORE_IMAGES_EXTERNAL_FLASH=y
diff --git a/app/boards/nrf5340dk_nrf5340_cpuapp.conf b/app/boards/nrf5340dk_nrf5340_cpuapp.conf
index ccbf06c4..f42a8a4a 100644
--- a/app/boards/nrf5340dk_nrf5340_cpuapp.conf
+++ b/app/boards/nrf5340dk_nrf5340_cpuapp.conf
@@ -57,3 +57,5 @@ CONFIG_PM_PARTITION_SIZE_SETTINGS_STORAGE=0x100000
 # how external flash shall be utilized. nRF5340dk has QSPI flash, hence
 # similar to rev 4.
 CONFIG_ZSWATCH_PCB_REV=4
+
+CONFIG_STORE_IMAGES_EXTERNAL_FLASH=y
diff --git a/app/src/ui/utils/Kconfig b/app/src/ui/utils/Kconfig
new file mode 100644
index 00000000..df9e9d83
--- /dev/null
+++ b/app/src/ui/utils/Kconfig
@@ -0,0 +1,2 @@
+config STORE_IMAGES_EXTERNAL_FLASH
+	bool "Store UI Images into the External Flash"
diff --git a/app/src/ui/utils/zsw_ui_utils.h b/app/src/ui/utils/zsw_ui_utils.h
index 521e1027..db2d9b4c 100644
--- a/app/src/ui/utils/zsw_ui_utils.h
+++ b/app/src/ui/utils/zsw_ui_utils.h
@@ -23,7 +23,7 @@
 #define CONCATINATE_(a, b) a##b
 #define CONCATINATE(a, b) CONCATINATE_(a, b)
 
-#if CONFIG_ZSWATCH_PCB_REV > 3
+#if CONFIG_STORE_IMAGES_EXTERNAL_FLASH
 #define ZSW_LV_IMG_DECLARE(var_name)
 #define ZSW_LV_IMG_USE(var_name)        "S:"#var_name".bin"
 #else