aboutsummaryrefslogtreecommitdiffstats
path: root/src/displayapp/screens/WatchFaceCasioStyleG7710.h
diff options
context:
space:
mode:
authorRiku Isokoski <riksu9000@gmail.com>2023-03-03 13:14:17 +0200
committerRiku Isokoski <riksu9000@gmail.com>2023-04-02 18:14:42 +0000
commitd251a47828171ef4001008316860a4c6f5835cc0 (patch)
treeaa41707d7473ba14d18e4586c177654b90591d18 /src/displayapp/screens/WatchFaceCasioStyleG7710.h
parent8d089b1429e2d448debc2d3e5149895eafe31fd8 (diff)
WatchFaceG7710: Simplify time update check
Diffstat (limited to 'src/displayapp/screens/WatchFaceCasioStyleG7710.h')
-rw-r--r--src/displayapp/screens/WatchFaceCasioStyleG7710.h12
1 files changed, 3 insertions, 9 deletions
diff --git a/src/displayapp/screens/WatchFaceCasioStyleG7710.h b/src/displayapp/screens/WatchFaceCasioStyleG7710.h
index 4d4d8f2f..775f0274 100644
--- a/src/displayapp/screens/WatchFaceCasioStyleG7710.h
+++ b/src/displayapp/screens/WatchFaceCasioStyleG7710.h
@@ -40,24 +40,18 @@ namespace Pinetime {
static bool IsAvailable(Pinetime::Controllers::FS& filesystem);
private:
- uint8_t displayedHour = -1;
- uint8_t displayedMinute = -1;
-
- uint16_t currentYear = 1970;
- Controllers::DateTime::Months currentMonth = Pinetime::Controllers::DateTime::Months::Unknown;
- Controllers::DateTime::Days currentDayOfWeek = Pinetime::Controllers::DateTime::Days::Unknown;
- uint8_t currentDay = 0;
-
Utility::DirtyValue<uint8_t> batteryPercentRemaining {};
Utility::DirtyValue<bool> powerPresent {};
Utility::DirtyValue<bool> bleState {};
Utility::DirtyValue<bool> bleRadioEnabled {};
- Utility::DirtyValue<std::chrono::time_point<std::chrono::system_clock, std::chrono::nanoseconds>> currentDateTime {};
+ Utility::DirtyValue<std::chrono::time_point<std::chrono::system_clock, std::chrono::minutes>> currentDateTime {};
Utility::DirtyValue<bool> motionSensorOk {};
Utility::DirtyValue<uint32_t> stepCount {};
Utility::DirtyValue<uint8_t> heartbeat {};
Utility::DirtyValue<bool> heartbeatRunning {};
Utility::DirtyValue<bool> notificationState {};
+ using days = std::chrono::duration<int32_t, std::ratio<86400>>; // TODO: days is standard in c++20
+ Utility::DirtyValue<std::chrono::time_point<std::chrono::system_clock, days>> currentDate;
lv_point_t line_icons_points[3] {{0, 5}, {117, 5}, {122, 0}};
lv_point_t line_day_of_week_number_points[4] {{0, 0}, {100, 0}, {95, 95}, {0, 95}};