From 7cd9e8493d072d8b7cd3a12debad8eff60007f5b Mon Sep 17 00:00:00 2001 From: zyphlar Date: Fri, 5 Jan 2024 02:32:50 -0800 Subject: [PATCH] Compress things a bit --- src/displayapp/screens/WatchFaceDigital.cpp | 12 ++---------- src/displayapp/screens/WatchFaceDigital.h | 2 +- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/src/displayapp/screens/WatchFaceDigital.cpp b/src/displayapp/screens/WatchFaceDigital.cpp index 6a21e29c..8b641bc2 100644 --- a/src/displayapp/screens/WatchFaceDigital.cpp +++ b/src/displayapp/screens/WatchFaceDigital.cpp @@ -94,7 +94,7 @@ void WatchFaceDigital::Refresh() { /* Begin difference from WatchFaceDigital*/ if (settingsController.GetClockType() == Controllers::Settings::ClockType::Fuzzy) { std::string hourStr, timeStr; - auto sector = minute / 5 + (minute % 5 > 2); + auto sector = minute / 15 + (minute % 15 > 7); if (sector == 12) { hour = (hour + 1) % 12; sector = 0; @@ -183,18 +183,10 @@ void WatchFaceDigital::Refresh() { */ const char* WatchFaceDigital::timeSectors[] = { "%0\no'clock", - "five past\n%0", - "ten past\n%0", "quarter\npast\n%0", - "twenty\npast\n%0", - "twenty\nfive past\n%0", "half past\n%0", - "twenty\nfive to\n%1", - "twenty\nto %1", "quarter\nto %1", - "ten to\n%1", - "five to\n%1", -}; + }; const char* WatchFaceDigital::hourNames[] = { "twelve", "one", diff --git a/src/displayapp/screens/WatchFaceDigital.h b/src/displayapp/screens/WatchFaceDigital.h index dcf8ffd2..482e8680 100644 --- a/src/displayapp/screens/WatchFaceDigital.h +++ b/src/displayapp/screens/WatchFaceDigital.h @@ -41,7 +41,7 @@ namespace Pinetime { const char* timeAccent = "ffffff"; uint8_t displayedHour = -1; uint8_t displayedMinute = -1; - static const char* timeSectors[12]; + static const char* timeSectors[4]; static const char* hourNames[12]; Utility::DirtyValue batteryPercentRemaining {};