]> git.earman.xyz Git - sensor-watch.git/commitdiff
Merge PR #299 - leading zero representation
authorMatheus Afonso Martins Moreira <matheus@matheusmoreira.com>
Tue, 3 Sep 2024 21:49:13 +0000 (18:49 -0300)
committerMatheus Afonso Martins Moreira <matheus@matheusmoreira.com>
Tue, 3 Sep 2024 21:49:13 +0000 (18:49 -0300)
Adds a movement-wide leading zero 024h representation mode
that's toggleable in the preferences watch face.
Also adds support for the new display mode to existing faces.

I modified the logic a bit to ensure the 24h indicator remains lit
in the simple clock face even when in 024h mode. I also added support
to the more advanced clock face. In the future I will add a compile time
toggle to it as well.

Reviewed-by: Matheus Afonso Martins Moreira <matheus@matheusmoreira.com>
GitHub-Pull-Request: https://github.com/joeycastillo/Sensor-Watch/pull/299

1  2 
movement/movement.h
movement/watch_faces/clock/clock_face.c
movement/watch_faces/clock/repetition_minute_face.c
movement/watch_faces/clock/simple_clock_face.c
movement/watch_faces/clock/world_clock2_face.c
movement/watch_faces/complication/alarm_face.c
movement/watch_faces/complication/sunrise_sunset_face.c
movement/watch_faces/complication/wake_face.c
movement/watch_faces/settings/preferences_face.c
movement/watch_faces/settings/set_time_face.c
movement/watch_faces/settings/set_time_hackwatch_face.c

