From 0a6ef3d82ada84ef20baff3fbb84ed5114f7031a Mon Sep 17 00:00:00 2001 From: joeycastillo Date: Mon, 23 Sep 2024 08:49:19 -0400 Subject: [PATCH] 24H only is handled by disabling changing the setting --- watch-faces/clock/simple_clock_face.c | 6 ------ .../watch_faces => watch-faces}/clock/world_clock_face.c | 0 .../watch_faces => watch-faces}/clock/world_clock_face.h | 0 3 files changed, 6 deletions(-) rename {movement/watch_faces => watch-faces}/clock/world_clock_face.c (100%) rename {movement/watch_faces => watch-faces}/clock/world_clock_face.h (100%) diff --git a/watch-faces/clock/simple_clock_face.c b/watch-faces/clock/simple_clock_face.c index 19c661ca..0257c6ee 100644 --- a/watch-faces/clock/simple_clock_face.c +++ b/watch-faces/clock/simple_clock_face.c @@ -51,11 +51,7 @@ void simple_clock_face_activate(movement_settings_t *settings, void *context) { if (watch_tick_animation_is_running()) watch_stop_tick_animation(); -#ifdef CLOCK_FACE_24H_ONLY - watch_set_indicator(WATCH_INDICATOR_24H); -#else if (settings->bit.clock_mode_24h) watch_set_indicator(WATCH_INDICATOR_24H); -#endif // handle chime indicator if (state->signal_enabled) watch_set_indicator(WATCH_INDICATOR_BELL); @@ -110,7 +106,6 @@ bool simple_clock_face_loop(movement_event_t event, movement_settings_t *setting watch_display_text(WATCH_POSITION_SECONDS, buf + 2); } else { // other stuff changed; let's do it all. -#ifndef CLOCK_FACE_24H_ONLY if (!settings->bit.clock_mode_24h) { // if we are in 12 hour mode, do some cleanup. if (date_time.unit.hour < 12) { @@ -121,7 +116,6 @@ bool simple_clock_face_loop(movement_event_t event, movement_settings_t *setting date_time.unit.hour %= 12; if (date_time.unit.hour == 0) date_time.unit.hour = 12; } -#endif watch_display_text(WATCH_POSITION_TOP_LEFT, (char *) watch_utility_get_weekday(date_time)); sprintf(buf, "%2d%2d%02d%02d", date_time.unit.day, date_time.unit.hour, date_time.unit.minute, date_time.unit.second); watch_display_text(WATCH_POSITION_TOP_RIGHT, buf); diff --git a/movement/watch_faces/clock/world_clock_face.c b/watch-faces/clock/world_clock_face.c similarity index 100% rename from movement/watch_faces/clock/world_clock_face.c rename to watch-faces/clock/world_clock_face.c diff --git a/movement/watch_faces/clock/world_clock_face.h b/watch-faces/clock/world_clock_face.h similarity index 100% rename from movement/watch_faces/clock/world_clock_face.h rename to watch-faces/clock/world_clock_face.h