wyoscan: use local time

movement_faces.h

@@ -78,4 +78,5 @@
 #include "higher_lower_game_face.h"
 #include "lander_face.h"
 #include "simon_face.h"
+#include "wyoscan_face.h"
 // New includes go above this line.

watch-faces.mk

@@ -53,4 +53,5 @@ SRCS += \
   ./watch-faces/complication/higher_lower_game_face.c \
   ./watch-faces/complication/lander_face.c \
   ./watch-faces/complication/simon_face.c \
+  ./watch-faces/clock/wyoscan_face.c \
 # New watch faces go above this line.

watch-faces/clock/close_enough_face.c

@@ -87,7 +87,7 @@ void close_enough_face_activate(void *context) {
 
     clock_stop_tick_tock_animation();
 
-    clock_indicate(WATCH_INDICATOR_SIGNAL, movement_alarm_enabled());
+    clock_indicate(WATCH_INDICATOR_BELL, movement_alarm_enabled());
     clock_indicate(WATCH_INDICATOR_24H, !!movement_clock_mode_24h());
 
     // this ensures that none of the five_minute_periods will match, so we always rerender when the face activates

watch-faces/clock/wyoscan_face.c

@@ -25,7 +25,6 @@
 #include <stdlib.h>
 #include <string.h>
 #include "wyoscan_face.h"
-#include "watch_private_display.h"
 
 /*
 Slowly render the current time from left to right, 
@@ -115,7 +114,7 @@ bool wyoscan_face_loop(movement_event_t event, void *context) {
             break;
         case EVENT_TICK:            
             if (!state->animate) {
-                date_time = watch_rtc_get_date_time();
+                date_time = movement_get_local_date_time();
                 state->start = 0; 
                 state->end = 0;
                 state->animation = 0;

watch-faces/complication/advanced_alarm_face.c

@@ -169,7 +169,7 @@ static void _alarm_update_alarm_enabled(alarm_state_t *state) {
     uint16_t now_minutes_of_day;
     uint16_t alarm_minutes_of_day;
     for (uint8_t i = 0; i < ALARM_ALARMS; i++) {
-        if (state->alarm[i].enabled && state->alarm[i].beeps != 0) {
+        if (state->alarm[i].enabled) {
             // figure out if alarm is to go off in the next 24 h
             if (state->alarm[i].day == ALARM_DAY_EACH_DAY || state->alarm[i].day == ALARM_DAY_ONE_TIME) {
             active_alarms = true;
@@ -263,6 +263,7 @@ void advanced_alarm_face_resign(void *context) {
     alarm_state_t *state = (alarm_state_t *)context;
     state->is_setting = false;
     _alarm_update_alarm_enabled(state);
+    watch_set_led_off();
     state->alarm_quick_ticks = false;
     _wait_ticks = -1;
     movement_request_tick_frequency(1);

watch-faces/complication/simon_face.c

@@ -331,5 +331,6 @@ bool simon_face_loop(movement_event_t event,
 
 void simon_face_resign(void *context) {
     (void)context;
+    watch_set_led_off();
     watch_set_buzzer_off();
 }

watch-faces/complication/sunrise_sunset_face.c

@@ -108,7 +108,7 @@ static void _sunrise_sunset_face_update(sunrise_sunset_state_t *state) {
             watch_clear_indicator(WATCH_INDICATOR_24H);
             if (result == 1) watch_display_text_with_fallback(WATCH_POSITION_TOP_LEFT, "SET", "SE");
             else watch_display_text_with_fallback(WATCH_POSITION_TOP_LEFT, "RIS", "rI");
-            snprintf(buf, sizeof(buf), "%2d", scratch_time.unit.day);
+            sprintf(buf, "%2d", scratch_time.unit.day);
             watch_display_text(WATCH_POSITION_TOP_RIGHT, buf);
             watch_display_text(WATCH_POSITION_BOTTOM, "None  ");
             return;
@@ -149,9 +149,9 @@ static void _sunrise_sunset_face_update(sunrise_sunset_state_t *state) {
                     else watch_clear_indicator(WATCH_INDICATOR_PM);
                 }
                 watch_display_text_with_fallback(WATCH_POSITION_TOP_LEFT, "RIS", "rI");
-                snprintf(buf, sizeof(buf), "%2d", scratch_time.unit.day);
+                sprintf(buf, "%2d", scratch_time.unit.day);
                 watch_display_text(WATCH_POSITION_TOP_RIGHT, buf);
-                snprintf(buf, sizeof(buf), "%2d%02d%2s", scratch_time.unit.hour, scratch_time.unit.minute,longLatPresets[state->longLatToUse].name);
+                sprintf(buf, "%2d%02d%2s", scratch_time.unit.hour, scratch_time.unit.minute,longLatPresets[state->longLatToUse].name);
                 watch_display_text(WATCH_POSITION_BOTTOM, buf);
                 return;
             } else {
@@ -188,9 +188,9 @@ static void _sunrise_sunset_face_update(sunrise_sunset_state_t *state) {
                     else watch_clear_indicator(WATCH_INDICATOR_PM);
                 }
                 watch_display_text_with_fallback(WATCH_POSITION_TOP_LEFT, "SET", "SE");
-                snprintf(buf, sizeof(buf), "%2d", scratch_time.unit.day);
+                sprintf(buf, "%2d", scratch_time.unit.day);
                 watch_display_text(WATCH_POSITION_TOP_RIGHT, buf);
-                snprintf(buf, sizeof(buf), "%2d%02d%2s", scratch_time.unit.hour, scratch_time.unit.minute,longLatPresets[state->longLatToUse].name);
+                sprintf(buf, "%2d%02d%2s", scratch_time.unit.hour, scratch_time.unit.minute,longLatPresets[state->longLatToUse].name);
                 watch_display_text(WATCH_POSITION_BOTTOM, buf);
                 return;
             } else {
@@ -274,7 +274,7 @@ static void _sunrise_sunset_face_update_settings_display(movement_event_t event,
                     if (state->active_digit == 4) watch_display_character(' ', 9);
                 }
             } else {
-                snprintf(buf, sizeof(buf), "%c %04d", state->working_latitude.sign ? '-' : '+', abs(_sunrise_sunset_face_latlon_from_struct(state->working_latitude)));
+                sprintf(buf, "%c %04d", state->working_latitude.sign ? '-' : '+', abs(_sunrise_sunset_face_latlon_from_struct(state->working_latitude)));
                 if (event.subsecond % 2) buf[state->active_digit] = ' ';
                 watch_display_text(WATCH_POSITION_BOTTOM, buf);
             }
@@ -301,7 +301,7 @@ static void _sunrise_sunset_face_update_settings_display(movement_event_t event,
                     if (state->active_digit == 4) watch_display_character(' ', 9);
                 }
             } else {
-                snprintf(buf, sizeof(buf), "%c%05d", state->working_longitude.sign ? '-' : '+', abs(_sunrise_sunset_face_latlon_from_struct(state->working_longitude)));
+                sprintf(buf, "%c%05d", state->working_longitude.sign ? '-' : '+', abs(_sunrise_sunset_face_latlon_from_struct(state->working_longitude)));
                 if (event.subsecond % 2) buf[state->active_digit] = ' ';
                 watch_display_text(WATCH_POSITION_BOTTOM, buf);
             }

watch-faces/settings/set_time_face.c

@@ -187,5 +187,6 @@ bool set_time_face_loop(movement_event_t event, void *context) {
 
 void set_time_face_resign(void *context) {
     (void) context;
+    watch_set_led_off();
     movement_store_settings();
 }

watch-faces/settings/settings_face.c

@@ -311,9 +311,6 @@ bool settings_face_loop(movement_event_t event, void *context) {
     settings_state_t *state = (settings_state_t *)context;
 
     switch (event.event_type) {
-        case EVENT_LIGHT_LONG_PRESS:
-            movement_illuminate_led();
-            break;
         case EVENT_LIGHT_BUTTON_DOWN:
             state->current_page = (state->current_page + 1) % state->num_settings;
             // fall through
@@ -322,6 +319,10 @@ bool settings_face_loop(movement_event_t event, void *context) {
             watch_clear_display();
             state->settings_screens[state->current_page].display(event.subsecond);
             break;
+        case EVENT_MODE_BUTTON_UP:
+            movement_force_led_off();
+            movement_move_to_next_face();
+            return false;
         case EVENT_ALARM_BUTTON_UP:
             state->settings_screens[state->current_page].advance();
             break;
@@ -340,11 +341,13 @@ bool settings_face_loop(movement_event_t event, void *context) {
                               color.blue | color.blue << 4);
         return false;
     } else {
+        movement_force_led_off();
         return true;
     }
 }
 
 void settings_face_resign(void *context) {
     (void) context;
+    movement_force_led_off();
     movement_store_settings();
 }