From bb0211eb019b11c4fabe3ae5a38b81c54ff9ea91 Mon Sep 17 00:00:00 2001 From: joeycastillo Date: Sun, 29 Sep 2024 11:38:47 -0400 Subject: [PATCH] remove CLOCK_FACE_24H_ONLY option, will lead to too many edge cases --- movement.c | 4 ---- watch-faces/settings/preferences_face.c | 3 --- 2 files changed, 7 deletions(-) diff --git a/movement.c b/movement.c index a702d353..c4a10e31 100644 --- a/movement.c +++ b/movement.c @@ -438,11 +438,7 @@ 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.time_zone = 15; movement_state.settings.bit.led_red_color = MOVEMENT_DEFAULT_RED_COLOR; movement_state.settings.bit.led_green_color = MOVEMENT_DEFAULT_GREEN_COLOR; diff --git a/watch-faces/settings/preferences_face.c b/watch-faces/settings/preferences_face.c index 53237cb9..9cf7a7f1 100644 --- a/watch-faces/settings/preferences_face.c +++ b/watch-faces/settings/preferences_face.c @@ -45,9 +45,6 @@ void preferences_face_setup(uint8_t watch_face_index, void ** context_ptr) { for (int i = 0; i < PREFERENCES_PAGE_NUM_PREFERENCES; i++) { state->setting_enabled[i] = true; } -#ifdef CLOCK_FACE_24H_ONLY - state->setting_enabled[PREFERENCES_PAGE_CLOCK_MODE] = false; -#endif #ifndef WATCH_RED_TCC_CHANNEL state->setting_enabled[PREFERENCES_PAGE_LED_RED] = false; #endif