]> git.earman.xyz Git - sensor-watch.git/commitdiff
widgets are now watch faces
authorJoey Castillo <jose.castillo@gmail.com>
Sat, 16 Oct 2021 17:14:52 +0000 (13:14 -0400)
committerJoey Castillo <jose.castillo@gmail.com>
Sat, 16 Oct 2021 17:14:52 +0000 (13:14 -0400)
20 files changed:
movement/make/Makefile
movement/movement.c
movement/movement.h
movement/movement_config.h
movement/watch_faces/clock/simple_clock_face.c [new file with mode: 0644]
movement/watch_faces/clock/simple_clock_face.h [new file with mode: 0644]
movement/watch_faces/complications/pulseometer_face.c [new file with mode: 0644]
movement/watch_faces/complications/pulseometer_face.h [new file with mode: 0644]
movement/watch_faces/settings/preferences_face.c [new file with mode: 0644]
movement/watch_faces/settings/preferences_face.h [new file with mode: 0644]
movement/watch_faces/settings/set_time_face.c [new file with mode: 0644]
movement/watch_faces/settings/set_time_face.h [new file with mode: 0644]
movement/widgets/clock/simple_clock_widget.c [deleted file]
movement/widgets/clock/simple_clock_widget.h [deleted file]
movement/widgets/complications/pulseometer_widget.c [deleted file]
movement/widgets/complications/pulseometer_widget.h [deleted file]
movement/widgets/settings/preferences_widget.c [deleted file]
movement/widgets/settings/preferences_widget.h [deleted file]
movement/widgets/settings/set_time_widget.c [deleted file]
movement/widgets/settings/set_time_widget.h [deleted file]

index 35b8007998d2082367bec3f06e23885226c7f368..8b29fba441b58692df9db6804e3c1628856578e7 100755 (executable)
@@ -7,26 +7,26 @@ include $(TOP)/make.mk
 # INCLUDES += \
 #   -I../ \
 #   -I../drivers/ \
-#   -I../widgets/fitness/
+#   -I../watch_faces/fitness/
 INCLUDES += \
   -I../ \
-  -I../widgets/ \
-  -I../widgets/clock/ \
-  -I../widgets/settings/ \
-  -I../widgets/complications/ \
+  -I../watch_faces/ \
+  -I../watch_faces/clock/ \
+  -I../watch_faces/settings/ \
+  -I../watch_faces/complications/ \
 
 # If you add any other source files you wish to compile, add them after ../app.c
 # Note that you will need to add a backslash at the end of any line you wish to continue, i.e.
 # SRCS += \
 #   ../movement.c \
 #   ../drivers/lis2dh.c \
-#   ../widgets/fitness/step_count_widget.c
+#   ../watch_faces/fitness/step_count_face.c
 SRCS += \
   ../movement.c \
-  ../widgets/clock/simple_clock_widget.c \
-  ../widgets/settings/preferences_widget.c \
-  ../widgets/settings/set_time_widget.c \
-  ../widgets/complications/pulseometer_widget.c \
+  ../watch_faces/clock/simple_clock_face.c \
+  ../watch_faces/settings/preferences_face.c \
+  ../watch_faces/settings/set_time_face.c \
+  ../watch_faces/complications/pulseometer_face.c \
 
 # Leave this line at the bottom of the file; it has all the targets for making your project.
 include $(TOP)/rules.mk
index 9c15833c4ae90010a51986bb0ed727955f4f27c7..3417345c0ae2648283ff07b8d6085283d9d4d052 100644 (file)
@@ -6,7 +6,7 @@
 #include "movement_config.h"
 
 LauncherState movement_state;
-void * widget_contexts[MOVEMENT_NUM_WIDGETS];
+void * watch_face_contexts[MOVEMENT_NUM_FACES];
 const int32_t movement_screensaver_deadlines[8] = {INT_MAX, 3600, 7200, 21600, 43200, 86400, 172800, 604800};
 LauncherEvent event;
 
@@ -33,13 +33,13 @@ void movement_illuminate_led() {
     movement_state.light_ticks = 3;
 }
 
