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

faces/clock: simplify PM indication function

Browse Source 
Simplifies the code by adding dedicated functions for this.
This commit is contained in:
Matheus Afonso Martins Moreira 2024-02-24 20:13:07 -03:00
parent 113b4bba9c
commit 91713392a5
1 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
movement/watch_faces/clock/clock_face.c
View File

@ -56,6 +56,25 @@ static void clock_indicate_24h(movement_settings_t *settings) {
clock_indicate(WATCH_INDICATOR_24H, settings->bit.clock_mode_24h); clock_indicate(WATCH_INDICATOR_24H, settings->bit.clock_mode_24h);
} }
static bool clock_is_pm(watch_date_time date_time) {
return date_time.unit.hour >= 12;
}
static void clock_indicate_pm(movement_settings_t *settings, watch_date_time date_time) {
if (settings->bit.clock_mode_24h) { return; }
clock_indicate(WATCH_INDICATOR_PM, clock_is_pm(date_time));
}
static watch_date_time clock_24h_to_12h(watch_date_time date_time) {
date_time.unit.hour %= 12;
if (date_time.unit.hour == 0) {
date_time.unit.hour = 12;
}
return date_time;
}
void clock_face_setup(movement_settings_t *settings, uint8_t watch_face_index, void ** context_ptr) { void clock_face_setup(movement_settings_t *settings, uint8_t watch_face_index, void ** context_ptr) {
(void) settings; (void) settings;
(void) watch_face_index; (void) watch_face_index;
@ -125,13 +144,8 @@ bool clock_face_loop(movement_event_t event, movement_settings_t *settings, void
// other stuff changed; let's do it all. // other stuff changed; let's do it all.
if (!settings->bit.clock_mode_24h) { if (!settings->bit.clock_mode_24h) {
// if we are in 12 hour mode, do some cleanup. // if we are in 12 hour mode, do some cleanup.
if (date_time.unit.hour < 12) { clock_indicate_pm(settings, date_time);
watch_clear_indicator(WATCH_INDICATOR_PM); date_time = clock_24h_to_12h(date_time);
} else {
watch_set_indicator(WATCH_INDICATOR_PM);
}
date_time.unit.hour %= 12;
if (date_time.unit.hour == 0) date_time.unit.hour = 12;
} }
pos = 0; pos = 0;
if (event.event_type == EVENT_LOW_ENERGY_UPDATE) { if (event.event_type == EVENT_LOW_ENERGY_UPDATE) {