]> git.earman.xyz Git - sensor-watch.git/commitdiff
remove simple_clock_face; we've outgrown it
authorjoeycastillo <joeycastillo@utexas.edu>
Mon, 30 Sep 2024 00:53:23 +0000 (20:53 -0400)
committerjoeycastillo <joeycastillo@utexas.edu>
Mon, 30 Sep 2024 00:57:19 +0000 (20:57 -0400)
movement_faces.h
watch-faces.mk
watch-faces/clock/simple_clock_face.c [deleted file]
watch-faces/clock/simple_clock_face.h [deleted file]

index 49c80c6e4ae704c6dbbdfb85b03b39b4103b2a60..77331121bd58ad480e4c48481d0c0e5db6912c06 100644 (file)
@@ -24,7 +24,6 @@
 
 #pragma once
 
-#include "simple_clock_face.h"
 #include "clock_face.h"
 #include "beats_face.h"
 #include "world_clock_face.h"
index 65b775b6a59139409f44c0f76a5d6b781dab4fca..38a77e0c6ef0d7f3eb4706ae8597d48262a09924 100644 (file)
@@ -1,5 +1,4 @@
 SRCS += \
-  ./watch-faces/clock/simple_clock_face.c \
   ./watch-faces/clock/clock_face.c \
   ./watch-faces/clock/beats_face.c \
   ./watch-faces/clock/world_clock_face.c \
