remove CLOCK_FACE_24H_ONLY option, will lead to too many edge cases

diff --git a/movement.c b/movement.c
index a702d353b27ab4b5625f6698918a84e991e90bf8..c4a10e316f1147c20a0245f84376ececf1af90a2 100644 (file)
--- 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 53237cb91c042ff89846280513a4579d1e7f0c2f..9cf7a7f1dc566a475b84812e3ceb72f40ff4d198 100644 (file)
--- 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