From 225ba57a45d64692c7e821930023e1210de39b99 Mon Sep 17 00:00:00 2001 From: Julian Foad Date: Fri, 10 May 2024 09:15:46 +0100 Subject: [PATCH] lower case 'am'/'pm' (watch faces Digital, Terminal) --- src/displayapp/screens/WatchFaceDigital.cpp | 6 +++--- src/displayapp/screens/WatchFaceTerminal.cpp | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/displayapp/screens/WatchFaceDigital.cpp b/src/displayapp/screens/WatchFaceDigital.cpp index 464669cb..d1ba9e64 100644 --- a/src/displayapp/screens/WatchFaceDigital.cpp +++ b/src/displayapp/screens/WatchFaceDigital.cpp @@ -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); diff --git a/src/displayapp/screens/WatchFaceTerminal.cpp b/src/displayapp/screens/WatchFaceTerminal.cpp index f470b440..b9f9f86e 100644 --- a/src/displayapp/screens/WatchFaceTerminal.cpp +++ b/src/displayapp/screens/WatchFaceTerminal.cpp @@ -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 {