From f0ea8f3a84d997bdb5a1c75012a3ba2f066ad6cd Mon Sep 17 00:00:00 2001 From: MX <10697207+xMasterX@users.noreply.github.com> Date: Thu, 29 Sep 2022 23:50:49 +0300 Subject: [PATCH] fix clock am/pm logic --- applications/main/clock_app/clock_app.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/applications/main/clock_app/clock_app.c b/applications/main/clock_app/clock_app.c index deb209c38..1bd92d9ec 100644 --- a/applications/main/clock_app/clock_app.c +++ b/applications/main/clock_app/clock_app.c @@ -38,6 +38,7 @@ static void clock_render_callback(Canvas* const canvas, void* ctx) { time_string, TIME_LEN, CLOCK_TIME_FORMAT, curr_dt.hour, curr_dt.minute, curr_dt.second); } else { bool pm = curr_dt.hour > 12; + bool pm12 = curr_dt.hour >= 12; snprintf( time_string, TIME_LEN, @@ -50,7 +51,7 @@ static void clock_render_callback(Canvas* const canvas, void* ctx) { meridian_string, MERIDIAN_LEN, MERIDIAN_FORMAT, - pm ? MERIDIAN_STRING_PM : MERIDIAN_STRING_AM); + pm12 ? MERIDIAN_STRING_PM : MERIDIAN_STRING_AM); } if(state->settings.date_format == Iso) {