pinetime/InfiniTime
1
0
Fork 0
Code Activity

lower case 'am'/'pm' (watch faces Digital, Terminal)

Browse source
This commit is contained in:
Julian Foad 2024-05-10 09:15:46 +01:00
parent 63493078ef
commit 225ba57a45
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/displayapp/screens/WatchFaceDigital.cpp
View file

@ -116,14 +116,14 @@ void WatchFaceDigital::Refresh() {
uint8_t minute = dateTimeController.Minutes();
if (settingsController.GetClockType() == Controllers::Settings::ClockType::H12) {
char ampmChar[3] = "AM";
char ampmChar[3] = "am";
if (hour == 0) {
hour = 12;
} else if (hour == 12) {
ampmChar[0] = 'P';
ampmChar[0] = 'p';
} else if (hour > 12) {
hour = hour - 12;
ampmChar[0] = 'P';
ampmChar[0] = 'p';
}
lv_label_set_text(label_time_ampm, ampmChar);
lv_label_set_text_fmt(label_time, "%2d:%02d", hour, minute);

6
src/displayapp/screens/WatchFaceTerminal.cpp
View file

@ -111,14 +111,14 @@ void WatchFaceTerminal::Refresh() {
uint8_t second = dateTimeController.Seconds();
if (settingsController.GetClockType() == Controllers::Settings::ClockType::H12) {
char ampmChar[3] = "AM";
char ampmChar[3] = "am";
if (hour == 0) {
hour = 12;
} else if (hour == 12) {
ampmChar[0] = 'P';
ampmChar[0] = 'p';
} else if (hour > 12) {
hour = hour - 12;
ampmChar[0] = 'P';
ampmChar[0] = 'p';
}
lv_label_set_text_fmt(label_time, "[TIME]#11cc55 %02d:%02d:%02d %s#", hour, minute, second, ampmChar);
} else {