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

isolating this bit of complexity in movement function; Add ifdefs in clock faces for DCE

Browse Source
This commit is contained in:
David Volovskiy 2024-07-10 07:22:55 -04:00
parent 7f6a9e5c9b
commit 2afc2c6721
3 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
movement/movement.c
View File

@ -328,6 +328,14 @@ static void end_buzzing_and_disable_buzzer(void) {
watch_disable_buzzer(); watch_disable_buzzer();
} }
static void set_initial_clock_mode(void) {
#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
}
void movement_play_signal(void) { void movement_play_signal(void) {
void *maybe_disable_buzzer = end_buzzing_and_disable_buzzer; void *maybe_disable_buzzer = end_buzzing_and_disable_buzzer;
if (watch_is_buzzer_or_led_enabled()) { if (watch_is_buzzer_or_led_enabled()) {
@ -376,12 +384,7 @@ void app_init(void) {
#endif #endif
memset(&movement_state, 0, sizeof(movement_state)); memset(&movement_state, 0, sizeof(movement_state));
set_initial_clock_mode();
#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_red_color = MOVEMENT_DEFAULT_RED_COLOR;
movement_state.settings.bit.led_green_color = MOVEMENT_DEFAULT_GREEN_COLOR; movement_state.settings.bit.led_green_color = MOVEMENT_DEFAULT_GREEN_COLOR;
movement_state.settings.bit.button_should_sound = MOVEMENT_DEFAULT_BUTTON_SOUND; movement_state.settings.bit.button_should_sound = MOVEMENT_DEFAULT_BUTTON_SOUND;

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

@ -53,7 +53,11 @@ typedef struct {
} clock_state_t; } clock_state_t;
static bool clock_is_in_24h_mode(movement_settings_t *settings) { static bool clock_is_in_24h_mode(movement_settings_t *settings) {
#ifdef CLOCK_FACE_24H_ONLY
return true;
#else
return settings->bit.clock_mode_24h; return settings->bit.clock_mode_24h;
#endif
} }
static void clock_indicate(WatchIndicatorSegment indicator, bool on) { static void clock_indicate(WatchIndicatorSegment indicator, bool on) {

6
movement/watch_faces/clock/simple_clock_face.c
View File

@ -51,7 +51,11 @@ void simple_clock_face_activate(movement_settings_t *settings, void *context) {
if (watch_tick_animation_is_running()) watch_stop_tick_animation(); 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); if (settings->bit.clock_mode_24h) watch_set_indicator(WATCH_INDICATOR_24H);
#endif
// handle chime indicator // handle chime indicator
if (state->signal_enabled) watch_set_indicator(WATCH_INDICATOR_BELL); if (state->signal_enabled) watch_set_indicator(WATCH_INDICATOR_BELL);
@ -106,6 +110,7 @@ bool simple_clock_face_loop(movement_event_t event, movement_settings_t *setting
sprintf(buf, "%02d%02d", date_time.unit.minute, date_time.unit.second); sprintf(buf, "%02d%02d", date_time.unit.minute, date_time.unit.second);
} else { } else {
// other stuff changed; let's do it all. // other stuff changed; let's do it all.
#ifndef CLOCK_FACE_24H_ONLY
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) { if (date_time.unit.hour < 12) {
@ -116,6 +121,7 @@ bool simple_clock_face_loop(movement_event_t event, movement_settings_t *setting
date_time.unit.hour %= 12; date_time.unit.hour %= 12;
if (date_time.unit.hour == 0) date_time.unit.hour = 12; if (date_time.unit.hour == 0) date_time.unit.hour = 12;
} }
#endif
pos = 0; pos = 0;
if (event.event_type == EVENT_LOW_ENERGY_UPDATE) { if (event.event_type == EVENT_LOW_ENERGY_UPDATE) {
if (!watch_tick_animation_is_running()) watch_start_tick_animation(500); if (!watch_tick_animation_is_running()) watch_start_tick_animation(500);