From b923d506526382c74149c5f49e6395279d56bd3f Mon Sep 17 00:00:00 2001 From: David Volovskiy Date: Mon, 8 Jul 2024 18:32:41 -0400 Subject: [PATCH] CLOCK_FACE_24H_ONLY hides the preference to change the setting and defaults the mode to 24Hr mode --- movement/movement.c | 4 ++++ movement/watch_faces/clock/clock_face.c | 5 ----- movement/watch_faces/settings/preferences_face.c | 4 +++- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/movement/movement.c b/movement/movement.c index cb3dcf78..2ca2eb98 100644 --- a/movement/movement.c +++ b/movement/movement.c @@ -377,7 +377,11 @@ void app_init(void) { memset(&movement_state, 0, sizeof(movement_state)); +#ifdef CLOCK_FACE_24H_ONLY + movement_state.settings.bit.clock_mode_24h = true; +#else movement_state.settings.bit.clock_mode_24h = MOVEMENT_DEFAULT_24H_MODE; +#endif movement_state.settings.bit.led_red_color = MOVEMENT_DEFAULT_RED_COLOR; movement_state.settings.bit.led_green_color = MOVEMENT_DEFAULT_GREEN_COLOR; movement_state.settings.bit.button_should_sound = MOVEMENT_DEFAULT_BUTTON_SOUND; diff --git a/movement/watch_faces/clock/clock_face.c b/movement/watch_faces/clock/clock_face.c index eab5cd8d..0e3a5959 100644 --- a/movement/watch_faces/clock/clock_face.c +++ b/movement/watch_faces/clock/clock_face.c @@ -42,10 +42,6 @@ #define CLOCK_FACE_LOW_BATTERY_VOLTAGE_THRESHOLD 2200 #endif -#ifndef CLOCK_FACE_24H_ONLY -#define CLOCK_FACE_24H_ONLY 0 -#endif - typedef struct { struct { watch_date_time previous; @@ -57,7 +53,6 @@ typedef struct { } clock_state_t; static bool clock_is_in_24h_mode(movement_settings_t *settings) { - if (CLOCK_FACE_24H_ONLY) { return true; } return settings->bit.clock_mode_24h; } diff --git a/movement/watch_faces/settings/preferences_face.c b/movement/watch_faces/settings/preferences_face.c index c96e8d1f..2d4de9d4 100644 --- a/movement/watch_faces/settings/preferences_face.c +++ b/movement/watch_faces/settings/preferences_face.c @@ -99,7 +99,9 @@ bool preferences_face_loop(movement_event_t event, movement_settings_t *settings default: return movement_default_loop_handler(event, settings); } - +#ifdef CLOCK_FACE_24H_ONLY + if (current_page == 0) current_page++; // Skips past 12/24HR mode +#endif watch_display_string((char *)preferences_face_titles[current_page], 0); // blink active setting on even-numbered quarter-seconds