-void movement_move_to_widget(uint8_t widget_index) {
-    movement_state.widget_changed = true;
-    movement_state.next_widget = widget_index;
+void movement_move_to_face(uint8_t watch_face_index) {
+    movement_state.watch_face_changed = true;
+    movement_state.next_face = watch_face_index;
 }
 
-void movement_move_to_next_widget() {
-    movement_move_to_widget((movement_state.current_widget + 1) % MOVEMENT_NUM_WIDGETS);
+void movement_move_to_next_face() {
+    movement_move_to_face((movement_state.current_watch_face + 1) % MOVEMENT_NUM_FACES);
 }
 
 void app_init() {
@@ -59,8 +59,8 @@ void app_setup() {
     static bool is_first_launch = true;
 
     if (is_first_launch) {
-        for(uint8_t i = 0; i < MOVEMENT_NUM_WIDGETS; i++) {
-            widget_contexts[i] = NULL;
+        for(uint8_t i = 0; i < MOVEMENT_NUM_FACES; i++) {
+            watch_face_contexts[i] = NULL;
             is_first_launch = false;
         }
     }
@@ -79,11 +79,11 @@ void app_setup() {
 
         movement_request_tick_frequency(1);
 
-        for(uint8_t i = 0; i < MOVEMENT_NUM_WIDGETS; i++) {
-            widgets[i].setup(&movement_state.movement_settings, &widget_contexts[i]);
+        for(uint8_t i = 0; i < MOVEMENT_NUM_FACES; i++) {
+            watch_faces[i].setup(&movement_state.movement_settings, &watch_face_contexts[i]);
         }
 
-        widgets[0].activate(&movement_state.movement_settings, widget_contexts[0]);
+        watch_faces[0].activate(&movement_state.movement_settings, watch_face_contexts[0]);
         event.subsecond = 0;
         event.event_type = EVENT_ACTIVATE;
     }
@@ -96,18 +96,18 @@ void app_wake_from_sleep() {
 }
 
 bool app_loop() {
-    if (movement_state.widget_changed) {
+    if (movement_state.watch_face_changed) {
         if (movement_state.movement_settings.bit.button_should_sound) {
-            // low note for nonzero case, high note for return to widget 0
-            watch_buzzer_play_note(movement_state.next_widget ? BUZZER_NOTE_C7 : BUZZER_NOTE_C8, 50);
+            // low note for nonzero case, high note for return to watch_face 0
+            watch_buzzer_play_note(movement_state.next_face ? BUZZER_NOTE_C7 : BUZZER_NOTE_C8, 50);
         }
-        widgets[movement_state.current_widget].resign(&movement_state.movement_settings, widget_contexts[movement_state.current_widget]);
-        movement_state.current_widget = movement_state.next_widget;
+        watch_faces[movement_state.current_watch_face].resign(&movement_state.movement_settings, watch_face_contexts[movement_state.current_watch_face]);
+        movement_state.current_watch_face = movement_state.next_face;
         watch_clear_display();
-        widgets[movement_state.current_widget].activate(&movement_state.movement_settings, widget_contexts[movement_state.current_widget]);
+        watch_faces[movement_state.current_watch_face].activate(&movement_state.movement_settings, watch_face_contexts[movement_state.current_watch_face]);
         event.subsecond = 0;
         event.event_type = EVENT_ACTIVATE;
-        movement_state.widget_changed = false;
+        movement_state.watch_face_changed = false;
     }
 
     // If the LED is off and should be on, turn it on
@@ -144,7 +144,7 @@ bool app_loop() {
         // as long as screensaver_ticks is -1 (i.e. screensaver is active), we wake up here, update the screen, and go right back to sleep.
         while (movement_state.screensaver_ticks == -1) {
             event.event_type = EVENT_SCREENSAVER;
-            widgets[movement_state.current_widget].loop(event, &movement_state.movement_settings, widget_contexts[movement_state.current_widget]);
+            watch_faces[movement_state.current_watch_face].loop(event, &movement_state.movement_settings, watch_face_contexts[movement_state.current_watch_face]);
             watch_enter_shallow_sleep(true);
         }
         // as soon as screensaver_ticks is reset by the extwake handler, we bail out of the loop and reactivate ourselves.
@@ -158,7 +158,7 @@ bool app_loop() {
 
     if (event.event_type) {
         event.subsecond = movement_state.subsecond;
-        can_sleep = widgets[movement_state.current_widget].loop(event, &movement_state.movement_settings, widget_contexts[movement_state.current_widget]);
+        can_sleep = watch_faces[movement_state.current_watch_face].loop(event, &movement_state.movement_settings, watch_face_contexts[movement_state.current_watch_face]);
         event.event_type = EVENT_NONE;
         event.subsecond = 0;
     }
index 025a5aa674ab3eb3c90535c37723e97d31d8be94..719a3d95a146ac61b0e9ccfce13cd91a1cf3c717 100644 (file)
@@ -23,9 +23,9 @@ typedef union {
 
 typedef enum {
     EVENT_NONE = 0,             // There is no event to report.
-    EVENT_ACTIVATE,             // Your widget is entering the foreground.
-    EVENT_TICK,                 // Most common event type. Your widget is being called from the tick callback.
-    EVENT_SCREENSAVER,          // Your widget is being asked to display its output for screensaver mode.
+    EVENT_ACTIVATE,             // Your watch face is entering the foreground.
+    EVENT_TICK,                 // Most common event type. Your watch face is being called from the tick callback.
+    EVENT_SCREENSAVER,          // Your watch face is being asked to display its output for screensaver mode.
     EVENT_LIGHT_BUTTON_DOWN,    // The light button has been pressed, but not yet released.
     EVENT_LIGHT_BUTTON_UP,      // The light button was pressed and released.
     EVENT_LIGHT_LONG_PRESS,     // The light button was held for >2 seconds, and released.
@@ -42,26 +42,26 @@ typedef struct {
     uint8_t subsecond;
 } LauncherEvent;
 
-typedef void (*movement_widget_setup)(LauncherSettings *settings, void ** context_ptr);
-typedef void (*movement_widget_activate)(LauncherSettings *settings, void *context);
-typedef bool (*movement_widget_loop)(LauncherEvent event, LauncherSettings *settings, void *context);
-typedef void (*movement_widget_resign)(LauncherSettings *settings, void *context);
+typedef void (*watch_face_setup)(LauncherSettings *settings, void ** context_ptr);
+typedef void (*watch_face_activate)(LauncherSettings *settings, void *context);
+typedef bool (*watch_face_loop)(LauncherEvent event, LauncherSettings *settings, void *context);
+typedef void (*watch_face_resign)(LauncherSettings *settings, void *context);
 
 typedef struct {
-    movement_widget_setup setup;
-    movement_widget_activate activate;
-    movement_widget_loop loop;
-    movement_widget_resign resign;
-} WatchWidget;
+    watch_face_setup setup;
+    watch_face_activate activate;
+    watch_face_loop loop;
+    watch_face_resign resign;
+} WatchFace;
 
 typedef struct {
     // properties stored in BACKUP register
     LauncherSettings movement_settings;
 
     // transient properties
-    int16_t current_widget;
-    int16_t next_widget;
-    bool widget_changed;
+    int16_t current_watch_face;
+    int16_t next_face;
+    bool watch_face_changed;
 
     // LED stuff
     uint8_t light_ticks;
@@ -81,8 +81,8 @@ typedef struct {
     uint8_t subsecond;
 } LauncherState;
 
-void movement_move_to_widget(uint8_t widget_index);
-void movement_move_to_next_widget();
+void movement_move_to_face(uint8_t watch_face_index);
+void movement_move_to_next_face();
 void movement_illuminate_led();
 void movement_request_tick_frequency(uint8_t freq);
 
index 49f342ca8a68a5787d4a3fe1242ff8bc26e1a824..41066d19b840476a1942ad205366317c84efc041 100644 (file)
@@ -1,17 +1,17 @@
 #ifndef MOVEMENT_CONFIG_H_
 #define MOVEMENT_CONFIG_H_
 
-#include "simple_clock_widget.h"
-#include "preferences_widget.h"
-#include "set_time_widget.h"
-#include "pulseometer_widget.h"
+#include "simple_clock_face.h"
+#include "preferences_face.h"
+#include "set_time_face.h"
+#include "pulseometer_face.h"
 
-#define MOVEMENT_NUM_WIDGETS 3
+#define MOVEMENT_NUM_FACES 3
 
-WatchWidget widgets[MOVEMENT_NUM_WIDGETS] = {
-    simple_clock_widget,
-    preferences_widget,
-    set_time_widget,
+WatchFace watch_faces[MOVEMENT_NUM_FACES] = {
+    simple_clock_face,
+    preferences_face,
+    set_time_face,
 };
 
 
diff --git a/movement/watch_faces/clock/simple_clock_face.c b/movement/watch_faces/clock/simple_clock_face.c
new file mode 100644 (file)
index 0000000..97067b0
--- /dev/null
@@ -0,0 +1,92 @@
+#include <stdlib.h>
+#include "simple_clock_face.h"
+#include "watch.h"
+
+void simple_clock_face_setup(LauncherSettings *settings, void ** context_ptr) {
+    (void) settings;
+    // the only context we need is the timestamp of the previous tick.
+    if (*context_ptr == NULL) *context_ptr = malloc(sizeof(uint32_t));
+}
+
+void simple_clock_face_activate(LauncherSettings *settings, void *context) {
+    if (settings->bit.clock_mode_24h) {
+        watch_set_indicator(WATCH_INDICATOR_24H);
+    }
+    watch_set_colon();
+    // this ensures that none of the timestamp fields will match, so we can re-render them all.
+    *((uint32_t *)context) = 0xFFFFFFFF;
+}
+
+bool simple_clock_face_loop(LauncherEvent event, LauncherSettings *settings, void *context) {
+    printf("simple_clock_face_loop\n");
+    const char weekdays[7][3] = {"SA", "SU", "MO", "TU", "WE", "TH", "FR"};
+    char buf[11];
+    uint8_t pos;
+
+    watch_date_time date_time;
+    uint32_t previous_date_time;
+    switch (event.event_type) {
+        case EVENT_ACTIVATE:
+        case EVENT_TICK:
+        case EVENT_SCREENSAVER:
+            date_time = watch_rtc_get_date_time();
+            previous_date_time = *((uint32_t *)context);
+            *((uint32_t *)context) = date_time.reg;
+
+            if (date_time.reg >> 6 == previous_date_time >> 6 && event.event_type != EVENT_SCREENSAVER) {
+                // everything before seconds is the same, don't waste cycles setting those segments.
+                pos = 8;
+                sprintf(buf, "%02d", date_time.unit.second);
+            } else if (date_time.reg >> 12 == previous_date_time >> 12 && event.event_type != EVENT_SCREENSAVER) {
+                // everything before minutes is the same.
+                pos = 6;
+                sprintf(buf, "%02d%02d", date_time.unit.minute, date_time.unit.second);
+            } else {
+                // other stuff changed; let's do it all.
+                if (!settings->bit.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;
+                }
+                pos = 0;
+                if (event.event_type == EVENT_SCREENSAVER) {
+                    sprintf(buf, "%s%2d%2d%02d  ", weekdays[simple_clock_face_get_weekday(date_time.unit.year, date_time.unit.month, date_time.unit.day)], date_time.unit.day, date_time.unit.hour, date_time.unit.minute);
+                } else {
+                    sprintf(buf, "%s%2d%2d%02d%02d", weekdays[simple_clock_face_get_weekday(date_time.unit.year, date_time.unit.month, date_time.unit.day)], date_time.unit.day, date_time.unit.hour, date_time.unit.minute, date_time.unit.second);
+                }
+            }
+            watch_display_string(buf, pos);
+            break;
+        case EVENT_MODE_BUTTON_UP:
+            movement_move_to_next_face();
+            return false;
+        case EVENT_LIGHT_BUTTON_UP:
+            movement_illuminate_led();
+            break;
+        case EVENT_ALARM_BUTTON_UP:
+            break;
+        default:
+            break;
+    }
+
+    return true;
+}
+
+void simple_clock_face_resign(LauncherSettings *settings, void *context) {
+    (void) settings;
+    (void) context;
+}
+
+uint8_t simple_clock_face_get_weekday(uint16_t year, uint16_t month, uint16_t day) {
+    year += 20;
+    if (month <= 2) {
+        month += 12;
+        year--;
+    }
+    return (day + 13 * (month + 1) / 5 + year + year / 4 + 525) % 7;
+}
diff --git a/movement/watch_faces/clock/simple_clock_face.h b/movement/watch_faces/clock/simple_clock_face.h
new file mode 100644 (file)
index 0000000..59201a1
--- /dev/null
@@ -0,0 +1,20 @@
+#ifndef SIMPLE_CLOCK_FACE_H_
+#define SIMPLE_CLOCK_FACE_H_
+
+#include "movement.h"
+
+void simple_clock_face_setup(LauncherSettings *settings, void ** context_ptr);
+void simple_clock_face_activate(LauncherSettings *settings, void *context);
+bool simple_clock_face_loop(LauncherEvent event, LauncherSettings *settings, void *context);
+void simple_clock_face_resign(LauncherSettings *settings, void *context);
+
+uint8_t simple_clock_face_get_weekday(uint16_t day, uint16_t month, uint16_t year);
+
+#define simple_clock_face { \
+    simple_clock_face_setup, \
+    simple_clock_face_activate, \
+    simple_clock_face_loop, \
+    simple_clock_face_resign, \
+}
+
+#endif // FAKE_FACE_H_
\ No newline at end of file
diff --git a/movement/watch_faces/complications/pulseometer_face.c b/movement/watch_faces/complications/pulseometer_face.c
new file mode 100644 (file)
index 0000000..e38153d
--- /dev/null
@@ -0,0 +1,87 @@
+#include <stdlib.h>
+#include <string.h>
+#include "pulseometer_face.h"
+#include "watch.h"
+
+#define PULSOMETER_FACE_FREQUENCY_FACTOR (4ul) // refresh rate will be 2 to this power Hz (0 for 1 Hz, 2 for 4 Hz, etc.)
+#define PULSOMETER_FACE_FREQUENCY (1 << PULSOMETER_FACE_FREQUENCY_FACTOR)
+
+void pulseometer_face_setup(LauncherSettings *settings, void ** context_ptr) {
+    (void) settings;
+    if (*context_ptr == NULL) *context_ptr = malloc(sizeof(PulsometerState));
+}
+
+void pulseometer_face_activate(LauncherSettings *settings, void *context) {
+    (void) settings;
+    memset(context, 0, sizeof(PulsometerState));
+}
+
+bool pulseometer_face_loop(LauncherEvent event, LauncherSettings *settings, void *context) {
+    printf("pulseometer_face_loop\n");
+    (void) settings;
+    PulsometerState *pulsometer_state = (PulsometerState *)context;
+    char buf[14];
+    switch (event.event_type) {
+        case EVENT_TICK:
+            if (pulsometer_state->pulse == 0 && !pulsometer_state->measuring) {
+                switch (pulsometer_state->ticks % 5) {
+                    case 0:
+                        watch_display_string("  Hold  ", 2);
+                        break;
+                    case 1:
+                        watch_display_string(" Alarn", 4);
+                        break;
+                    case 2:
+                        watch_display_string("+   Count ", 0);
+                        break;
+                    case 3:
+                        watch_display_string("  30Beats ", 0);
+                        break;
+                    case 4:
+                        watch_clear_display();
+                        break;
+                }
+                pulsometer_state->ticks = (pulsometer_state->ticks + 1) % 5;
+            } else {
+                if (pulsometer_state->measuring && pulsometer_state->ticks) {
+                    pulsometer_state->pulse = (int16_t)((30.0 * ((float)(60 << PULSOMETER_FACE_FREQUENCY_FACTOR) / (float)pulsometer_state->ticks)) + 0.5);
+                }
+                if (pulsometer_state->pulse > 240) {
+                    watch_display_string("        Hi", 0);
+                } else if (pulsometer_state->pulse < 40) {
+                    watch_display_string("        Lo", 0);
+                } else {
+                    sprintf(buf, "    %-3dbpn", pulsometer_state->pulse);
+                    watch_display_string(buf, 0);
+                }
+                if (pulsometer_state->measuring) pulsometer_state->ticks++;
+            }
+            return false;
+        case EVENT_MODE_BUTTON_UP:
+            movement_move_to_next_face();
+            return false;
+        case EVENT_LIGHT_BUTTON_UP:
+            movement_illuminate_led();
+            break;
+        case EVENT_ALARM_BUTTON_DOWN:
+            pulsometer_state->ticks = 0;
+            pulsometer_state->pulse = 0xFFFF;
+            pulsometer_state->measuring = true;
+            movement_request_tick_frequency(PULSOMETER_FACE_FREQUENCY);
+            break;
+        case EVENT_ALARM_BUTTON_UP:
+        case EVENT_ALARM_LONG_PRESS:
+            pulsometer_state->measuring = false;
+            movement_request_tick_frequency(1);
+            break;
+        default:
+            break;
+    }
+
+    return true;
+}
+
+void pulseometer_face_resign(LauncherSettings *settings, void *context) {
+    (void) settings;
+    (void) context;
+}
diff --git a/movement/watch_faces/complications/pulseometer_face.h b/movement/watch_faces/complications/pulseometer_face.h
new file mode 100644 (file)
index 0000000..7b96259
--- /dev/null
@@ -0,0 +1,24 @@
+#ifndef PULSEOMETER_FACE_H_
+#define PULSEOMETER_FACE_H_
+
+#include "movement.h"
+
+typedef struct {
+    bool measuring;
+    int16_t pulse;
+    int16_t ticks;
+} PulsometerState;
+
+void pulseometer_face_setup(LauncherSettings *settings, void ** context_ptr);
+void pulseometer_face_activate(LauncherSettings *settings, void *context);
+bool pulseometer_face_loop(LauncherEvent event, LauncherSettings *settings, void *context);
+void pulseometer_face_resign(LauncherSettings *settings, void *context);
+
+#define pulseometer_face { \
+    pulseometer_face_setup, \
+    pulseometer_face_activate, \
+    pulseometer_face_loop, \
+    pulseometer_face_resign, \
+}
+
+#endif // PULSEOMETER_FACE_H_
\ No newline at end of file
diff --git a/movement/watch_faces/settings/preferences_face.c b/movement/watch_faces/settings/preferences_face.c
new file mode 100644 (file)
index 0000000..f499e36
--- /dev/null
@@ -0,0 +1,120 @@
+#include <stdlib.h>
+#include "preferences_face.h"
+#include "watch.h"
+
+#define PREFERENCES_FACE_NUM_PREFEFENCES (5)
+const char preferences_face_titles[PREFERENCES_FACE_NUM_PREFEFENCES][11] = {"CL        ", "Bt  Beep  ", "SC        ", "Lt   grn  ", "Lt   red  "};
+
+void preferences_face_setup(LauncherSettings *settings, void ** context_ptr) {
+    (void) settings;
+    if (*context_ptr == NULL) *context_ptr = malloc(sizeof(uint8_t));
+}
+
+void preferences_face_activate(LauncherSettings *settings, void *context) {
+    (void) settings;
+    *((uint8_t *)context) = 0;
+    movement_request_tick_frequency(4); // we need to manually blink some pixels
+}
+
+bool preferences_face_loop(LauncherEvent event, LauncherSettings *settings, void *context) {
+    printf("preferences_face_loop\n");
+    uint8_t current_page = *((uint8_t *)context);
+    switch (event.event_type) {
+        case EVENT_MODE_BUTTON_UP:
+            watch_set_led_off();
+            movement_move_to_next_face();
+            return false;
+        case EVENT_LIGHT_BUTTON_UP:
+            current_page = (current_page + 1) % PREFERENCES_FACE_NUM_PREFEFENCES;
+            *((uint8_t *)context) = current_page;
+            break;
+        case EVENT_ALARM_BUTTON_UP:
+            switch (current_page) {
+                case 0:
+                    settings->bit.clock_mode_24h = !(settings->bit.clock_mode_24h);
+                    break;
+                case 1:
+                    settings->bit.button_should_sound = !(settings->bit.button_should_sound);
+                    break;
+                case 2:
+                    settings->bit.screensaver_interval = settings->bit.screensaver_interval + 1;
+                    break;
+                case 3:
+                    settings->bit.led_green_color = settings->bit.led_green_color + 1;
+                    break;
+                case 4:
+                    settings->bit.led_red_color = settings->bit.led_red_color + 1;
+                    break;
+            }
+            break;
+        default:
+            break;
+    }
+
+    watch_display_string((char *)preferences_face_titles[current_page], 0);
+
+    if (event.subsecond % 2) return current_page <= 2;
+    char buf[3];
+    switch (current_page) {
+        case 0:
+            if (settings->bit.clock_mode_24h) watch_display_string("24h", 4);
+            else watch_display_string("12h", 4);
+            break;
+        case 1:
+            if (settings->bit.button_should_sound) watch_display_string("y", 9);
+            else watch_display_string("n", 9);
+            break;
+        case 2:
+            switch (settings->bit.screensaver_interval) {
+                case 0:
+                    watch_display_string(" never", 4);
+                    break;
+                case 1:
+                    watch_display_string("1 hour", 4);
+                    break;
+                case 2:
+                    watch_display_string("2 hour", 4);
+                    break;
+                case 3:
+                    watch_display_string("6 hour", 4);
+                    break;
+                case 4:
+                    watch_display_string("12 hr", 4);
+                    break;
+                case 5:
+                    watch_display_string(" 1 day", 4);
+                    break;
+                case 6:
+                    watch_display_string(" 2 day", 4);
+                    break;
+                case 7:
+                    watch_display_string(" 7 day", 4);
+                    break;
+            }
+            break;
+        case 3:
+            sprintf(buf, "%2d", settings->bit.led_green_color);
+            watch_display_string(buf, 8);
+            break;
+        case 4:
+            sprintf(buf, "%2d", settings->bit.led_red_color);
+            watch_display_string(buf, 8);
+            break;
+    }
+
+    if (current_page > 2) {
+        watch_set_led_color(settings->bit.led_red_color ? (0xF | settings->bit.led_red_color << 4) : 0,
+                            settings->bit.led_green_color ? (0xF | settings->bit.led_green_color << 4) : 0);
+        return false;
+    }
+
+    watch_set_led_off();
+    return true;
+}
+
+void preferences_face_resign(LauncherSettings *settings, void *context) {
+    (void) settings;
+    (void) context;
+    watch_set_led_off();
+    movement_request_tick_frequency(1);
+}
diff --git a/movement/watch_faces/settings/preferences_face.h b/movement/watch_faces/settings/preferences_face.h
new file mode 100644 (file)
index 0000000..218f99c
--- /dev/null
@@ -0,0 +1,18 @@
+#ifndef PREFERENCES_FACE_H_
+#define PREFERENCES_FACE_H_
+
+#include "movement.h"
+
+void preferences_face_setup(LauncherSettings *settings, void ** context_ptr);
+void preferences_face_activate(LauncherSettings *settings, void *context);
+bool preferences_face_loop(LauncherEvent event, LauncherSettings *settings, void *context);
+void preferences_face_resign(LauncherSettings *settings, void *context);
+
+#define preferences_face { \
+    preferences_face_setup, \
+    preferences_face_activate, \
+    preferences_face_loop, \
+    preferences_face_resign, \
+}
+
+#endif // PREFERENCES_FACE_H_
\ No newline at end of file
diff --git a/movement/watch_faces/settings/set_time_face.c b/movement/watch_faces/settings/set_time_face.c
new file mode 100644 (file)
index 0000000..3649861
--- /dev/null
@@ -0,0 +1,109 @@
+#include <stdlib.h>
+#include "set_time_face.h"
+#include "watch.h"
+
+#define SET_TIME_FACE_NUM_SETTINGS (6)
+const char set_time_face_titles[SET_TIME_FACE_NUM_SETTINGS][3] = {"HR", "MN", "SE", "YR", "MO", "DA"};
+
+void set_time_face_setup(LauncherSettings *settings, void ** context_ptr) {
+    (void) settings;
+    if (*context_ptr == NULL) *context_ptr = malloc(sizeof(uint8_t));
+}
+
+void set_time_face_activate(LauncherSettings *settings, void *context) {
+    (void) settings;
+    *((uint8_t *)context) = 0;
+    movement_request_tick_frequency(4);
+}
+
+bool set_time_face_loop(LauncherEvent event, LauncherSettings *settings, void *context) {
+    uint8_t current_page = *((uint8_t *)context);
+    const uint8_t days_in_month[12] = {31, 28, 31, 30, 31, 30, 30, 31, 30, 31, 30, 31};
+    watch_date_time date_time = watch_rtc_get_date_time();
+
+    switch (event.event_type) {
+        case EVENT_MODE_BUTTON_UP:
+            movement_move_to_next_face();
+            return false;
+        case EVENT_LIGHT_BUTTON_UP:
+            current_page = (current_page + 1) % SET_TIME_FACE_NUM_SETTINGS;
+            *((uint8_t *)context) = current_page;
+            break;
+        case EVENT_ALARM_BUTTON_UP:
+            switch (current_page) {
+                case 0: // hour
+                    date_time.unit.hour = (date_time.unit.hour + 1) % 24;
+                    break;
+                case 1: // minute
+                    date_time.unit.minute = (date_time.unit.minute + 1) % 60;
+                    break;
+                case 2: // second
+                    date_time.unit.second = 0;
+                    break;
+                case 3: // year
+                    // only allow 2021-2030. fix this sometime next decade
+                    date_time.unit.year = ((date_time.unit.year % 10) + 1);
+                    break;
+                case 4: // month
+                    date_time.unit.month = (date_time.unit.month % 12) + 1;
+                    break;
+                case 5: // day
+                    date_time.unit.day = date_time.unit.day + 1;
+                    // can't set to the 29th on a leap year. if it's february 29, set to 11:59 on the 28th.
+                    // and it should roll over.
+                    if (date_time.unit.day > days_in_month[date_time.unit.month - 1]) {
+                        date_time.unit.day = 1;
+                    }
+                    break;
+            }
+            watch_rtc_set_date_time(date_time);
+            break;
+        default:
+            break;
+    }
+
+    char buf[11];
+    if (current_page < 3) {
+        watch_set_colon();
+        if (settings->bit.clock_mode_24h) {
+            watch_set_indicator(WATCH_INDICATOR_24H);
+            sprintf(buf, "%s  %2d%02d%02d", set_time_face_titles[current_page], date_time.unit.hour, date_time.unit.minute, date_time.unit.second);
+        } else {
+            sprintf(buf, "%s  %2d%02d%02d", set_time_face_titles[current_page], (date_time.unit.hour % 12) ? (date_time.unit.hour % 12) : 12, date_time.unit.minute, date_time.unit.second);
+            if (date_time.unit.hour > 12) watch_set_indicator(WATCH_INDICATOR_PM);
+            else watch_clear_indicator(WATCH_INDICATOR_PM);
+        }
+    } else {
+        watch_clear_colon();
+        watch_clear_indicator(WATCH_INDICATOR_24H);
+        watch_clear_indicator(WATCH_INDICATOR_PM);
+        sprintf(buf, "%s  %2d%02d%02d", set_time_face_titles[current_page], date_time.unit.year + 20, date_time.unit.month, date_time.unit.day);
+    }
+    if (event.subsecond % 2) {
+        switch (current_page) {
+            case 0:
+            case 3:
+                buf[4] = buf[5] = ' ';
+                break;
+            case 1:
+            case 4:
+                buf[6] = buf[7] = ' ';
+                break;
+            case 2:
+            case 5:
+                buf[8] = buf[9] = ' ';
+                break;
+        }
+    }
+
+    watch_display_string(buf, 0);
+
+    return true;
+}
+
+void set_time_face_resign(LauncherSettings *settings, void *context) {
+    (void) settings;
+    (void) context;
+    watch_set_led_off();
+    movement_request_tick_frequency(1);
+}
diff --git a/movement/watch_faces/settings/set_time_face.h b/movement/watch_faces/settings/set_time_face.h
new file mode 100644 (file)
index 0000000..0c34d6b
--- /dev/null
@@ -0,0 +1,18 @@
+#ifndef SET_TIME_FACE_H_
+#define SET_TIME_FACE_H_
+
+#include "movement.h"
+
+void set_time_face_setup(LauncherSettings *settings, void ** context_ptr);
+void set_time_face_activate(LauncherSettings *settings, void *context);
+bool set_time_face_loop(LauncherEvent event, LauncherSettings *settings, void *context);
+void set_time_face_resign(LauncherSettings *settings, void *context);
+
+#define set_time_face { \
+    set_time_face_setup, \
+    set_time_face_activate, \
+    set_time_face_loop, \
+    set_time_face_resign, \
+}
+
+#endif // SET_TIME_FACE_H_
diff --git a/movement/widgets/clock/simple_clock_widget.c b/movement/widgets/clock/simple_clock_widget.c
deleted file mode 100644 (file)
index 2221886..0000000
+++ /dev/null
@@ -1,92 +0,0 @@
-#include <stdlib.h>
-#include "simple_clock_widget.h"
-#include "watch.h"
-
-void simple_clock_widget_setup(LauncherSettings *settings, void ** context_ptr) {
-    (void) settings;
-    // the only context we need is the timestamp of the previous tick.
-    if (*context_ptr == NULL) *context_ptr = malloc(sizeof(uint32_t));
-}
-
-void simple_clock_widget_activate(LauncherSettings *settings, void *context) {
-    if (settings->bit.clock_mode_24h) {
-        watch_set_indicator(WATCH_INDICATOR_24H);
-    }
-    watch_set_colon();
-    // this ensures that none of the timestamp fields will match, so we can re-render them all.
-    *((uint32_t *)context) = 0xFFFFFFFF;
-}
-
-bool simple_clock_widget_loop(LauncherEvent event, LauncherSettings *settings, void *context) {
-    printf("simple_clock_widget_loop\n");
-    const char weekdays[7][3] = {"SA", "SU", "MO", "TU", "WE", "TH", "FR"};
-    char buf[11];
-    uint8_t pos;
-
-    watch_date_time date_time;
-    uint32_t previous_date_time;
-    switch (event.event_type) {
-        case EVENT_ACTIVATE:
-        case EVENT_TICK:
-        case EVENT_SCREENSAVER:
-            date_time = watch_rtc_get_date_time();
-            previous_date_time = *((uint32_t *)context);
-            *((uint32_t *)context) = date_time.reg;
-
-            if (date_time.reg >> 6 == previous_date_time >> 6 && event.event_type != EVENT_SCREENSAVER) {
-                // everything before seconds is the same, don't waste cycles setting those segments.
-                pos = 8;
-                sprintf(buf, "%02d", date_time.unit.second);
-            } else if (date_time.reg >> 12 == previous_date_time >> 12 && event.event_type != EVENT_SCREENSAVER) {
-                // everything before minutes is the same.
-                pos = 6;
-                sprintf(buf, "%02d%02d", date_time.unit.minute, date_time.unit.second);
-            } else {
-                // other stuff changed; let's do it all.
-                if (!settings->bit.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;
-                }
-                pos = 0;
-                if (event.event_type == EVENT_SCREENSAVER) {
-                    sprintf(buf, "%s%2d%2d%02d  ", weekdays[simple_clock_widget_get_weekday(date_time.unit.year, date_time.unit.month, date_time.unit.day)], date_time.unit.day, date_time.unit.hour, date_time.unit.minute);
-                } else {
-                    sprintf(buf, "%s%2d%2d%02d%02d", weekdays[simple_clock_widget_get_weekday(date_time.unit.year, date_time.unit.month, date_time.unit.day)], date_time.unit.day, date_time.unit.hour, date_time.unit.minute, date_time.unit.second);
-                }
-            }
-            watch_display_string(buf, pos);
-            break;
-        case EVENT_MODE_BUTTON_UP:
-            movement_move_to_next_widget();
-            return false;
-        case EVENT_LIGHT_BUTTON_UP:
-            movement_illuminate_led();
-            break;
-        case EVENT_ALARM_BUTTON_UP:
-            break;
-        default:
-            break;
-    }
-
-    return true;
-}
-
-void simple_clock_widget_resign(LauncherSettings *settings, void *context) {
-    (void) settings;
-    (void) context;
-}
-
-uint8_t simple_clock_widget_get_weekday(uint16_t year, uint16_t month, uint16_t day) {
-    year += 20;
-    if (month <= 2) {
-        month += 12;
-        year--;
-    }
-    return (day + 13 * (month + 1) / 5 + year + year / 4 + 525) % 7;
-}
diff --git a/movement/widgets/clock/simple_clock_widget.h b/movement/widgets/clock/simple_clock_widget.h
deleted file mode 100644 (file)
index 3bf4c9a..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-#ifndef SIMPLE_CLOCK_WIDGET_H_
-#define SIMPLE_CLOCK_WIDGET_H_
-
-#include "movement.h"
-
-void simple_clock_widget_setup(LauncherSettings *settings, void ** context_ptr);
-void simple_clock_widget_activate(LauncherSettings *settings, void *context);
-bool simple_clock_widget_loop(LauncherEvent event, LauncherSettings *settings, void *context);
-void simple_clock_widget_resign(LauncherSettings *settings, void *context);
-
-uint8_t simple_clock_widget_get_weekday(uint16_t day, uint16_t month, uint16_t year);
-
-#define simple_clock_widget { \
-    simple_clock_widget_setup, \
-    simple_clock_widget_activate, \
-    simple_clock_widget_loop, \
-    simple_clock_widget_resign, \
-}
-
-#endif // FAKE_WIDGET_H_
\ No newline at end of file
diff --git a/movement/widgets/complications/pulseometer_widget.c b/movement/widgets/complications/pulseometer_widget.c
deleted file mode 100644 (file)
index 6384685..0000000
+++ /dev/null
@@ -1,87 +0,0 @@
-#include <stdlib.h>
-#include <string.h>
-#include "pulseometer_widget.h"
-#include "watch.h"
-
-#define PULSOMETER_WIDGET_FREQUENCY_FACTOR (4ul) // refresh rate will be 2 to this power Hz (0 for 1 Hz, 2 for 4 Hz, etc.)
-#define PULSOMETER_WIDGET_FREQUENCY (1 << PULSOMETER_WIDGET_FREQUENCY_FACTOR)
-
-void pulseometer_widget_setup(LauncherSettings *settings, void ** context_ptr) {
-    (void) settings;
-    if (*context_ptr == NULL) *context_ptr = malloc(sizeof(PulsometerState));
-}
-
-void pulseometer_widget_activate(LauncherSettings *settings, void *context) {
-    (void) settings;
-    memset(context, 0, sizeof(PulsometerState));
-}
-
-bool pulseometer_widget_loop(LauncherEvent event, LauncherSettings *settings, void *context) {
-    printf("pulseometer_widget_loop\n");
-    (void) settings;
-    PulsometerState *pulsometer_state = (PulsometerState *)context;
-    char buf[14];
-    switch (event.event_type) {
-        case EVENT_TICK:
-            if (pulsometer_state->pulse == 0 && !pulsometer_state->measuring) {
-                switch (pulsometer_state->ticks % 5) {
-                    case 0:
-                        watch_display_string("  Hold  ", 2);
-                        break;
-                    case 1:
-                        watch_display_string(" Alarn", 4);
-                        break;
-                    case 2:
-                        watch_display_string("+   Count ", 0);
-                        break;
-                    case 3:
-                        watch_display_string("  30Beats ", 0);
-                        break;
-                    case 4:
-                        watch_clear_display();
-                        break;
-                }
-                pulsometer_state->ticks = (pulsometer_state->ticks + 1) % 5;
-            } else {
-                if (pulsometer_state->measuring && pulsometer_state->ticks) {
-                    pulsometer_state->pulse = (int16_t)((30.0 * ((float)(60 << PULSOMETER_WIDGET_FREQUENCY_FACTOR) / (float)pulsometer_state->ticks)) + 0.5);
-                }
-                if (pulsometer_state->pulse > 240) {
-                    watch_display_string("        Hi", 0);
-                } else if (pulsometer_state->pulse < 40) {
-                    watch_display_string("        Lo", 0);
-                } else {
-                    sprintf(buf, "    %-3dbpn", pulsometer_state->pulse);
-                    watch_display_string(buf, 0);
-                }
-                if (pulsometer_state->measuring) pulsometer_state->ticks++;
-            }
-            return false;
-        case EVENT_MODE_BUTTON_UP:
-            movement_move_to_next_widget();
-            return false;
-        case EVENT_LIGHT_BUTTON_UP:
-            movement_illuminate_led();
-            break;
-        case EVENT_ALARM_BUTTON_DOWN:
-            pulsometer_state->ticks = 0;
-            pulsometer_state->pulse = 0xFFFF;
-            pulsometer_state->measuring = true;
-            movement_request_tick_frequency(PULSOMETER_WIDGET_FREQUENCY);
-            break;
-        case EVENT_ALARM_BUTTON_UP:
-        case EVENT_ALARM_LONG_PRESS:
-            pulsometer_state->measuring = false;
-            movement_request_tick_frequency(1);
-            break;
-        default:
-            break;
-    }
-
-    return true;
-}
-
-void pulseometer_widget_resign(LauncherSettings *settings, void *context) {
-    (void) settings;
-    (void) context;
-}
diff --git a/movement/widgets/complications/pulseometer_widget.h b/movement/widgets/complications/pulseometer_widget.h
deleted file mode 100644 (file)
index e594766..0000000
+++ /dev/null
@@ -1,24 +0,0 @@
-#ifndef PULSEOMETER_WIDGET_H_
-#define PULSEOMETER_WIDGET_H_
-
-#include "movement.h"
-
-typedef struct {
-    bool measuring;
-    int16_t pulse;
-    int16_t ticks;
-} PulsometerState;
-
-void pulseometer_widget_setup(LauncherSettings *settings, void ** context_ptr);
-void pulseometer_widget_activate(LauncherSettings *settings, void *context);
-bool pulseometer_widget_loop(LauncherEvent event, LauncherSettings *settings, void *context);
-void pulseometer_widget_resign(LauncherSettings *settings, void *context);
-
-#define pulseometer_widget { \
-    pulseometer_widget_setup, \
-    pulseometer_widget_activate, \
-    pulseometer_widget_loop, \
-    pulseometer_widget_resign, \
-}
-
-#endif // PULSEOMETER_WIDGET_H_
\ No newline at end of file
diff --git a/movement/widgets/settings/preferences_widget.c b/movement/widgets/settings/preferences_widget.c
deleted file mode 100644 (file)
index c453732..0000000
+++ /dev/null
@@ -1,120 +0,0 @@
-#include <stdlib.h>
-#include "preferences_widget.h"
-#include "watch.h"
-
-#define PREFERENCES_WIDGET_NUM_PREFEFENCES (5)
-const char preferences_widget_titles[PREFERENCES_WIDGET_NUM_PREFEFENCES][11] = {"CL        ", "Bt  Beep  ", "SC        ", "Lt   grn  ", "Lt   red  "};
-
-void preferences_widget_setup(LauncherSettings *settings, void ** context_ptr) {
-    (void) settings;
-    if (*context_ptr == NULL) *context_ptr = malloc(sizeof(uint8_t));
-}
-
-void preferences_widget_activate(LauncherSettings *settings, void *context) {
-    (void) settings;
-    *((uint8_t *)context) = 0;
-    movement_request_tick_frequency(4); // we need to manually blink some pixels
-}
-
-bool preferences_widget_loop(LauncherEvent event, LauncherSettings *settings, void *context) {
-    printf("preferences_widget_loop\n");
-    uint8_t current_page = *((uint8_t *)context);
-    switch (event.event_type) {
-        case EVENT_MODE_BUTTON_UP:
-            watch_set_led_off();
-            movement_move_to_next_widget();
-            return false;
-        case EVENT_LIGHT_BUTTON_UP:
-            current_page = (current_page + 1) % PREFERENCES_WIDGET_NUM_PREFEFENCES;
-            *((uint8_t *)context) = current_page;
-            break;
-        case EVENT_ALARM_BUTTON_UP:
-            switch (current_page) {
-                case 0:
-                    settings->bit.clock_mode_24h = !(settings->bit.clock_mode_24h);
-                    break;
-                case 1:
-                    settings->bit.button_should_sound = !(settings->bit.button_should_sound);
-                    break;
-                case 2:
-                    settings->bit.screensaver_interval = settings->bit.screensaver_interval + 1;
-                    break;
-                case 3:
-                    settings->bit.led_green_color = settings->bit.led_green_color + 1;
-                    break;
-                case 4:
-                    settings->bit.led_red_color = settings->bit.led_red_color + 1;
-                    break;
-            }
-            break;
-        default:
-            break;
-    }
-
-    watch_display_string((char *)preferences_widget_titles[current_page], 0);
-
-    if (event.subsecond % 2) return current_page <= 2;
-    char buf[3];
-    switch (current_page) {
-        case 0:
-            if (settings->bit.clock_mode_24h) watch_display_string("24h", 4);
-            else watch_display_string("12h", 4);
-            break;
-        case 1:
-            if (settings->bit.button_should_sound) watch_display_string("y", 9);
-            else watch_display_string("n", 9);
-            break;
-        case 2:
-            switch (settings->bit.screensaver_interval) {
-                case 0:
-                    watch_display_string(" never", 4);
-                    break;
-                case 1:
-                    watch_display_string("1 hour", 4);
-                    break;
-                case 2:
-                    watch_display_string("2 hour", 4);
-                    break;
-                case 3:
-                    watch_display_string("6 hour", 4);
-                    break;
-                case 4:
-                    watch_display_string("12 hr", 4);
-                    break;
-                case 5:
-                    watch_display_string(" 1 day", 4);
-                    break;
-                case 6:
-                    watch_display_string(" 2 day", 4);
-                    break;
-                case 7:
-                    watch_display_string(" 7 day", 4);
-                    break;
-            }
-            break;
-        case 3:
-            sprintf(buf, "%2d", settings->bit.led_green_color);
-            watch_display_string(buf, 8);
-            break;
-        case 4:
-            sprintf(buf, "%2d", settings->bit.led_red_color);
-            watch_display_string(buf, 8);
-            break;
-    }
-
-    if (current_page > 2) {
-        watch_set_led_color(settings->bit.led_red_color ? (0xF | settings->bit.led_red_color << 4) : 0,
-                            settings->bit.led_green_color ? (0xF | settings->bit.led_green_color << 4) : 0);
-        return false;
-    }
-
-    watch_set_led_off();
-    return true;
-}
-
-void preferences_widget_resign(LauncherSettings *settings, void *context) {
-    (void) settings;
-    (void) context;
-    watch_set_led_off();
-    movement_request_tick_frequency(1);
-}
diff --git a/movement/widgets/settings/preferences_widget.h b/movement/widgets/settings/preferences_widget.h
deleted file mode 100644 (file)
index 3d46302..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
-#ifndef PREFERENCES_WIDGET_H_
-#define PREFERENCES_WIDGET_H_
-
-#include "movement.h"
-
-void preferences_widget_setup(LauncherSettings *settings, void ** context_ptr);
-void preferences_widget_activate(LauncherSettings *settings, void *context);
-bool preferences_widget_loop(LauncherEvent event, LauncherSettings *settings, void *context);
-void preferences_widget_resign(LauncherSettings *settings, void *context);
-
-#define preferences_widget { \
-    preferences_widget_setup, \
-    preferences_widget_activate, \
-    preferences_widget_loop, \
-    preferences_widget_resign, \
-}
-
-#endif // PREFERENCES_WIDGET_H_
\ No newline at end of file
diff --git a/movement/widgets/settings/set_time_widget.c b/movement/widgets/settings/set_time_widget.c
deleted file mode 100644 (file)
index 9464eb5..0000000
+++ /dev/null
@@ -1,109 +0,0 @@
-#include <stdlib.h>
-#include "set_time_widget.h"
-#include "watch.h"
-
-#define SET_TIME_WIDGET_NUM_SETTINGS (6)
-const char set_time_widget_titles[SET_TIME_WIDGET_NUM_SETTINGS][3] = {"HR", "MN", "SE", "YR", "MO", "DA"};
-
-void set_time_widget_setup(LauncherSettings *settings, void ** context_ptr) {
-    (void) settings;
-    if (*context_ptr == NULL) *context_ptr = malloc(sizeof(uint8_t));
-}
-
-void set_time_widget_activate(LauncherSettings *settings, void *context) {
-    (void) settings;
-    *((uint8_t *)context) = 0;
-    movement_request_tick_frequency(4);
-}
-
-bool set_time_widget_loop(LauncherEvent event, LauncherSettings *settings, void *context) {
-    uint8_t current_page = *((uint8_t *)context);
-    const uint8_t days_in_month[12] = {31, 28, 31, 30, 31, 30, 30, 31, 30, 31, 30, 31};
-    watch_date_time date_time = watch_rtc_get_date_time();
-
-    switch (event.event_type) {
-        case EVENT_MODE_BUTTON_UP:
-            movement_move_to_next_widget();
-            return false;
-        case EVENT_LIGHT_BUTTON_UP:
-            current_page = (current_page + 1) % SET_TIME_WIDGET_NUM_SETTINGS;
-            *((uint8_t *)context) = current_page;
-            break;
-        case EVENT_ALARM_BUTTON_UP:
-            switch (current_page) {
-                case 0: // hour
-                    date_time.unit.hour = (date_time.unit.hour + 1) % 24;
-                    break;
-                case 1: // minute
-                    date_time.unit.minute = (date_time.unit.minute + 1) % 60;
-                    break;
-                case 2: // second
-                    date_time.unit.second = 0;
-                    break;
-                case 3: // year
-                    // only allow 2021-2030. fix this sometime next decade
-                    date_time.unit.year = ((date_time.unit.year % 10) + 1);
-                    break;
-                case 4: // month
-                    date_time.unit.month = (date_time.unit.month % 12) + 1;
-                    break;
-                case 5: // day
-                    date_time.unit.day = date_time.unit.day + 1;
-                    // can't set to the 29th on a leap year. if it's february 29, set to 11:59 on the 28th.
-                    // and it should roll over.
-                    if (date_time.unit.day > days_in_month[date_time.unit.month - 1]) {
-                        date_time.unit.day = 1;
-                    }
-                    break;
-            }
-            watch_rtc_set_date_time(date_time);
-            break;
-        default:
-            break;
-    }
-
-    char buf[11];
-    if (current_page < 3) {
-        watch_set_colon();
-        if (settings->bit.clock_mode_24h) {
-            watch_set_indicator(WATCH_INDICATOR_24H);
-            sprintf(buf, "%s  %2d%02d%02d", set_time_widget_titles[current_page], date_time.unit.hour, date_time.unit.minute, date_time.unit.second);
-        } else {
-            sprintf(buf, "%s  %2d%02d%02d", set_time_widget_titles[current_page], (date_time.unit.hour % 12) ? (date_time.unit.hour % 12) : 12, date_time.unit.minute, date_time.unit.second);
-            if (date_time.unit.hour > 12) watch_set_indicator(WATCH_INDICATOR_PM);
-            else watch_clear_indicator(WATCH_INDICATOR_PM);
-        }
-    } else {
-        watch_clear_colon();
-        watch_clear_indicator(WATCH_INDICATOR_24H);
-        watch_clear_indicator(WATCH_INDICATOR_PM);
-        sprintf(buf, "%s  %2d%02d%02d", set_time_widget_titles[current_page], date_time.unit.year + 20, date_time.unit.month, date_time.unit.day);
-    }
-    if (event.subsecond % 2) {
-        switch (current_page) {
-            case 0:
-            case 3:
-                buf[4] = buf[5] = ' ';
-                break;
-            case 1:
-            case 4:
-                buf[6] = buf[7] = ' ';
-                break;
-            case 2:
-            case 5:
-                buf[8] = buf[9] = ' ';
-                break;
-        }
-    }
-
-    watch_display_string(buf, 0);
-
-    return true;
-}
-
-void set_time_widget_resign(LauncherSettings *settings, void *context) {
-    (void) settings;
-    (void) context;
-    watch_set_led_off();
-    movement_request_tick_frequency(1);
-}
diff --git a/movement/widgets/settings/set_time_widget.h b/movement/widgets/settings/set_time_widget.h
deleted file mode 100644 (file)
index 363fd57..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
-#ifndef SET_TIME_WIDGET_H_
-#define SET_TIME_WIDGET_H_
-
-#include "movement.h"
-
-void set_time_widget_setup(LauncherSettings *settings, void ** context_ptr);
-void set_time_widget_activate(LauncherSettings *settings, void *context);
-bool set_time_widget_loop(LauncherEvent event, LauncherSettings *settings, void *context);
-void set_time_widget_resign(LauncherSettings *settings, void *context);
-
-#define set_time_widget { \
-    set_time_widget_setup, \
-    set_time_widget_activate, \
-    set_time_widget_loop, \
-    set_time_widget_resign, \
-}
-
-#endif // SET_TIME_WIDGET_H_