Simple merge
index 20a02e7dcdd5ec1fdf514de9d1b4c01ea4846e2a,0000000000000000000000000000000000000000..21d790f9162b420b976dff8e0fb59e4fc295af3a
mode 100644,000000..100644
--- /dev/null
@@@ -1,290 -1,0 +1,290 @@@
- static void clock_display_all(watch_date_time date_time) {
 +/* SPDX-License-Identifier: MIT */
 +
 +/*
 + * MIT License
 + *
 + * Copyright © 2021-2023 Joey Castillo <joeycastillo@utexas.edu> <jose.castillo@gmail.com>
 + * Copyright © 2022 David Keck <davidskeck@users.noreply.github.com>
 + * Copyright © 2022 TheOnePerson <a.nebinger@web.de>
 + * Copyright © 2023 Jeremy O'Brien <neutral@fastmail.com>
 + * Copyright © 2023 Mikhail Svarichevsky <3@14.by>
 + * Copyright © 2023 Wesley Aptekar-Cassels <me@wesleyac.com>
 + * Copyright © 2024 Matheus Afonso Martins Moreira <matheus.a.m.moreira@gmail.com>
 + *
 + * 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 "clock_face.h"
 +#include "watch.h"
 +#include "watch_utility.h"
 +#include "watch_private_display.h"
 +
 +// 2.2 volts will happen when the battery has maybe 5-10% remaining?
 +// we can refine this later.
 +#ifndef CLOCK_FACE_LOW_BATTERY_VOLTAGE_THRESHOLD
 +#define CLOCK_FACE_LOW_BATTERY_VOLTAGE_THRESHOLD 2200
 +#endif
 +
 +typedef struct {
 +    struct {
 +        watch_date_time previous;
 +    } date_time;
 +    uint8_t last_battery_check;
 +    uint8_t watch_face_index;
 +    bool time_signal_enabled;
 +    bool battery_low;
 +} clock_state_t;
 +
 +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;
 +#endif
 +}
 +
 +static void clock_indicate(WatchIndicatorSegment indicator, bool on) {
 +    if (on) {
 +        watch_set_indicator(indicator);
 +    } else {
 +        watch_clear_indicator(indicator);
 +    }
 +}
 +
 +static void clock_indicate_alarm(movement_settings_t *settings) {
 +    clock_indicate(WATCH_INDICATOR_SIGNAL, settings->bit.alarm_enabled);
 +}
 +
 +static void clock_indicate_time_signal(clock_state_t *clock) {
 +    clock_indicate(WATCH_INDICATOR_BELL, clock->time_signal_enabled);
 +}
 +
 +static void clock_indicate_24h(movement_settings_t *settings) {
 +    clock_indicate(WATCH_INDICATOR_24H, clock_is_in_24h_mode(settings));
 +}
 +
 +static bool clock_is_pm(watch_date_time date_time) {
 +    return date_time.unit.hour >= 12;
 +}
 +
 +static void clock_indicate_pm(movement_settings_t *settings, watch_date_time date_time) {
 +    if (settings->bit.clock_mode_24h) { return; }
 +    clock_indicate(WATCH_INDICATOR_PM, clock_is_pm(date_time));
 +}
 +
 +static void clock_indicate_low_available_power(clock_state_t *clock) {
 +    // Set the LAP indicator if battery power is low
 +    clock_indicate(WATCH_INDICATOR_LAP, clock->battery_low);
 +}
 +
 +static watch_date_time clock_24h_to_12h(watch_date_time date_time) {
 +    date_time.unit.hour %= 12;
 +
 +    if (date_time.unit.hour == 0) {
 +        date_time.unit.hour = 12;
 +    }
 +
 +    return date_time;
 +}
 +
 +static void clock_check_battery_periodically(clock_state_t *clock, watch_date_time date_time) {
 +    // check the battery voltage once a day
 +    if (date_time.unit.day == clock->last_battery_check) { return; }
 +
 +    clock->last_battery_check = date_time.unit.day;
 +
 +    watch_enable_adc();
 +    uint16_t voltage = watch_get_vcc_voltage();
 +    watch_disable_adc();
 +
 +    clock->battery_low = voltage < CLOCK_FACE_LOW_BATTERY_VOLTAGE_THRESHOLD;
 +
 +    clock_indicate_low_available_power(clock);
 +}
 +
 +static void clock_toggle_time_signal(clock_state_t *clock) {
 +    clock->time_signal_enabled = !clock->time_signal_enabled;
 +    clock_indicate_time_signal(clock);
 +}
 +
-         "%s%2d%2d%02d%02d",
++static void clock_display_all(watch_date_time date_time, bool leading_zero) {
 +    char buf[10 + 1];
 +
 +    snprintf(
 +        buf,
 +        sizeof(buf),
-         clock_display_all(current);
++        leading_zero? "%s%02d%02d%02d%02d" : "%s%2d%2d%02d%02d",
 +        watch_utility_get_weekday(date_time),
 +        date_time.unit.day,
 +        date_time.unit.hour,
 +        date_time.unit.minute,
 +        date_time.unit.second
 +    );
 +
 +    watch_display_string(buf, 0);
 +}
 +
 +static bool clock_display_some(watch_date_time current, watch_date_time previous) {
 +    if ((current.reg >> 6) == (previous.reg >> 6)) {
 +        // everything before seconds is the same, don't waste cycles setting those segments.
 +
 +        watch_display_character_lp_seconds('0' + current.unit.second / 10, 8);
 +        watch_display_character_lp_seconds('0' + current.unit.second % 10, 9);
 +
 +        return true;
 +
 +    } else if ((current.reg >> 12) == (previous.reg >> 12)) {
 +        // everything before minutes is the same.
 +
 +        char buf[4 + 1];
 +
 +        snprintf(
 +            buf,
 +            sizeof(buf),
 +            "%02d%02d",
 +            current.unit.minute,
 +            current.unit.second
 +        );
 +
 +        watch_display_string(buf, 6);
 +
 +        return true;
 +
 +    } else {
 +        // other stuff changed; let's do it all.
 +        return false;
 +    }
 +}
 +
 +static void clock_display_clock(movement_settings_t *settings, clock_state_t *clock, watch_date_time current) {
 +    if (!clock_display_some(current, clock->date_time.previous)) {
 +        if (!clock_is_in_24h_mode(settings)) {
 +            // if we are in 12 hour mode, do some cleanup.
 +            clock_indicate_pm(settings, current);
 +            current = clock_24h_to_12h(current);
 +        }
++        clock_display_all(current, settings->bit.clock_24h_leading_zero);
 +    }
 +}
 +
 +static void clock_display_low_energy(watch_date_time date_time) {
 +    char buf[10 + 1];
 +
 +    snprintf(
 +        buf,
 +        sizeof(buf),
 +        "%s%2d%2d%02d  ",
 +        watch_utility_get_weekday(date_time),
 +        date_time.unit.day,
 +        date_time.unit.hour,
 +        date_time.unit.minute
 +    );
 +
 +    watch_display_string(buf, 0);
 +}
 +
 +static void clock_start_tick_tock_animation(void) {
 +    if (!watch_tick_animation_is_running()) {
 +        watch_start_tick_animation(500);
 +    }
 +}
 +
 +static void clock_stop_tick_tock_animation(void) {
 +    if (watch_tick_animation_is_running()) {
 +        watch_stop_tick_animation();
 +    }
 +}
 +
 +void clock_face_setup(movement_settings_t *settings, uint8_t watch_face_index, void ** context_ptr) {
 +    (void) settings;
 +    (void) watch_face_index;
 +
 +    if (*context_ptr == NULL) {
 +        *context_ptr = malloc(sizeof(clock_state_t));
 +        clock_state_t *state = (clock_state_t *) *context_ptr;
 +        state->time_signal_enabled = false;
 +        state->watch_face_index = watch_face_index;
 +    }
 +}
 +
 +void clock_face_activate(movement_settings_t *settings, void *context) {
 +    clock_state_t *clock = (clock_state_t *) context;
 +
 +    clock_stop_tick_tock_animation();
 +
 +    clock_indicate_time_signal(clock);
 +    clock_indicate_alarm(settings);
 +    clock_indicate_24h(settings);
 +
 +    watch_set_colon();
 +
 +    // this ensures that none of the timestamp fields will match, so we can re-render them all.
 +    clock->date_time.previous.reg = 0xFFFFFFFF;
 +}
 +
 +bool clock_face_loop(movement_event_t event, movement_settings_t *settings, void *context) {
 +    clock_state_t *state = (clock_state_t *) context;
 +    watch_date_time current;
 +
 +    switch (event.event_type) {
 +        case EVENT_LOW_ENERGY_UPDATE:
 +            clock_start_tick_tock_animation();
 +            clock_display_low_energy(watch_rtc_get_date_time());
 +            break;
 +        case EVENT_TICK:
 +        case EVENT_ACTIVATE:
 +            current = watch_rtc_get_date_time();
 +
 +            clock_display_clock(settings, state, current);
 +
 +            clock_check_battery_periodically(state, current);
 +
 +            state->date_time.previous = current;
 +
 +            break;
 +        case EVENT_ALARM_LONG_PRESS:
 +            clock_toggle_time_signal(state);
 +            break;
 +        case EVENT_BACKGROUND_TASK:
 +            // uncomment this line to snap back to the clock face when the hour signal sounds:
 +            // movement_move_to_face(state->watch_face_index);
 +            movement_play_signal();
 +            break;
 +        default:
 +            return movement_default_loop_handler(event, settings);
 +    }
 +
 +    return true;
 +}
 +
 +void clock_face_resign(movement_settings_t *settings, void *context) {
 +    (void) settings;
 +    (void) context;
 +}
 +
 +bool clock_face_wants_background_task(movement_settings_t *settings, void *context) {
 +    (void) settings;
 +    clock_state_t *state = (clock_state_t *) context;
 +    if (!state->time_signal_enabled) return false;
 +
 +    watch_date_time date_time = watch_rtc_get_date_time();
 +
 +    return date_time.unit.minute == 0;
 +}
index ac4ec2ee5f9dc1088ec41d5b0270d11153ff052c,6f67c369f8b8ac24c93833a52deeca9c1151458b..fe46077d08e5517b7a816fbbcf255d5ff25224c8
@@@ -120,8 -116,9 +121,13 @@@ bool simple_clock_face_loop(movement_ev
                      }
                      date_time.unit.hour %= 12;
                      if (date_time.unit.hour == 0) date_time.unit.hour = 12;
 -                } else if (settings->bit.clock_24h_leading_zero && date_time.unit.hour < 10) {
 +                }
 +#endif
++
++                if (settings->bit.clock_24h_leading_zero && date_time.unit.hour < 10) {
+                     set_leading_zero = true;
+                 }
++
                  pos = 0;
                  if (event.event_type == EVENT_LOW_ENERGY_UPDATE) {
                      if (!watch_tick_animation_is_running()) watch_start_tick_animation(500);
index fbf60cfeeca69c21418afdf6fc7c9f9f74d70673,65dbc553e30e620f7863376223889a31c44038cb..8747bd868ef414efa3b9ec82fb1d008f0961d670
@@@ -116,9 -109,13 +117,13 @@@ static void _sunrise_sunset_face_update
                  if (!settings->bit.clock_mode_24h) {
                      if (watch_utility_convert_to_12_hour(&scratch_time)) watch_set_indicator(WATCH_INDICATOR_PM);
                      else watch_clear_indicator(WATCH_INDICATOR_PM);
+                 } else if (settings->bit.clock_24h_leading_zero && scratch_time.unit.hour < 10) {
+                     set_leading_zero = true;
                  }
 -                sprintf(buf, "rI%2d%2d%02d  ", scratch_time.unit.day, scratch_time.unit.hour, scratch_time.unit.minute);
 +                sprintf(buf, "rI%2d%2d%02d%s", scratch_time.unit.day, scratch_time.unit.hour, scratch_time.unit.minute,longLatPresets[state->longLatToUse].name);
                  watch_display_string(buf, 0);
+                 if (set_leading_zero)
+                     watch_display_string("0", 4);
                  return;
              } else {
                  show_next_match = true;
                  if (!settings->bit.clock_mode_24h) {
                      if (watch_utility_convert_to_12_hour(&scratch_time)) watch_set_indicator(WATCH_INDICATOR_PM);
                      else watch_clear_indicator(WATCH_INDICATOR_PM);
+                 } else if (settings->bit.clock_24h_leading_zero && scratch_time.unit.hour < 10) {
+                     set_leading_zero = true;
                  }
 -                sprintf(buf, "SE%2d%2d%02d  ", scratch_time.unit.day, scratch_time.unit.hour, scratch_time.unit.minute);
 +                sprintf(buf, "SE%2d%2d%02d%s", scratch_time.unit.day, scratch_time.unit.hour, scratch_time.unit.minute, longLatPresets[state->longLatToUse].name);
                  watch_display_string(buf, 0);
+                 if (set_leading_zero)
+                     watch_display_string("0", 4);
                  return;
              } else {
                  show_next_match = true;