Apps : display goal steps on Watchface

-Update watchface -Add settingDisplay OSW keys -See Open-Smartwatch#207
RuffaloLavoisier · Apr 15, 2022 · a092d05 · a092d05
1 parent d1aca96
commit a092d05
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 3 deletions.
diff --git a/include/osw_config_keys.h b/include/osw_config_keys.h
@@ -58,6 +58,7 @@ extern OswConfigKeyShort resetDay;
 #if OSW_PLATFORM_ENVIRONMENT_ACCELEROMETER == 1
 extern OswConfigKeyInt stepsPerDay;
 extern OswConfigKeyBool stepsHistoryClear;
+extern OswConfigKeyBool settingDisplay;
 #endif
 extern OswConfigKeyDropDown settingDisplayDefaultWatchface;
 }  // namespace OswConfigAllKeys

diff --git a/src/apps/watchfaces/watchface.cpp b/src/apps/watchfaces/watchface.cpp
@@ -40,7 +40,14 @@ void OswAppWatchface::drawStepHistory(OswUI* ui, uint8_t x, uint8_t y, uint8_t w
     hal->gfx()->setTextBottomAligned();
     hal->gfx()->setTextSize(1);
     hal->gfx()->setTextCursor(DISP_W / 2, y - 1);
-    hal->gfx()->print(hal->environment->getStepsToday());
+
+    if (OswConfigAllKeys::settingDisplay.get()) {
+      char stepsTodayNGoal[20];
+      sprintf(stepsTodayNGoal, "%d/%d", hal->environment->getStepsToday(), max);
+      hal->gfx()->print(stepsTodayNGoal);
+    } else {
+      hal->gfx()->print(hal->environment->getStepsToday());
+    }
     hal->gfx()->setTextCursor(DISP_W / 2, y + 1 + 8 + w * 4);
     hal->gfx()->setTextColor(ui->getForegroundColor());  // Let's make the background transparent.
                                                          // See : https://github.com/Open-Smartwatch/open-smartwatch-os/issues/194

diff --git a/src/osw_config_keys.cpp b/src/osw_config_keys.cpp
@@ -29,7 +29,9 @@ OswConfigKeyBool settingDisplayOverlays("s3", "Display", "Display Overlays", "Sh
 OswConfigKeyBool settingDisplayOverlaysOnWatchScreen("s4", "Display", "Display Watchface Overlays", nullptr, DISPLAY_OVERLAYS_ON_WF);
 OswConfigKeyDropDown settingDisplayDefaultWatchface("n", "Display", 
                                                     "Default Watchface ID (analog, digital, mix, binary)", "0,1,2,3", String(CONFIG_DEFAULT_WATCHFACE_INDEX));
-
+#if OSW_PLATFORM_ENVIRONMENT_ACCELEROMETER == 1
+OswConfigKeyBool settingDisplay("g1", "Display", "Display Steps Goal", "Show goal steps", 1);
+#endif
 OswConfigKeyBool raiseToWakeEnabled("s5", "Power", "Raise/Tilt to Wake", "Enables Raise to Wake",
                                     WAKE_FROM_RAISE);
 OswConfigKeyShort raiseToWakeSensitivity("s6", "Power", "Raise to Wake Sensitivity",
@@ -81,7 +83,10 @@ OswConfigKey *oswConfigKeys[] = {
     // display
     &OswConfigAllKeys::settingDisplayTimeout, &OswConfigAllKeys::settingDisplayBrightness,
     &OswConfigAllKeys::settingDisplayOverlays, &OswConfigAllKeys::settingDisplayOverlaysOnWatchScreen,
-    &OswConfigAllKeys::settingDisplayDefaultWatchface,
+    &OswConfigAllKeys::settingDisplayDefaultWatchface, 
+#if OSW_PLATFORM_ENVIRONMENT_ACCELEROMETER == 1
+    &OswConfigAllKeys::settingDisplay,
+#endif
     // energy
     &OswConfigAllKeys::buttonToWakeEnabled, &OswConfigAllKeys::raiseToWakeEnabled,
     &OswConfigAllKeys::raiseToWakeSensitivity, &OswConfigAllKeys::tapToWakeEnabled,