Store Images on external flash on HW3

It also changes the configuration flag to be more feature dependant instead of HW version.
jakkra · Aug 5, 2024 · f7347e1 · f7347e1
1 parent 3ccb8aa
commit f7347e1
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 2 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
+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
@@ -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
@@ -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
@@ -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