diff options
Diffstat (limited to 'src/displayapp/screens/WatchFaceTerminal.cpp')
| -rw-r--r-- | src/displayapp/screens/WatchFaceTerminal.cpp | 22 |
1 files changed, 7 insertions, 15 deletions
diff --git a/src/displayapp/screens/WatchFaceTerminal.cpp b/src/displayapp/screens/WatchFaceTerminal.cpp index d3534c08..e5ff195e 100644 --- a/src/displayapp/screens/WatchFaceTerminal.cpp +++ b/src/displayapp/screens/WatchFaceTerminal.cpp @@ -1,4 +1,3 @@ -#include <date/date.h> #include <lvgl/lvgl.h> #include "displayapp/screens/WatchFaceTerminal.h" #include "displayapp/screens/BatteryIcon.h" @@ -108,20 +107,13 @@ void WatchFaceTerminal::Refresh() { currentDateTime = dateTimeController.CurrentDateTime(); if (currentDateTime.IsUpdated()) { - auto newDateTime = currentDateTime.Get(); - - auto dp = date::floor<date::days>(newDateTime); - auto time = date::make_time(newDateTime - dp); - auto yearMonthDay = date::year_month_day(dp); - - auto year = static_cast<int>(yearMonthDay.year()); - auto month = static_cast<Pinetime::Controllers::DateTime::Months>(static_cast<unsigned>(yearMonthDay.month())); - auto day = static_cast<unsigned>(yearMonthDay.day()); - auto dayOfWeek = static_cast<Pinetime::Controllers::DateTime::Days>(date::weekday(yearMonthDay).iso_encoding()); - - uint8_t hour = time.hours().count(); - uint8_t minute = time.minutes().count(); - uint8_t second = time.seconds().count(); + auto hour = dateTimeController.Hours(); + auto minute = dateTimeController.Minutes(); + auto second = dateTimeController.Seconds(); + auto year = dateTimeController.Year(); + auto month = dateTimeController.Month(); + auto dayOfWeek = dateTimeController.DayOfWeek(); + auto day = dateTimeController.Day(); if (displayedHour != hour || displayedMinute != minute || displayedSecond != second) { displayedHour = hour; |