diff --git a/watch-faces/clock/simple_clock_face.c b/watch-faces/clock/simple_clock_face.c
deleted file mode 100644 (file)
index e919f52..0000000
+++ /dev/null
@@ -1,162 +0,0 @@
-/*
- * MIT License
- *
- * Copyright (c) 2022 Joey Castillo
- *
- * 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 "simple_clock_face.h"
-#include "watch.h"
-#include "watch_utility.h"
-#include "watch_common_display.h"
-
-static void _update_alarm_indicator(bool settings_alarm_enabled, simple_clock_state_t *state) {
-    state->alarm_enabled = settings_alarm_enabled;
-    if (state->alarm_enabled) watch_set_indicator(WATCH_INDICATOR_SIGNAL);
-    else watch_clear_indicator(WATCH_INDICATOR_SIGNAL);
-}
-
-void simple_clock_face_setup(uint8_t watch_face_index, void ** context_ptr) {
-    (void) watch_face_index;
-
-    if (*context_ptr == NULL) {
-        *context_ptr = malloc(sizeof(simple_clock_state_t));
-        simple_clock_state_t *state = (simple_clock_state_t *)*context_ptr;
-        state->signal_enabled = false;
-        state->watch_face_index = watch_face_index;
-    }
-}
-
-void simple_clock_face_activate(void *context) {
-    simple_clock_state_t *state = (simple_clock_state_t *)context;
-
-    if (watch_sleep_animation_is_running()) watch_stop_sleep_animation();
-
-    if (movement_clock_mode_24h()) watch_set_indicator(WATCH_INDICATOR_24H);
-
-    // handle chime indicator
-    if (state->signal_enabled) watch_set_indicator(WATCH_INDICATOR_BELL);
-    else watch_clear_indicator(WATCH_INDICATOR_BELL);
-
-    // show alarm indicator if there is an active alarm
-    _update_alarm_indicator(movement_alarm_enabled(), state);
-
-    watch_set_colon();
-
-    // this ensures that none of the timestamp fields will match, so we can re-render them all.
-    state->previous_date_time = 0xFFFFFFFF;
-}
-
-bool simple_clock_face_loop(movement_event_t event, void *context) {
-    simple_clock_state_t *state = (simple_clock_state_t *)context;
-    char buf[11];
-
-    watch_date_time date_time;
-    uint32_t previous_date_time;
-    switch (event.event_type) {
-        case EVENT_ACTIVATE:
-        case EVENT_TICK:
-        case EVENT_LOW_ENERGY_UPDATE:
-            date_time = watch_rtc_get_date_time();
-            previous_date_time = state->previous_date_time;
-            state->previous_date_time = date_time.reg;
-
-            // check the battery voltage once a day...
-            if (date_time.unit.day != state->last_battery_check) {
-                state->last_battery_check = date_time.unit.day;
-                watch_enable_adc();
-                uint16_t voltage = watch_get_vcc_voltage();
-                watch_disable_adc();
-                // 2.2 volts will happen when the battery has maybe 5-10% remaining?
-                // we can refine this later.
-                state->battery_low = (voltage < 2200);
-            }
-
-            // ...and set the LAP indicator if low.
-            if (state->battery_low) watch_set_indicator(WATCH_INDICATOR_LAP);
-
-            if ((date_time.reg >> 6) == (previous_date_time >> 6) && event.event_type != EVENT_LOW_ENERGY_UPDATE) {
-                // everything before seconds is the same, don't waste cycles setting those segments.
-                watch_display_character_lp_seconds('0' + date_time.unit.second / 10, 8);
-                watch_display_character_lp_seconds('0' + date_time.unit.second % 10, 9);
-                break;
-            } else if ((date_time.reg >> 12) == (previous_date_time >> 12) && event.event_type != EVENT_LOW_ENERGY_UPDATE) {
-                // everything before minutes is the same.
-                sprintf(buf, "%02d%02d", date_time.unit.minute, date_time.unit.second);
-                watch_display_text(WATCH_POSITION_MINUTES, buf);
-                watch_display_text(WATCH_POSITION_SECONDS, buf + 2);
-            } else {
-                // other stuff changed; let's do it all.
-                if (!movement_clock_mode_24h()) {
-                    // if we are in 12 hour mode, do some cleanup.
-                    if (date_time.unit.hour < 12) {
-                        watch_clear_indicator(WATCH_INDICATOR_PM);
-                    } else {
-                        watch_set_indicator(WATCH_INDICATOR_PM);
-                    }
-                    date_time.unit.hour %= 12;
-                    if (date_time.unit.hour == 0) date_time.unit.hour = 12;
-                }
-                watch_display_text(WATCH_POSITION_TOP_LEFT, (char *) watch_utility_get_weekday(date_time));
-                sprintf(buf, "%2d%2d%02d%02d", date_time.unit.day, date_time.unit.hour, date_time.unit.minute, date_time.unit.second);
-                watch_display_text(WATCH_POSITION_TOP_RIGHT, buf);
-                watch_display_text(WATCH_POSITION_HOURS, buf + 2);
-                watch_display_text(WATCH_POSITION_MINUTES, buf + 4);
-                if (event.event_type == EVENT_LOW_ENERGY_UPDATE) {
-                    watch_display_character(' ', 9);
-                    if (!watch_sleep_animation_is_running()) watch_start_sleep_animation(500);
-                } else {
-                    watch_display_text(WATCH_POSITION_SECONDS, buf + 6);
-                }
-            }
-
-            // handle alarm indicator
-            if (state->alarm_enabled != movement_alarm_enabled()) _update_alarm_indicator(movement_alarm_enabled(), state);
-            break;
-        case EVENT_ALARM_LONG_PRESS:
-            state->signal_enabled = !state->signal_enabled;
-            if (state->signal_enabled) watch_set_indicator(WATCH_INDICATOR_BELL);
-            else watch_clear_indicator(WATCH_INDICATOR_BELL);
-            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);
-    }
-
-    return true;
-}
-
-void simple_clock_face_resign(void *context) {
-    (void) context;
-}
-
-bool simple_clock_face_wants_background_task(void *context) {
-    simple_clock_state_t *state = (simple_clock_state_t *)context;
-    if (!state->signal_enabled) return false;
-
-    watch_date_time date_time = watch_rtc_get_date_time();
-
-    return date_time.unit.minute == 0;
-}
diff --git a/watch-faces/clock/simple_clock_face.h b/watch-faces/clock/simple_clock_face.h
deleted file mode 100644 (file)
index ce9aa93..0000000
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * MIT License
- *
- * Copyright (c) 2022 Joey Castillo
- *
- * 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 SIMPLE_CLOCK_FACE_H_
-#define SIMPLE_CLOCK_FACE_H_
-
-/*
- * SIMPLE CLOCK FACE
- *
- * Displays the current time, matching the original operation of the watch.
- * This is the default display mode in most watch configurations.
- *
- * Long-press ALARM to toggle the hourly chime.
- */
-
-#include "movement.h"
-
-typedef struct {
-    uint32_t previous_date_time;
-    uint8_t last_battery_check;
-    uint8_t watch_face_index;
-    bool signal_enabled;
-    bool battery_low;
-    bool alarm_enabled;
-} simple_clock_state_t;
-
-void simple_clock_face_setup(uint8_t watch_face_index, void ** context_ptr);
-void simple_clock_face_activate(void *context);
-bool simple_clock_face_loop(movement_event_t event, void *context);
-void simple_clock_face_resign(void *context);
-bool simple_clock_face_wants_background_task(void *context);
-
-#define simple_clock_face ((const watch_face_t){ \
-    simple_clock_face_setup, \
-    simple_clock_face_activate, \
-    simple_clock_face_loop, \
-    simple_clock_face_resign, \
-    simple_clock_face_wants_background_task, \
-})
-
-#endif // SIMPLE_CLOCK_FACE_H_