diff options
author | joeycastillo <joeycastillo@utexas.edu> | 2023-01-25 09:26:31 -0600 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-01-25 09:26:31 -0600 |
commit | 4412b5d08f90084a8e677bea4792851e6d82bdf3 (patch) | |
tree | c1298f3ea924d8102b33bd796373209dad8be63b /movement/watch_faces/complication/alarm_face.c | |
parent | 2b22ecc8e43cc21c56d82ee3f89f32dd7b6b8e4a (diff) | |
parent | 3303060c59e1591bd2c6bb7cfc5b21e550728d6d (diff) | |
download | Sensor-Watch-4412b5d08f90084a8e677bea4792851e6d82bdf3.tar.gz Sensor-Watch-4412b5d08f90084a8e677bea4792851e6d82bdf3.tar.bz2 Sensor-Watch-4412b5d08f90084a8e677bea4792851e6d82bdf3.zip |
Merge branch 'main' into default-handlerdefault-handler
Diffstat (limited to 'movement/watch_faces/complication/alarm_face.c')
-rw-r--r-- | movement/watch_faces/complication/alarm_face.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/movement/watch_faces/complication/alarm_face.c b/movement/watch_faces/complication/alarm_face.c index 4c0befde..479f2f1e 100644 --- a/movement/watch_faces/complication/alarm_face.c +++ b/movement/watch_faces/complication/alarm_face.c @@ -133,7 +133,7 @@ static void _alarm_face_draw(movement_settings_t *settings, alarm_state_t *state else { if (state->alarm[state->alarm_idx].beeps == 0) watch_display_character('o', _blink_idx[alarm_setting_idx_beeps]); - else + else watch_display_character(state->alarm[state->alarm_idx].beeps + 48, _blink_idx[alarm_setting_idx_beeps]); } } @@ -182,7 +182,7 @@ static void _alarm_update_alarm_enabled(movement_settings_t *settings, alarm_sta if ((state->alarm[i].day == weekday_idx && alarm_minutes_of_day >= now_minutes_of_day) || ((weekday_idx + 1) % 7 == state->alarm[i].day && alarm_minutes_of_day <= now_minutes_of_day) || (state->alarm[i].day == ALARM_DAY_WORKDAY && (weekday_idx < 4 - || (weekday_idx == 5 && alarm_minutes_of_day >= now_minutes_of_day) + || (weekday_idx == 4 && alarm_minutes_of_day >= now_minutes_of_day) || (weekday_idx == 6 && alarm_minutes_of_day <= now_minutes_of_day))) || (state->alarm[i].day == ALARM_DAY_WEEKEND && (weekday_idx == 5 || (weekday_idx == 6 && alarm_minutes_of_day >= now_minutes_of_day) @@ -446,7 +446,7 @@ bool alarm_face_loop(movement_event_t event, movement_settings_t *settings, void break; default: movement_default_loop_handler(event, settings); - break; + break; } return true; |