will/InfiniTime
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

date: Remove date lib

Browse Source 
DateTimeController can provide everything we need.
This commit is contained in:
Riku Isokoski
2023-02-23 20:00:58 +02:00
parent 959778d770
commit 8baa317e7e
14 changed files with 43 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/displayapp/screens/WatchFaceTerminal.cpp
View File

@@ -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;