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

Correcting ampersand. Update date only on date change

Browse Source
This commit is contained in:
Brendan M. Sleight 2022-09-15 19:27:55 +00:00
parent 4bc27cd593
commit ac93d51090
1 changed files with 45 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/displayapp/screens/WatchFaceAccurateWords.cpp
View File

@ -169,6 +169,7 @@ void WatchFaceAccurateWords::Refresh() {
lv_label_set_text_fmt(label_time, "%s", words); lv_label_set_text_fmt(label_time, "%s", words);
lv_obj_align(label_time, lv_scr_act(), LV_ALIGN_CENTER, 0, -40); lv_obj_align(label_time, lv_scr_act(), LV_ALIGN_CENTER, 0, -40);
if ((year != currentYear) || (month != currentMonth) || (dayOfWeek != currentDayOfWeek) || (day != currentDay)) {
lv_label_set_text_fmt(label_date, lv_label_set_text_fmt(label_date,
"%s, %s of %s", "%s, %s of %s",
days_array[static_cast<uint8_t>(dayOfWeek)], days_array[static_cast<uint8_t>(dayOfWeek)],
@ -176,31 +177,31 @@ void WatchFaceAccurateWords::Refresh() {
months_array[static_cast<uint8_t>(month)]); months_array[static_cast<uint8_t>(month)]);
// Specific dates have specific names // Specific dates have specific names
if (static_cast<uint8_t>(month) == 1 & static_cast<uint8_t>(day) == 1) { if (static_cast<uint8_t>(month) == 1 && static_cast<uint8_t>(day) == 1) {
lv_label_set_text_fmt(label_date, "%s, New Year's Day", days_array[static_cast<uint8_t>(dayOfWeek)]); lv_label_set_text_fmt(label_date, "%s, New Year's Day", days_array[static_cast<uint8_t>(dayOfWeek)]);
} }
if (static_cast<uint8_t>(month) == 3 & static_cast<uint8_t>(day) == 15) { if (static_cast<uint8_t>(month) == 3 && static_cast<uint8_t>(day) == 15) {
lv_label_set_text_fmt(label_date, "%s on the Ides of March", days_array[static_cast<uint8_t>(dayOfWeek)]); lv_label_set_text_fmt(label_date, "%s on the Ides of March", days_array[static_cast<uint8_t>(dayOfWeek)]);
} }
if (static_cast<uint8_t>(month) == 4 & static_cast<uint8_t>(day) == 1) { if (static_cast<uint8_t>(month) == 4 && static_cast<uint8_t>(day) == 1) {
lv_label_set_text_fmt(label_date, "%s, ERROR C Nonsense in BASIC", days_array[static_cast<uint8_t>(dayOfWeek)]); lv_label_set_text_fmt(label_date, "%s, ERROR C Nonsense in BASIC", days_array[static_cast<uint8_t>(dayOfWeek)]);
} }
if (static_cast<uint8_t>(month) == 7 & static_cast<uint8_t>(day) == 1) { if (static_cast<uint8_t>(month) == 7 && static_cast<uint8_t>(day) == 1) {
lv_label_set_text_fmt(label_date, "%s - O'Canada", days_array[static_cast<uint8_t>(dayOfWeek)]); lv_label_set_text_fmt(label_date, "%s - O'Canada", days_array[static_cast<uint8_t>(dayOfWeek)]);
} }
if (static_cast<uint8_t>(month) == 10 & static_cast<uint8_t>(day) == 31) { if (static_cast<uint8_t>(month) == 10 && static_cast<uint8_t>(day) == 31) {
lv_label_set_text_fmt(label_date, "%s on Halloween", days_array[static_cast<uint8_t>(dayOfWeek)]); lv_label_set_text_fmt(label_date, "%s on Halloween", days_array[static_cast<uint8_t>(dayOfWeek)]);
} }
if (static_cast<uint8_t>(month) == 12 & static_cast<uint8_t>(day) == 24) { if (static_cast<uint8_t>(month) == 12 && static_cast<uint8_t>(day) == 24) {
lv_label_set_text_fmt(label_date, "%s, Christmas Eve", days_array[static_cast<uint8_t>(dayOfWeek)]); lv_label_set_text_fmt(label_date, "%s, Christmas Eve", days_array[static_cast<uint8_t>(dayOfWeek)]);
} }
if (static_cast<uint8_t>(month) == 12 & static_cast<uint8_t>(day) == 25) { if (static_cast<uint8_t>(month) == 12 && static_cast<uint8_t>(day) == 25) {
lv_label_set_text_fmt(label_date, "%s, Christmas Day", days_array[static_cast<uint8_t>(dayOfWeek)]); lv_label_set_text_fmt(label_date, "%s, Christmas Day", days_array[static_cast<uint8_t>(dayOfWeek)]);
} }
if (static_cast<uint8_t>(month) == 12 & static_cast<uint8_t>(day) == 26) { if (static_cast<uint8_t>(month) == 12 && static_cast<uint8_t>(day) == 26) {
lv_label_set_text_fmt(label_date, "%s, Boxing Day", days_array[static_cast<uint8_t>(dayOfWeek)]); lv_label_set_text_fmt(label_date, "%s, Boxing Day", days_array[static_cast<uint8_t>(dayOfWeek)]);
} }
if (static_cast<uint8_t>(month) == 12 & static_cast<uint8_t>(day) == 31) { if (static_cast<uint8_t>(month) == 12 && static_cast<uint8_t>(day) == 31) {
lv_label_set_text_fmt(label_date, "%s, New Year's Eve", days_array[static_cast<uint8_t>(dayOfWeek)]); lv_label_set_text_fmt(label_date, "%s, New Year's Eve", days_array[static_cast<uint8_t>(dayOfWeek)]);
} }
@ -215,6 +216,7 @@ void WatchFaceAccurateWords::Refresh() {
currentDay = day; currentDay = day;
} }
} }
}
heartbeat = heartRateController.HeartRate(); heartbeat = heartRateController.HeartRate();
heartbeatRunning = heartRateController.State() != Controllers::HeartRateController::States::Stopped; heartbeatRunning = heartRateController.State() != Controllers::HeartRateController::States::Stopped;