fix clock am/pm logic

This commit is contained in:
MX
2022-09-29 23:50:49 +03:00
parent 4d8f294e7a
commit f0ea8f3a84

View File

@@ -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); time_string, TIME_LEN, CLOCK_TIME_FORMAT, curr_dt.hour, curr_dt.minute, curr_dt.second);
} else { } else {
bool pm = curr_dt.hour > 12; bool pm = curr_dt.hour > 12;
bool pm12 = curr_dt.hour >= 12;
snprintf( snprintf(
time_string, time_string,
TIME_LEN, TIME_LEN,
@@ -50,7 +51,7 @@ static void clock_render_callback(Canvas* const canvas, void* ctx) {
meridian_string, meridian_string,
MERIDIAN_LEN, MERIDIAN_LEN,
MERIDIAN_FORMAT, MERIDIAN_FORMAT,
pm ? MERIDIAN_STRING_PM : MERIDIAN_STRING_AM); pm12 ? MERIDIAN_STRING_PM : MERIDIAN_STRING_AM);
} }
if(state->settings.date_format == Iso) { if(state->settings.date_format == Iso) {