watchfaces: Add preview images, drop analog watchface

- Add preview images for digital and minimal watchface - Drop analog watchface - Drop CI/CD for revision 1 Signed-off-by: Daniel Kampert <[email protected]>
jakkra · Sep 26, 2024 · 70b7d68 · 70b7d68
1 parent b16b884
commit 70b7d68
Show file tree

Hide file tree

Showing 14 changed files with 1,380 additions and 497 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -9,7 +9,7 @@ jobs:
     strategy:
       matrix:
         built_type: [debug, release]
-        board: [zswatch_nrf5340_cpuapp@1, zswatch_nrf5340_cpuapp@3, zswatch_nrf5340_cpuapp@4, zswatch_nrf5340_cpuapp@5, native_posix, nrf5340dk_nrf5340_cpuapp]
+        board: [zswatch_nrf5340_cpuapp@3, zswatch_nrf5340_cpuapp@4, zswatch_nrf5340_cpuapp@5, native_posix, nrf5340dk_nrf5340_cpuapp]
     steps:
       - name: Checkout
         uses: actions/checkout@v4

diff --git a/app/Kconfig b/app/Kconfig
@@ -93,11 +93,6 @@ menu "ZSWatch"
     endmenu
 
     menu "Watchface"
-        config WATCHFACE_ANALOG
-            bool
-            prompt "Add analog watchface"
-            default n
-
         config WATCHFACE_DIGITAL
             bool
             prompt "Add digital watchface"

diff --git a/app/boards/arm/zswatch_nrf5340/zswatch_nrf5340_cpuapp_3.conf b/app/boards/arm/zswatch_nrf5340/zswatch_nrf5340_cpuapp_3.conf
@@ -38,7 +38,6 @@ CONFIG_PM_PARTITION_SIZE_LITTLEFS=0x200000
 CONFIG_DEBUG_COREDUMP_BACKEND_OTHER=y
 
 # Save flash
-CONFIG_WATCHFACE_ANALOG=n
 CONFIG_WATCHFACE_MINIMAL=n
 CONFIG_APPLICATIONS_USE_2048=n
 CONFIG_APPLICATIONS_USE_COMPASS=n

diff --git a/app/prj.conf b/app/prj.conf
@@ -167,9 +167,8 @@ CONFIG_ZBUS_OBSERVER_NAME=y
 CONFIG_ZBUS_CHANNELS_SYS_INIT_PRIORITY=1
 
 # Choose one or many of below
-CONFIG_WATCHFACE_ANALOG=n
 CONFIG_WATCHFACE_DIGITAL=y
-CONFIG_WATCHFACE_MINIMAL=y
+CONFIG_WATCHFACE_MINIMAL=n
 
 # Choose one of below
 CONFIG_WATCHFACE_BACKGROUND_SPACE=y

diff --git a/app/src/images/assets_watchfaces/face_analog_preview.c b/app/src/images/assets_watchfaces/face_analog_preview.c
diff --git a/app/src/images/assets_watchfaces/face_digital_preview.c b/app/src/images/assets_watchfaces/face_digital_preview.c
diff --git a/app/src/images/assets_watchfaces/face_minimal_preview.c b/app/src/images/assets_watchfaces/face_minimal_preview.c
diff --git a/app/src/ui/watchfaces/analog/CMakeLists.txt b/app/src/ui/watchfaces/analog/CMakeLists.txt