hueso/Sensor-Watch
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Activity

alarm-face: correct am/pm indication and implement some minor tweaks.

Browse Source
This commit is contained in:
TheOnePerson 2022-10-25 21:28:06 +02:00
parent cdd9f737e6
commit 6a8269629d
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
movement/watch_faces/complication/alarm_face.c
View File

@ -89,9 +89,10 @@ static void _alarm_face_draw(movement_settings_t *settings, alarm_state_t *state
//handle am/pm for hour display //handle am/pm for hour display
uint8_t h = state->alarm[state->alarm_idx].hour; uint8_t h = state->alarm[state->alarm_idx].hour;
if (!settings->bit.clock_mode_24h) { if (!settings->bit.clock_mode_24h) {
if (h > 12) { if (h >= 12) {
watch_set_indicator(WATCH_INDICATOR_PM); watch_set_indicator(WATCH_INDICATOR_PM);
h -= 12; h = h % 12;
h += h ? 0 : 12;
} else { } else {
watch_clear_indicator(WATCH_INDICATOR_PM); watch_clear_indicator(WATCH_INDICATOR_PM);
} }
@ -207,8 +208,6 @@ void alarm_face_setup(movement_settings_t *settings, uint8_t watch_face_index, v
void alarm_face_activate(movement_settings_t *settings, void *context) { void alarm_face_activate(movement_settings_t *settings, void *context) {
(void) settings; (void) settings;
(void) context; (void) context;
watch_display_string(" ", 8);
watch_clear_indicator(WATCH_INDICATOR_LAP); // may be unnecessary, but who knows
watch_set_colon(); watch_set_colon();
} }
@ -270,7 +269,7 @@ bool alarm_face_loop(movement_event_t event, movement_settings_t *settings, void
state->alarm[state->alarm_idx].minute = (state->alarm[state->alarm_idx].minute + 1) % 60; state->alarm[state->alarm_idx].minute = (state->alarm[state->alarm_idx].minute + 1) % 60;
} else _abort_quick_ticks(state); } else _abort_quick_ticks(state);
} else if (!state->is_setting) break; // no need to do anything when we are not in settings mode and no quick ticks are running } else if (!state->is_setting) break; // no need to do anything when we are not in settings mode and no quick ticks are running
// otherwise fall through and draw the current face state // fall through
case EVENT_ACTIVATE: case EVENT_ACTIVATE:
_alarm_face_draw(settings, state, event.subsecond); _alarm_face_draw(settings, state, event.subsecond);
break; break;