Fixed minimal (non-acceleration-sensor) build

Signed-off-by: simonmicro <[email protected]>
Open-Smartwatch · Aug 11, 2024 · b88d2f8 · b88d2f8
1 parent a505f85
commit b88d2f8
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 3 deletions.
diff --git a/include/apps/watchfaces/OswAppWatchfaceFitnessAnalog.h b/include/apps/watchfaces/OswAppWatchfaceFitnessAnalog.h
@@ -2,6 +2,8 @@
 #include <osw_ui.h>
 #include <OswAppV2.h>
 
+#if OSW_PLATFORM_ENVIRONMENT_ACCELEROMETER == 1
+
 // if you want a cool background image, enable the following define
 //#define GIF_BG
 
@@ -43,3 +45,4 @@ class OswAppWatchfaceFitnessAnalog : public OswAppV2 {
     OswAppGifPlayer* bgGif = nullptr;
 #endif
 };
+#endif
diff --git a/src/apps/watchfaces/OswAppWatchfaceFitnessAnalog.cpp b/src/apps/watchfaces/OswAppWatchfaceFitnessAnalog.cpp
@@ -2,6 +2,8 @@
 #include "apps/watchfaces/OswAppWatchfaceDigital.h"
 #include "apps/watchfaces/OswAppWatchface.h"
 
+#if OSW_PLATFORM_ENVIRONMENT_ACCELEROMETER == 1
+
 #ifdef GIF_BG
 #include "./apps/_experiments/gif_player.h"
 #endif
@@ -271,3 +273,4 @@ void OswAppWatchfaceFitnessAnalog::onStop() {
     }
 #endif
 }
+#endif
diff --git a/src/main.cpp b/src/main.cpp
@@ -120,11 +120,11 @@ void setup() {
     main_mainDrawer.registerAppLazy<OswAppWatchfaceDual>(LANG_WATCHFACES);
 #if OSW_PLATFORM_ENVIRONMENT_ACCELEROMETER == 1
     main_mainDrawer.registerAppLazy<OswAppWatchfaceFitness>(LANG_WATCHFACES);
+    main_mainDrawer.registerAppLazy<OswAppWatchfaceFitnessAnalog>(LANG_WATCHFACES);
 #endif
     main_mainDrawer.registerAppLazy<OswAppWatchfaceBinary>(LANG_WATCHFACES);
     main_mainDrawer.registerAppLazy<OswAppWatchfaceMonotimer>(LANG_WATCHFACES);
     main_mainDrawer.registerAppLazy<OswAppWatchfaceNumerals>(LANG_WATCHFACES);
-    main_mainDrawer.registerAppLazy<OswAppWatchfaceFitnessAnalog>(LANG_WATCHFACES);
     try {
         main_mainDrawer.startApp(OswConfigAllKeys::settingDisplayDefaultWatchface.get().c_str()); // if this id is invalid, the drawer will fall back to alternatives automatically
     } catch(const std::runtime_error& e) {

diff --git a/src/osw_config_keys.cpp b/src/osw_config_keys.cpp
@@ -64,11 +64,11 @@ OswConfigKeyDropDown settingDisplayDefaultWatchface("n", "Display", "Default Wat
     OswAppWatchfaceDual::APP_ID,
 #if OSW_PLATFORM_ENVIRONMENT_ACCELEROMETER == 1
     OswAppWatchfaceFitness::APP_ID,
+    OswAppWatchfaceFitnessAnalog::APP_ID,
 #endif
     OswAppWatchfaceBinary::APP_ID,
     OswAppWatchfaceMonotimer::APP_ID,
-    OswAppWatchfaceNumerals::APP_ID,
-    OswAppWatchfaceFitnessAnalog::APP_ID
+    OswAppWatchfaceNumerals::APP_ID
 }, CONFIG_DEFAULT_WATCHFACE_ID);
 OswConfigKeyBool settingDisplayDualHourTick("h2", "Display", "Display Dual-Time Hour Tick", "Show dual time hour tick", false);
 #if OSW_PLATFORM_ENVIRONMENT_ACCELEROMETER == 1