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

@@ -40,20 +40,20 @@ static const char *words[12] = {
     "  ",
     " 5",
     "10",
-    "CU",
+    "15",
     "20",
-    "Me",
-    "ME",
-    "mE",
+    "25",
+    "30",
+    "35",
     "40",
     "45",
     "50",
     "55",
 };
 
-static const char *past_word = " y";
-static const char *to_word = " -";
-static const char *oclock_word = "EP";
+static const char *past_word = " P";
+static const char *to_word = " 2";
+static const char *oclock_word = "OC";
 
 // sets when in the five minute period we switch
 // from "X past HH" to  "X to HH+1"
@@ -196,7 +196,7 @@ bool close_enough_face_loop(movement_event_t event, void *context) {
                 int words_length = sizeof(words) / sizeof(words[0]);
 
                 strncpy(
-                    third_word,
+                    first_word,
                     show_next_hour ?
                         words[words_length - five_minute_period] :
                         words[five_minute_period],
@@ -207,7 +207,7 @@ bool close_enough_face_loop(movement_event_t event, void *context) {
                     show_next_hour ? to_word : past_word,
                     3
                 );
-                sprintf(first_word, "%2d", close_enough_hour);
+                sprintf(third_word, "%2d", close_enough_hour);
             }
 
             watch_display_text_with_fallback(

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-library/shared/watch/watch_utility.c

@@ -28,12 +28,12 @@
 #include "zones.h"
 
 const char * watch_utility_get_weekday(watch_date_time_t date_time) {
-    static const char weekdays[7][3] = {"LU", "MA", "MI", "JU", "VI", "SA", "do"};
+    static const char weekdays[7][3] = {"MO", "TU", "WE", "TH", "FR", "SA", "SU"};
     return weekdays[watch_utility_get_iso8601_weekday_number(date_time.unit.year + WATCH_RTC_REFERENCE_YEAR, date_time.unit.month, date_time.unit.day) - 1];
 }
 
 const char * watch_utility_get_long_weekday(watch_date_time_t date_time) {
-    static const char weekdays[7][4] = {"LUN", "MAR", "MIE", "JUE", "VIE", "SAB", "DOM"};
+    static const char weekdays[7][4] = {"MON", "TUE", "WED", "THU", "FRI", "SAT", "SUN"};
     return weekdays[watch_utility_get_iso8601_weekday_number(date_time.unit.year + WATCH_RTC_REFERENCE_YEAR, date_time.unit.month, date_time.unit.day) - 1];
 }