rrix
/
infinitime
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Compare commits

base: rrix:d31c8c99c84bf5960c26e161155faab01fbbbf37
Branches Tags
rrix:rr/fuzzy-clock
...
compare: rrix:e3967e8a9078aeb2f267e53a23f5a069e71c5353
Branches Tags
rrix:rr/fuzzy-clock

2 Commits
d31c8c99c8 ... e3967e8a90

Author SHA1 Message Date
Ryan Rix e3967e8a90 this modulo math seems stinky even if it worked. probably because 24h time but it would behave differently in 12h time? 2023-10-12 13:20:15 -07:00
Ryan Rix 49ba4c29ae fix watchface bug when the time is almost top of the hour 2023-10-12 13:19:48 -07:00
1 changed files with 6 additions and 3 deletions
Show Stats Expand all files Collapse all files

9
src/displayapp/screens/WatchFaceFuzzy.cpp
View File

@ -131,6 +131,7 @@ char const* WatchFaceFuzzy::nums[] = {"twelve", "one", "two", "three", "four", "
void WatchFaceFuzzy::printTimeWords(int h, int m) {
const char* mod;
if (m <= 30) {
mod = mods[m / 5];
} else {
@ -138,9 +139,11 @@ void WatchFaceFuzzy::printTimeWords(int h, int m) {
}
h = (h % 12);
if (m == 0 || m < 4 || m > 56) {
if (m >= 56) {
sprintf(timeStr, "#ffffff nearly %s#\n#808080 o' clock#", nums[(h+1) % 12]);
}
else if (m == 0 || m <= 4) {
sprintf(timeStr, "#ffffff %s#\n#808080 o' clock#", nums[h]);
}
else if (m <= 32) {
@ -148,7 +151,7 @@ void WatchFaceFuzzy::printTimeWords(int h, int m) {
}
else if (m > 32) {
sprintf(timeStr, "#ffffff %s#\n#808080 to# #FFFFFF %s#", mod, nums[(h % 12) + 1]);
sprintf(timeStr, "#ffffff %s#\n#808080 to# #FFFFFF %s#", mod, nums[(h+1) % 12]);
}
lv_label_set_text(label_time, timeStr);