diff options
| author | Joaquim José Almeida Pereira <joaquim.org@gmail.com> | 2021-03-08 12:23:32 +0000 |
|---|---|---|
| committer | Joaquim José Almeida Pereira <joaquim.org@gmail.com> | 2021-03-08 12:23:32 +0000 |
| commit | 282e34dca14ddc799b9511643e50a4f9023003ed (patch) | |
| tree | 0549cf49f95f6142af862063f46750ea994a8941 /src/displayapp/screens | |
| parent | 524e204ed1e5bac235770ffd69dfb2268eba5b49 (diff) | |
fix AM/PM
Diffstat (limited to 'src/displayapp/screens')
| -rw-r--r-- | src/displayapp/screens/WatchFaceDigital.cpp | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/src/displayapp/screens/WatchFaceDigital.cpp b/src/displayapp/screens/WatchFaceDigital.cpp index 4560ccdb..c39fe496 100644 --- a/src/displayapp/screens/WatchFaceDigital.cpp +++ b/src/displayapp/screens/WatchFaceDigital.cpp @@ -160,11 +160,21 @@ bool WatchFaceDigital::Refresh() { if ( settingsController.GetClockType() == Controllers::Settings::ClockType::H24 ) { sprintf(hoursChar, "%02d", hour); } else { - if (hour > 12) { - hour -= 12; - sprintf(ampmChar, "PM"); - } else { - sprintf(ampmChar, "AM"); + if (hour == 0 && hour != 12) { + hour = 12; + sprintf(ampmChar, "AM"); + } + else if (hour == 12 && hour != 0) { + hour = 12; + sprintf(ampmChar, "PM"); + } + else if (hour < 12 && hour != 0) { + sprintf(ampmChar, "AM"); + } + else if (hour > 12 && hour != 0) + { + hour = hour - 12; + sprintf(ampmChar, "PM"); } sprintf(hoursChar, "%02d", hour); } |