From: Lorenzo Prosseda <lerokamut@gmail.com>
Date: Sun, 3 Aug 2025 17:19:26 +0000 (+0000)
Subject: Port of timer_face from legacy (#64)
X-Git-Url: https://git.earman.xyz/?a=commitdiff_plain;h=39d2c4499ee624cb4f68031177d23b6175108148;p=sensor-watch.git

Port of timer_face from legacy (#64)

- Closes https://github.com/joeycastillo/second-movement/issues/15
- Fixed issue with colon disappearing if exiting settings mode on the CLEAR or LOOP strings
- Use newer print function with fallback for classic display
---

diff --git a/legacy/watch_faces/complication/timer_face.c b/legacy/watch_faces/complication/timer_face.c
deleted file mode 100644
index de48e35..0000000
--- a/legacy/watch_faces/complication/timer_face.c
+++ /dev/null
@@ -1,356 +0,0 @@
-/*
- * MIT License
- *
- * Copyright (c) 2022 Andreas Nebinger, building on Wesley Ellis’ countdown_face.c
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-#include <stdlib.h>
-#include <string.h>
-#include "timer_face.h"
-#include "watch.h"
-#include "watch_utility.h"
-
-static const uint32_t _default_timer_values[] = {0x000200, 0x000500, 0x000A00, 0x001400, 0x002D02}; // default timers: 2 min, 5 min, 10 min, 20 min, 2 h 45 min
-
-// sound sequence for a single beeping sequence
-static const int8_t _sound_seq_beep[] = {BUZZER_NOTE_C8, 3, BUZZER_NOTE_REST, 3, -2, 2, BUZZER_NOTE_C8, 5, BUZZER_NOTE_REST, 25, 0};
-static const int8_t _sound_seq_start[] = {BUZZER_NOTE_C8, 2, 0};
-
-static uint8_t _beeps_to_play;    // temporary counter for ring signals playing
-
-static void _signal_callback() {
-    if (_beeps_to_play) {
-        _beeps_to_play--;
-        watch_buzzer_play_sequence((int8_t *)_sound_seq_beep, _signal_callback);
-    }
-}
-
-static void _start(timer_state_t *state, bool with_beep) {
-    if (state->timers[state->current_timer].value == 0) return;
-    watch_date_time_t now = watch_rtc_get_date_time();
-    state->now_ts = watch_utility_date_time_to_unix_time(now, movement_get_current_timezone_offset());
-    if (state->mode == pausing)
-        state->target_ts = state->now_ts + state->paused_left;
-    else
-        state->target_ts = watch_utility_offset_timestamp(state->now_ts, 
-                                                          state->timers[state->current_timer].unit.hours, 
-                                                          state->timers[state->current_timer].unit.minutes, 
-                                                          state->timers[state->current_timer].unit.seconds);
-    watch_date_time_t target_dt = watch_utility_date_time_from_unix_time(state->target_ts, movement_get_current_timezone_offset());
-    state->mode = running;
-    movement_schedule_background_task_for_face(state->watch_face_index, target_dt);
-    watch_set_indicator(WATCH_INDICATOR_BELL);
-    if (with_beep) watch_buzzer_play_sequence((int8_t *)_sound_seq_start, NULL);
-}
-
-static void _draw(timer_state_t *state, uint8_t subsecond) {
-    char buf[14];
-    uint32_t delta;
-    div_t result;
-    uint8_t h, min, sec;
-
-    switch (state->mode) {
-        case pausing:
-            if (state->pausing_seconds % 2)
-                watch_clear_indicator(WATCH_INDICATOR_BELL);
-            else
-                watch_set_indicator(WATCH_INDICATOR_BELL);
-            if (state->pausing_seconds != 1)
-                // not 1st iteration (or 256th): do not write anything
-                return;
-            // fall through
-        case running:
-            delta = state->target_ts - state->now_ts;
-            result = div(delta, 60);
-            sec = result.rem;
-            result = div(result.quot, 60);
-            min = result.rem;
-            h = result.quot;
-            sprintf(buf, " %02u%02u%02u", h, min, sec);
-            break;
-        case setting:
-            if (state->settings_state == 1) {
-                // ask it the current timer shall be erased
-                sprintf(buf, " CLEAR%c", state->erase_timer_flag ? 'y' : 'n');
-                watch_clear_colon();
-            } else if (state->settings_state == 5) {
-                sprintf(buf, "  LOOP%c", state->timers[state->current_timer].unit.repeat ? 'y' : 'n');
-                watch_clear_colon();
-            } else {
-                sprintf(buf, " %02u%02u%02u", state->timers[state->current_timer].unit.hours,
-                        state->timers[state->current_timer].unit.minutes,
-                        state->timers[state->current_timer].unit.seconds);
-                watch_set_colon();
-            }
-            break;
-        case waiting:
-            sprintf(buf, " %02u%02u%02u", state->timers[state->current_timer].unit.hours,
-                    state->timers[state->current_timer].unit.minutes,
-                    state->timers[state->current_timer].unit.seconds);
-            break;
-    }
-    buf[0] = 49 + state->current_timer;
-    if (state->mode == setting && subsecond % 2) {
-        // blink the current settings value
-        if (state->settings_state == 0) buf[0] = ' ';
-        else if (state->settings_state == 1 || state->settings_state == 5) buf[6] = ' ';
-        else buf[(state->settings_state - 1) * 2 - 1] = buf[(state->settings_state - 1) * 2] = ' ';
-    }
-    watch_display_string(buf, 3);
-    // set lap indicator when we have a looping timer
-    if (state->timers[state->current_timer].unit.repeat) watch_set_indicator(WATCH_INDICATOR_LAP);
-    else watch_clear_indicator(WATCH_INDICATOR_LAP);
-}
-
-static void _reset(timer_state_t *state) {
-    state->mode = waiting;
-    movement_cancel_background_task_for_face(state->watch_face_index);
-    watch_clear_indicator(WATCH_INDICATOR_BELL);
-}
-
-static void _set_next_valid_timer(timer_state_t *state) {
-    if ((state->timers[state->current_timer].value & 0xFFFFFF) == 0) {
-        uint8_t i = state->current_timer;
-        do {
-            i = (i + 1) % TIMER_SLOTS;
-        } while ((state->timers[i].value & 0xFFFFFF) == 0 && i != state->current_timer);
-        state->current_timer = i;
-    }
-}
-
-static void _resume_setting(timer_state_t *state) {
-    state->settings_state = 0;
-    state->mode = waiting;
-    movement_request_tick_frequency(1);
-    _set_next_valid_timer(state);
-}
-
-static void _settings_increment(timer_state_t *state) {
-    switch(state->settings_state) {
-        case 0:
-            state->current_timer = (state->current_timer + 1) % TIMER_SLOTS;
-            break;
-        case 1:
-            state->erase_timer_flag ^= 1;
-            break;
-        case 2:
-            state->timers[state->current_timer].unit.hours = (state->timers[state->current_timer].unit.hours + 1) % 24;
-            break;
-        case 3:
-            state->timers[state->current_timer].unit.minutes = (state->timers[state->current_timer].unit.minutes + 1) % 60;
-            break;
-        case 4:
-            state->timers[state->current_timer].unit.seconds = (state->timers[state->current_timer].unit.seconds + 1) % 60;
-            break;
-        case 5:
-            state->timers[state->current_timer].unit.repeat ^= 1;
-            break;
-        default:
-            // should never happen
-            break;
-    }
-    return;
-}
-
-static void _abort_quick_cycle(timer_state_t *state) {
-    if (state->quick_cycle) {
-        state->quick_cycle = false;
-        movement_request_tick_frequency(4);
-    }
-}
-
-static inline bool _check_for_signal() {
-    if (_beeps_to_play) {
-        _beeps_to_play = 0;
-        return true;
-    }
-    return false;
-}
-
-void timer_face_setup(uint8_t watch_face_index, void ** context_ptr) {
-
-    if (*context_ptr == NULL) {
-        *context_ptr = malloc(sizeof(timer_state_t));
-        timer_state_t *state = (timer_state_t *)*context_ptr;
-        memset(*context_ptr, 0, sizeof(timer_state_t));
-        state->watch_face_index = watch_face_index;
-        for (uint8_t i = 0; i < sizeof(_default_timer_values) / sizeof(uint32_t); i++) {
-            state->timers[i].value = _default_timer_values[i];
-        }
-    }
-}
-
-void timer_face_activate(void *context) {
-    timer_state_t *state = (timer_state_t *)context;
-    watch_display_string("TR", 0);
-    watch_set_colon();
-    if(state->mode == running) {
-        watch_date_time_t now = watch_rtc_get_date_time();
-        state->now_ts = watch_utility_date_time_to_unix_time(now, movement_get_current_timezone_offset());
-        watch_set_indicator(WATCH_INDICATOR_BELL);
-    } else {
-        state->pausing_seconds = 1;
-        _beeps_to_play = 0;
-    }
-}
-
-bool timer_face_loop(movement_event_t event, void *context) {
-    timer_state_t *state = (timer_state_t *)context;
-    uint8_t subsecond = event.subsecond;
-
-    switch (event.event_type) {
-        case EVENT_ACTIVATE:
-            _draw(state, event.subsecond);
-            break;
-        case EVENT_TICK:
-            if (state->mode == running) state->now_ts++;
-            else if (state->mode == pausing) state->pausing_seconds++;
-            else if (state->quick_cycle) {
-                if (HAL_GPIO_BTN_ALARM_read()) {
-                    _settings_increment(state);
-                    subsecond = 0;
-                } else _abort_quick_cycle(state);
-            }
-            _draw(state, subsecond);
-            break;
-        case EVENT_LIGHT_BUTTON_DOWN:
-            switch (state->mode) {
-                case pausing:
-                case running:
-                    movement_illuminate_led();
-                    break;
-                case setting:
-                    if (state->erase_timer_flag) {
-                        state->timers[state->current_timer].value = 0;
-                        state->erase_timer_flag = false;
-                    }
-                    state->settings_state = (state->settings_state + 1) % 6;
-                    if (state->settings_state == 1 && state->timers[state->current_timer].value == 0) state->settings_state = 2;
-                    else if (state->settings_state == 5 && (state->timers[state->current_timer].value & 0xFFFFFF) == 0) state->settings_state = 0;
-                    break;
-                default:
-                    break;
-            }
-            _draw(state, event.subsecond);
-            break;
-        case EVENT_LIGHT_BUTTON_UP:
-            if (state->mode == waiting) movement_illuminate_led();
-            break;
-        case EVENT_ALARM_BUTTON_UP:
-            _abort_quick_cycle(state);
-            if (_check_for_signal()) break;;
-            switch (state->mode) {
-                case running:
-                    state->mode = pausing;
-                    state->pausing_seconds = 0;
-                    state->paused_left = state->target_ts - state->now_ts;
-                    movement_cancel_background_task();
-                    break;
-                case pausing:
-                    _start(statemovement_get_current_timezone_offset(), false);
-                    break;
-                case waiting: {
-                    uint8_t last_timer = state->current_timer;
-                    state->current_timer = (state->current_timer + 1) % TIMER_SLOTS;
-                    _set_next_valid_timer(state);
-                    // start the time immediately if there is only one valid timer slot
-                    if (last_timer == state->current_timer) _start(statemovement_get_current_timezone_offset(), true);
-                    break;
-                }
-                case setting:
-                    _settings_increment(state);
-                    subsecond = 0;
-                    break;
-            }
-            _draw(state, subsecond);
-            break;
-        case EVENT_LIGHT_LONG_PRESS:
-            if (state->mode == waiting) {
-                // initiate settings
-                state->mode = setting;
-                state->settings_state = 0;
-                state->erase_timer_flag = false;
-                movement_request_tick_frequency(4);
-            } else if (state->mode == setting) {
-                _resume_setting(state);
-            }
-            _draw(state, event.subsecond);
-            break;
-        case EVENT_BACKGROUND_TASK:
-            // play the alarm
-            _beeps_to_play = 4;
-            watch_buzzer_play_sequence((int8_t *)_sound_seq_beep, _signal_callback);
-            _reset(state);
-            if (state->timers[state->current_timer].unit.repeat) _start(statemovement_get_current_timezone_offset(), false);
-            break;
-        case EVENT_ALARM_LONG_PRESS:
-            switch(state->mode) {
-                case setting:
-                    switch (state->settings_state) {
-                        case 0:
-                            state->current_timer = 0;
-                            break;
-                        case 2:
-                        case 3:
-                        case 4:
-                            state->quick_cycle = true;
-                            movement_request_tick_frequency(8);
-                            break;
-                        default:
-                            break;
-                    }
-                    break;
-                case waiting:
-                    _start(statemovement_get_current_timezone_offset(), true);
-                    break;
-                case pausing:
-                case running:
-                    _reset(state);
-                    if (movement_button_should_sound()) watch_buzzer_play_note(BUZZER_NOTE_C7, 50);
-                    break;
-                default:
-                    break;
-            }
-            _draw(state, event.subsecond);
-            break;
-        case EVENT_ALARM_LONG_UP:
-            _abort_quick_cycle(state);
-            break;
-        case EVENT_MODE_LONG_PRESS:
-        case EVENT_TIMEOUT:
-            _abort_quick_cycle(state);
-            movement_move_to_face(0);
-            break;
-        default:
-            movement_default_loop_handler(event);
-            break;
-    }
-
-    return true;
-}
-
-void timer_face_resign(void *context) {
-    timer_state_t *state = (timer_state_t *)context;
-    if (state->mode == setting) {
-        state->settings_state = 0;
-        state->mode = waiting;
-    }
-}
diff --git a/legacy/watch_faces/complication/timer_face.h b/legacy/watch_faces/complication/timer_face.h
deleted file mode 100644
index b59c958..0000000
--- a/legacy/watch_faces/complication/timer_face.h
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
- * MIT License
- *
- * Copyright (c) 2022 Andreas Nebinger, based on Wesley Ellis’ countdown face.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-#ifndef TIMER_FACE_H_
-#define TIMER_FACE_H_
-
-/*
- * TIMER face
- * Advanced timer/countdown face with pre-set timer lengths
- * 
- * This watch face provides the functionality of starting a countdown by choosing 
- * one out of nine programmable timer presets. A timer/countdown can be 23 hours,
- * 59 minutes, and 59 seconds max. A timer can also be set to auto-repeat, which
- * is indicated by the lap indicator.
- *
- * How to use in NORMAL mode:
- *   - Short-pressing the alarm button cycles through all pre-set timer lengths.
- *     Find the current timer slot number in the upper right-hand corner.
- *   - Long-pressing the alarm button starts the timer.
- *   - Long-pressing the light button initiates settings mode.
- * 
- * How to use in SETTINGS mode:
- *   - There are up to nine slots for storing a timer setting. The current slot is 
- *     indicated by the number in the upper right-hand corner.
- *   - Short-pressing the light button cycles through the settings values of each
- *     timer slot in the following order: hours - minutes - seconds - timer repeat
- *   - Short-pressing the alarm button alters the current settings value.
- *   - Long-pressing the light button resumes to normal mode.
- * 
- */
-
-#include "movement.h"
-
-#define TIMER_SLOTS 9           // offer 9 timer slots
-
-typedef enum {
-    waiting,
-    running,
-    setting,
-    pausing
-} timer_mode_t;
-
-typedef union {
-    struct {
-        uint8_t hours;
-        uint8_t minutes;
-        uint8_t seconds;
-        bool repeat;
-    } unit;
-    uint32_t value;
-} timer_setting_t;
-
-typedef struct {
-    uint32_t target_ts;
-    uint32_t now_ts;
-    uint16_t paused_left;
-    uint8_t pausing_seconds;
-    uint8_t watch_face_index;
-    timer_setting_t timers[TIMER_SLOTS]; 
-    uint8_t settings_state : 4;
-    uint8_t current_timer : 4;
-    uint8_t set_timers : 4;
-    bool erase_timer_flag : 1;
-    timer_mode_t mode : 3;
-    bool quick_cycle : 1;
-} timer_state_t;
-
-void timer_face_setup(uint8_t watch_face_index, void ** context_ptr);
-void timer_face_activate(void *context);
-bool timer_face_loop(movement_event_t event, void *context);
-void timer_face_resign(void *context);
-
-#define timer_face ((const watch_face_t){ \
-    timer_face_setup, \
-    timer_face_activate, \
-    timer_face_loop, \
-    timer_face_resign, \
-    NULL, \
-})
-
-
-#endif // TIMER_FACE_H_
diff --git a/movement_faces.h b/movement_faces.h
index ded8e78..542a066 100644
--- a/movement_faces.h
+++ b/movement_faces.h
@@ -63,6 +63,7 @@
 #include "tally_face.h"
 #include "probability_face.h"
 #include "ke_decimal_time_face.h"
