WatchFaceG7710: Simplify time update check
This commit is contained in:
parent
8d089b1429
commit
d251a47828
|
@ -222,43 +222,36 @@ void WatchFaceCasioStyleG7710::Refresh() {
|
||||||
lv_label_set_text_static(notificationIcon, NotificationIcon::GetIcon(notificationState.Get()));
|
lv_label_set_text_static(notificationIcon, NotificationIcon::GetIcon(notificationState.Get()));
|
||||||
}
|
}
|
||||||
|
|
||||||
currentDateTime = dateTimeController.CurrentDateTime();
|
currentDateTime = std::chrono::time_point_cast<std::chrono::minutes>(dateTimeController.CurrentDateTime());
|
||||||
|
|
||||||
if (currentDateTime.IsUpdated()) {
|
if (currentDateTime.IsUpdated()) {
|
||||||
auto hour = dateTimeController.Hours();
|
uint8_t hour = dateTimeController.Hours();
|
||||||
auto minute = dateTimeController.Minutes();
|
uint8_t minute = dateTimeController.Minutes();
|
||||||
auto year = dateTimeController.Year();
|
|
||||||
auto month = dateTimeController.Month();
|
|
||||||
auto dayOfWeek = dateTimeController.DayOfWeek();
|
|
||||||
auto day = dateTimeController.Day();
|
|
||||||
auto dayOfYear = dateTimeController.DayOfYear();
|
|
||||||
|
|
||||||
auto weekNumberFormat = "%V";
|
if (settingsController.GetClockType() == Controllers::Settings::ClockType::H12) {
|
||||||
|
char ampmChar[2] = "A";
|
||||||
if (displayedHour != hour || displayedMinute != minute) {
|
if (hour == 0) {
|
||||||
displayedHour = hour;
|
hour = 12;
|
||||||
displayedMinute = minute;
|
} else if (hour == 12) {
|
||||||
|
ampmChar[0] = 'P';
|
||||||
if (settingsController.GetClockType() == Controllers::Settings::ClockType::H12) {
|
} else if (hour > 12) {
|
||||||
char ampmChar[2] = "A";
|
hour = hour - 12;
|
||||||
if (hour == 0) {
|
ampmChar[0] = 'P';
|
||||||
hour = 12;
|
|
||||||
} else if (hour == 12) {
|
|
||||||
ampmChar[0] = 'P';
|
|
||||||
} else if (hour > 12) {
|
|
||||||
hour = hour - 12;
|
|
||||||
ampmChar[0] = 'P';
|
|
||||||
}
|
|
||||||
lv_label_set_text(label_time_ampm, ampmChar);
|
|
||||||
lv_label_set_text_fmt(label_time, "%2d:%02d", hour, minute);
|
|
||||||
lv_obj_align(label_time, lv_scr_act(), LV_ALIGN_CENTER, 0, 40);
|
|
||||||
} else {
|
|
||||||
lv_label_set_text_fmt(label_time, "%02d:%02d", hour, minute);
|
|
||||||
lv_obj_align(label_time, lv_scr_act(), LV_ALIGN_CENTER, 0, 40);
|
|
||||||
}
|
}
|
||||||
|
lv_label_set_text(label_time_ampm, ampmChar);
|
||||||
|
lv_label_set_text_fmt(label_time, "%2d:%02d", hour, minute);
|
||||||
|
} else {
|
||||||
|
lv_label_set_text_fmt(label_time, "%02d:%02d", hour, minute);
|
||||||
}
|
}
|
||||||
|
lv_obj_realign(label_time);
|
||||||
|
|
||||||
if ((year != currentYear) || (month != currentMonth) || (dayOfWeek != currentDayOfWeek) || (day != currentDay)) {
|
currentDate = std::chrono::time_point_cast<days>(currentDateTime.Get());
|
||||||
|
if (currentDate.IsUpdated()) {
|
||||||
|
const char* weekNumberFormat = "%V";
|
||||||
|
|
||||||
|
uint16_t year = dateTimeController.Year();
|
||||||
|
Controllers::DateTime::Months month = dateTimeController.Month();
|
||||||
|
uint8_t day = dateTimeController.Day();
|
||||||
|
int dayOfYear = dateTimeController.DayOfYear();
|
||||||
if (settingsController.GetClockType() == Controllers::Settings::ClockType::H24) {
|
if (settingsController.GetClockType() == Controllers::Settings::ClockType::H24) {
|
||||||
// 24h mode: ddmmyyyy, first DOW=Monday;
|
// 24h mode: ddmmyyyy, first DOW=Monday;
|
||||||
lv_label_set_text_fmt(label_date, "%3d-%2d", day, month);
|
lv_label_set_text_fmt(label_date, "%3d-%2d", day, month);
|
||||||
|
@ -293,11 +286,6 @@ void WatchFaceCasioStyleG7710::Refresh() {
|
||||||
lv_obj_realign(label_day_of_year);
|
lv_obj_realign(label_day_of_year);
|
||||||
lv_obj_realign(label_week_number);
|
lv_obj_realign(label_week_number);
|
||||||
lv_obj_realign(label_date);
|
lv_obj_realign(label_date);
|
||||||
|
|
||||||
currentYear = year;
|
|
||||||
currentMonth = month;
|
|
||||||
currentDayOfWeek = dayOfWeek;
|
|
||||||
currentDay = day;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -40,24 +40,18 @@ namespace Pinetime {
|
||||||
static bool IsAvailable(Pinetime::Controllers::FS& filesystem);
|
static bool IsAvailable(Pinetime::Controllers::FS& filesystem);
|
||||||
|
|
||||||
private:
|
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<uint8_t> batteryPercentRemaining {};
|
||||||
Utility::DirtyValue<bool> powerPresent {};
|
Utility::DirtyValue<bool> powerPresent {};
|
||||||
Utility::DirtyValue<bool> bleState {};
|
Utility::DirtyValue<bool> bleState {};
|
||||||
Utility::DirtyValue<bool> bleRadioEnabled {};
|
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<bool> motionSensorOk {};
|
||||||
Utility::DirtyValue<uint32_t> stepCount {};
|
Utility::DirtyValue<uint32_t> stepCount {};
|
||||||
Utility::DirtyValue<uint8_t> heartbeat {};
|
Utility::DirtyValue<uint8_t> heartbeat {};
|
||||||
Utility::DirtyValue<bool> heartbeatRunning {};
|
Utility::DirtyValue<bool> heartbeatRunning {};
|
||||||
Utility::DirtyValue<bool> notificationState {};
|
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_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}};
|
lv_point_t line_day_of_week_number_points[4] {{0, 0}, {100, 0}, {95, 95}, {0, 95}};
|
||||||
|
|
Loading…
Reference in New Issue
Block a user