+#include "timer_face.h"
 #include "simple_coin_flip_face.h"
 #include "lis2dw_monitor_face.h"
 #include "wareki_face.h"
diff --git a/watch-faces.mk b/watch-faces.mk
index 6b32642..bf3c54d 100644
--- a/watch-faces.mk
+++ b/watch-faces.mk
@@ -38,6 +38,7 @@ SRCS += \
   ./watch-faces/complication/kitchen_conversions_face.c \
   ./watch-faces/complication/periodic_table_face.c \
   ./watch-faces/clock/ke_decimal_time_face.c \
+  ./watch-faces/complication/timer_face.c \
   ./watch-faces/complication/simple_coin_flip_face.c \
   ./watch-faces/sensor/lis2dw_monitor_face.c \
   ./watch-faces/complication/wareki_face.c \
diff --git a/watch-faces/complication/timer_face.c b/watch-faces/complication/timer_face.c
new file mode 100644
index 0000000..aaf824c
--- /dev/null
+++ b/watch-faces/complication/timer_face.c
@@ -0,0 +1,361 @@
+/*
+ * MIT License
+ *
+ * Copyright (c) 2022 Andreas Nebinger, building on Wesley Ellis’ countdown_face.c
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+#include <stdlib.h>
+#include <string.h>
+#include "timer_face.h"
+#include "watch.h"
+#include "watch_utility.h"
+
+static const uint32_t _default_timer_values[] = {0x000200, 0x000500, 0x000A00, 0x001400, 0x002D02}; // default timers: 2 min, 5 min, 10 min, 20 min, 2 h 45 min
+
+// sound sequence for a single beeping sequence
+static const int8_t _sound_seq_beep[] = {BUZZER_NOTE_C8, 3, BUZZER_NOTE_REST, 3, -2, 2, BUZZER_NOTE_C8, 5, BUZZER_NOTE_REST, 25, 0};
+static const int8_t _sound_seq_start[] = {BUZZER_NOTE_C8, 2, 0};
+
+static uint8_t _beeps_to_play;    // temporary counter for ring signals playing
+
+static void _signal_callback() {
+    if (_beeps_to_play) {
+        _beeps_to_play--;
+        watch_buzzer_play_sequence((int8_t *)_sound_seq_beep, _signal_callback);
+    }
+}
+
+static void _start(timer_state_t *state, bool with_beep) {
+    if (state->timers[state->current_timer].value == 0) return;
+    watch_date_time_t now = watch_rtc_get_date_time();
+    state->now_ts = watch_utility_date_time_to_unix_time(now, movement_get_current_timezone_offset());
+    if (state->mode == pausing)
+        state->target_ts = state->now_ts + state->paused_left;
+    else
+        state->target_ts = watch_utility_offset_timestamp(state->now_ts, 
+                                                          state->timers[state->current_timer].unit.hours, 
+                                                          state->timers[state->current_timer].unit.minutes, 
+                                                          state->timers[state->current_timer].unit.seconds);
+    watch_date_time_t target_dt = watch_utility_date_time_from_unix_time(state->target_ts, movement_get_current_timezone_offset());
+    state->mode = running;
+    movement_schedule_background_task_for_face(state->watch_face_index, target_dt);
+    watch_set_indicator(WATCH_INDICATOR_BELL);
+    if (with_beep) watch_buzzer_play_sequence((int8_t *)_sound_seq_start, NULL);
+}
+
+static void _draw(timer_state_t *state, uint8_t subsecond) {
+    char bottom_time[10];
+    char timer_id[3];
+    uint32_t delta;
+    div_t result;
+    uint8_t h, min, sec;
+
+    switch (state->mode) {
+        case pausing:
+            if (state->pausing_seconds % 2)
+                watch_clear_indicator(WATCH_INDICATOR_BELL);
+            else
+                watch_set_indicator(WATCH_INDICATOR_BELL);
+            if (state->pausing_seconds != 1)
+                // not 1st iteration (or 256th): do not write anything
+                return;
+            // fall through
+        case running:
+            delta = state->target_ts - state->now_ts;
+            result = div(delta, 60);
+            sec = result.rem;
+            result = div(result.quot, 60);
+            min = result.rem;
+            h = result.quot;
+            sprintf(bottom_time, "%02u%02u%02u", h, min, sec);
+            break;
+        case setting:
+            if (state->settings_state == 1) {
+                // ask it the current timer shall be erased
+                sprintf(bottom_time, "CLEAR%c", state->erase_timer_flag ? 'y' : 'n');
+                watch_clear_colon();
+            } else if (state->settings_state == 5) {
+                sprintf(bottom_time, " LOOP%c", state->timers[state->current_timer].unit.repeat ? 'y' : 'n');
+                watch_clear_colon();
+            } else {
+                sprintf(bottom_time, "%02u%02u%02u", state->timers[state->current_timer].unit.hours,
+                        state->timers[state->current_timer].unit.minutes,
+                        state->timers[state->current_timer].unit.seconds);
+                watch_set_colon();
+            }
+            break;
+        case waiting:
+            sprintf(bottom_time, "%02u%02u%02u", state->timers[state->current_timer].unit.hours,
+                    state->timers[state->current_timer].unit.minutes,
+                    state->timers[state->current_timer].unit.seconds);
+            watch_set_colon();
+            break;
+    }
+
+    sprintf(timer_id, "%2u", state->current_timer + 1);
+    if (state->mode == setting && subsecond % 2) {
+        // blink the current settings value
+        if (state->settings_state == 0) timer_id[0] = timer_id[1] = ' ';
+        else if (state->settings_state == 1 || state->settings_state == 5) bottom_time[5] = ' ';
+        else bottom_time[(state->settings_state - 1) * 2 - 2] = bottom_time[(state->settings_state - 1) * 2 - 1] = ' ';
+    }
+    watch_display_text_with_fallback(WATCH_POSITION_BOTTOM, bottom_time, bottom_time);
+    watch_display_text_with_fallback(WATCH_POSITION_TOP_RIGHT, timer_id, timer_id);
+
+    // set lap indicator when we have a looping timer
+    if (state->timers[state->current_timer].unit.repeat) watch_set_indicator(WATCH_INDICATOR_LAP);
+    else watch_clear_indicator(WATCH_INDICATOR_LAP);
+}
+
+static void _reset(timer_state_t *state) {
+    state->mode = waiting;
+    movement_cancel_background_task_for_face(state->watch_face_index);
+    watch_clear_indicator(WATCH_INDICATOR_BELL);
+}
+
+static void _set_next_valid_timer(timer_state_t *state) {
+    if ((state->timers[state->current_timer].value & 0xFFFFFF) == 0) {
+        uint8_t i = state->current_timer;
+        do {
+            i = (i + 1) % TIMER_SLOTS;
+        } while ((state->timers[i].value & 0xFFFFFF) == 0 && i != state->current_timer);
+        state->current_timer = i;
+    }
+}
+
+static void _resume_setting(timer_state_t *state) {
+    state->settings_state = 0;
+    state->mode = waiting;
+    movement_request_tick_frequency(1);
+    _set_next_valid_timer(state);
+}
+
+static void _settings_increment(timer_state_t *state) {
+    switch(state->settings_state) {
+        case 0:
+            state->current_timer = (state->current_timer + 1) % TIMER_SLOTS;
+            break;
+        case 1:
+            state->erase_timer_flag ^= 1;
+            break;
+        case 2:
+            state->timers[state->current_timer].unit.hours = (state->timers[state->current_timer].unit.hours + 1) % 24;
+            break;
+        case 3:
+            state->timers[state->current_timer].unit.minutes = (state->timers[state->current_timer].unit.minutes + 1) % 60;
+            break;
+        case 4:
+            state->timers[state->current_timer].unit.seconds = (state->timers[state->current_timer].unit.seconds + 1) % 60;
+            break;
+        case 5:
+            state->timers[state->current_timer].unit.repeat ^= 1;
+            break;
+        default:
+            // should never happen
+            break;
+    }
+    return;
+}
+
+static void _abort_quick_cycle(timer_state_t *state) {
+    if (state->quick_cycle) {
+        state->quick_cycle = false;
+        movement_request_tick_frequency(4);
+    }
+}
+
+static inline bool _check_for_signal() {
+    if (_beeps_to_play) {
+        _beeps_to_play = 0;
+        return true;
+    }
+    return false;
+}
+
+void timer_face_setup(uint8_t watch_face_index, void ** context_ptr) {
+
+    if (*context_ptr == NULL) {
+        *context_ptr = malloc(sizeof(timer_state_t));
+        timer_state_t *state = (timer_state_t *)*context_ptr;
+        memset(*context_ptr, 0, sizeof(timer_state_t));
+        state->watch_face_index = watch_face_index;
+        for (uint8_t i = 0; i < sizeof(_default_timer_values) / sizeof(uint32_t); i++) {
+            state->timers[i].value = _default_timer_values[i];
+        }
+    }
+}
+
+void timer_face_activate(void *context) {
+    timer_state_t *state = (timer_state_t *)context;
+    watch_display_text_with_fallback(WATCH_POSITION_TOP_LEFT, "TMR", "TR");
+    watch_set_colon();
+    if(state->mode == running) {
+        watch_date_time_t now = watch_rtc_get_date_time();
+        state->now_ts = watch_utility_date_time_to_unix_time(now, movement_get_current_timezone_offset());
+        watch_set_indicator(WATCH_INDICATOR_BELL);
+    } else {
+        state->pausing_seconds = 1;
+        _beeps_to_play = 0;
+    }
+}
+
+bool timer_face_loop(movement_event_t event, void *context) {
+    timer_state_t *state = (timer_state_t *)context;
+    uint8_t subsecond = event.subsecond;
+
+    switch (event.event_type) {
+        case EVENT_ACTIVATE:
+            _draw(state, event.subsecond);
+            break;
+        case EVENT_TICK:
+            if (state->mode == running) state->now_ts++;
+            else if (state->mode == pausing) state->pausing_seconds++;
+            else if (state->quick_cycle) {
+                if (HAL_GPIO_BTN_ALARM_read()) {
+                    _settings_increment(state);
+                    subsecond = 0;
+                } else _abort_quick_cycle(state);
+            }
+            _draw(state, subsecond);
+            break;
+        case EVENT_LIGHT_BUTTON_DOWN:
+            switch (state->mode) {
+                case pausing:
+                case running:
+                    movement_illuminate_led();
+                    break;
+                case setting:
+                    if (state->erase_timer_flag) {
+                        state->timers[state->current_timer].value = 0;
+                        state->erase_timer_flag = false;
+                    }
+                    state->settings_state = (state->settings_state + 1) % 6;
+                    if (state->settings_state == 1 && state->timers[state->current_timer].value == 0) state->settings_state = 2;
+                    else if (state->settings_state == 5 && (state->timers[state->current_timer].value & 0xFFFFFF) == 0) state->settings_state = 0;
+                    break;
+                default:
+                    break;
+            }
+            _draw(state, event.subsecond);
+            break;
+        case EVENT_LIGHT_BUTTON_UP:
+            if (state->mode == waiting) movement_illuminate_led();
+            break;
+        case EVENT_ALARM_BUTTON_UP:
+            _abort_quick_cycle(state);
+            if (_check_for_signal()) break;;
+            switch (state->mode) {
+                case running:
+                    state->mode = pausing;
+                    state->pausing_seconds = 0;
+                    state->paused_left = state->target_ts - state->now_ts;
+                    movement_cancel_background_task();
+                    break;
+                case pausing:
+                    _start(state, false);
+                    break;
+                case waiting: {
+                    uint8_t last_timer = state->current_timer;
+                    state->current_timer = (state->current_timer + 1) % TIMER_SLOTS;
+                    _set_next_valid_timer(state);
+                    // start the time immediately if there is only one valid timer slot
+                    if (last_timer == state->current_timer) _start(state, true);
+                    break;
+                }
+                case setting:
+                    _settings_increment(state);
+                    subsecond = 0;
+                    break;
+            }
+            _draw(state, subsecond);
+            break;
+        case EVENT_LIGHT_LONG_PRESS:
+            if (state->mode == waiting) {
+                // initiate settings
+                state->mode = setting;
+                state->settings_state = 0;
+                state->erase_timer_flag = false;
+                movement_request_tick_frequency(4);
+            } else if (state->mode == setting) {
+                _resume_setting(state);
+            }
+            _draw(state, event.subsecond);
+            break;
+        case EVENT_BACKGROUND_TASK:
+            // play the alarm
+            _beeps_to_play = 4;
+            watch_buzzer_play_sequence((int8_t *)_sound_seq_beep, _signal_callback);
+            _reset(state);
+            if (state->timers[state->current_timer].unit.repeat) _start(state, false);
+            break;
+        case EVENT_ALARM_LONG_PRESS:
+            switch(state->mode) {
+                case setting:
+                    switch (state->settings_state) {
+                        case 0:
+                            state->current_timer = 0;
+                            break;
+                        case 2:
+                        case 3:
+                        case 4:
+                            state->quick_cycle = true;
+                            movement_request_tick_frequency(8);
+                            break;
+                        default:
+                            break;
+                    }
+                    break;
+                case waiting:
+                    _start(state, true);
+                    break;
+                case pausing:
+                case running:
+                    _reset(state);
+                    if (movement_button_should_sound()) watch_buzzer_play_note(BUZZER_NOTE_C7, 50);
+                    break;
+                default:
+                    break;
+            }
+            _draw(state, event.subsecond);
+            break;
+        case EVENT_ALARM_LONG_UP:
+            _abort_quick_cycle(state);
+            break;
+        case EVENT_MODE_LONG_PRESS:
+        case EVENT_TIMEOUT:
+            _abort_quick_cycle(state);
+            movement_move_to_face(0);
+            break;
+        default:
+            movement_default_loop_handler(event);
+            break;
+    }
+
+    return true;
+}
+
+void timer_face_resign(void *context) {
+    timer_state_t *state = (timer_state_t *)context;
+    if (state->mode == setting) {
+        state->settings_state = 0;
+        state->mode = waiting;
+    }
+}
diff --git a/watch-faces/complication/timer_face.h b/watch-faces/complication/timer_face.h
new file mode 100644
index 0000000..b59c958
--- /dev/null
+++ b/watch-faces/complication/timer_face.h
@@ -0,0 +1,103 @@
+/*
+ * MIT License
+ *
+ * Copyright (c) 2022 Andreas Nebinger, based on Wesley Ellis’ countdown face.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+#ifndef TIMER_FACE_H_
+#define TIMER_FACE_H_
+
+/*
+ * TIMER face
+ * Advanced timer/countdown face with pre-set timer lengths
+ * 
+ * This watch face provides the functionality of starting a countdown by choosing 
+ * one out of nine programmable timer presets. A timer/countdown can be 23 hours,
+ * 59 minutes, and 59 seconds max. A timer can also be set to auto-repeat, which
+ * is indicated by the lap indicator.
+ *
+ * How to use in NORMAL mode:
+ *   - Short-pressing the alarm button cycles through all pre-set timer lengths.
+ *     Find the current timer slot number in the upper right-hand corner.
+ *   - Long-pressing the alarm button starts the timer.
+ *   - Long-pressing the light button initiates settings mode.
+ * 
+ * How to use in SETTINGS mode:
+ *   - There are up to nine slots for storing a timer setting. The current slot is 
+ *     indicated by the number in the upper right-hand corner.
+ *   - Short-pressing the light button cycles through the settings values of each
+ *     timer slot in the following order: hours - minutes - seconds - timer repeat
+ *   - Short-pressing the alarm button alters the current settings value.
+ *   - Long-pressing the light button resumes to normal mode.
+ * 
+ */
+
+#include "movement.h"
+
+#define TIMER_SLOTS 9           // offer 9 timer slots
+
+typedef enum {
+    waiting,
+    running,
+    setting,
+    pausing
+} timer_mode_t;
+
+typedef union {
+    struct {
+        uint8_t hours;
+        uint8_t minutes;
+        uint8_t seconds;
+        bool repeat;
+    } unit;
+    uint32_t value;
+} timer_setting_t;
+
+typedef struct {
+    uint32_t target_ts;
+    uint32_t now_ts;
+    uint16_t paused_left;
+    uint8_t pausing_seconds;
+    uint8_t watch_face_index;
+    timer_setting_t timers[TIMER_SLOTS]; 
+    uint8_t settings_state : 4;
+    uint8_t current_timer : 4;
+    uint8_t set_timers : 4;
+    bool erase_timer_flag : 1;
+    timer_mode_t mode : 3;
+    bool quick_cycle : 1;
+} timer_state_t;
+
+void timer_face_setup(uint8_t watch_face_index, void ** context_ptr);
+void timer_face_activate(void *context);
+bool timer_face_loop(movement_event_t event, void *context);
+void timer_face_resign(void *context);
+
+#define timer_face ((const watch_face_t){ \
+    timer_face_setup, \
+    timer_face_activate, \
+    timer_face_loop, \
+    timer_face_resign, \
+    NULL, \
+})
+
+
+#endif // TIMER_FACE_H_