Merge branch 'moonrise' into HEAD

legacy/watch_faces/clock/wyoscan_face.c

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

movement_faces.h

@@ -33,7 +33,6 @@
 #include "stopwatch_face.h"
 #include "fast_stopwatch_face.h"
 #include "sunrise_sunset_face.h"
-#include "moonrise_face.h"
 #include "moon_phase_face.h"
 #include "days_since_face.h"
 #include "character_set_face.h"
@@ -79,5 +78,5 @@
 #include "higher_lower_game_face.h"
 #include "lander_face.h"
 #include "simon_face.h"
-#include "wyoscan_face.h"
+#include "moonrise_face.h"
 // New includes go above this line.

watch-faces.mk

@@ -10,7 +10,6 @@ SRCS += \
   ./watch-faces/complication/stopwatch_face.c \
   ./watch-faces/complication/fast_stopwatch_face.c \
   ./watch-faces/complication/sunrise_sunset_face.c \
-  ./watch-faces/complication/moonrise_face.c \
   ./watch-faces/complication/moon_phase_face.c \
   ./watch-faces/complication/days_since_face.c \
   ./watch-faces/complication/breathing_face.c \
@@ -54,5 +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 \
+  ./watch-faces/complication/moonrise_face.c \
 # New watch faces go above this line.

watch-faces/clock/close_enough_face.c

@@ -189,8 +189,8 @@ bool close_enough_face_loop(movement_event_t event, void *context) {
             char second_word[3];
             char third_word[3];
             if (five_minute_period == 0) { // "  HH OC",
-                sprintf(first_word, "%2d", close_enough_hour);
-                sprintf(second_word, "  ");
+                sprintf(first_word, "  ");
+                sprintf(second_word, "%2d", close_enough_hour);
                 strncpy(third_word, oclock_word, 3);
             } else { // "MM P HH" or "MM 2 HH+1"
                 int words_length = sizeof(words) / sizeof(words[0]);

watch-faces/complication/moon_phase_face.c

@@ -72,41 +72,41 @@ static void _update(moon_phase_state_t *state, uint32_t offset) {
     switch (phase_index) {
         case 0:
         case 8:
-            watch_display_text_with_fallback(WATCH_POSITION_BOTTOM, "NE!J  ", " NUEVA");
+            watch_display_text_with_fallback(WATCH_POSITION_BOTTOM, "NE!J  ", " Neu  ");
             watch_display_text_with_fallback(WATCH_POSITION_TOP_LEFT, "   ", "  ");
             break;
         case 1:
-            watch_display_text(WATCH_POSITION_BOTTOM, "Crecie");
+            watch_display_text(WATCH_POSITION_BOTTOM, "CresNt");
             watch_display_text_with_fallback(WATCH_POSITION_TOP_LEFT, "WAX", "  ");
             if (watch_get_lcd_type() == WATCH_LCD_TYPE_CLASSIC) {
-                watch_set_pixel(0, 14);
-                watch_set_pixel(0, 13);
-                if (currentfrac > 0.125) watch_set_pixel(2, 14);
+                watch_set_pixel(2, 13);
+                watch_set_pixel(2, 15);
+                if (currentfrac > 0.125) watch_set_pixel(1, 13);
             }
             break;
         case 2:
-            watch_display_text_with_fallback(WATCH_POSITION_BOTTOM, "1stQtr", "4#Crec");
+            watch_display_text_with_fallback(WATCH_POSITION_BOTTOM, "1stQtr", " 1st q");
             watch_display_text_with_fallback(WATCH_POSITION_TOP_LEFT, "WAX", "  ");
             if (watch_get_lcd_type() == WATCH_LCD_TYPE_CLASSIC) {
+                watch_set_pixel(2, 13);
+                watch_set_pixel(2, 15);
+                watch_set_pixel(1, 13);
                 watch_set_pixel(1, 14);
-                watch_set_pixel(2, 14);
-                watch_set_pixel(0, 14);
-                watch_set_pixel(0, 13);
             }
             break;
         case 3:
-            watch_display_text_with_fallback(WATCH_POSITION_BOTTOM, "GbboUs", " GibCr");
+            watch_display_text_with_fallback(WATCH_POSITION_BOTTOM, "GbboUs", " Gibb ");
             watch_display_text_with_fallback(WATCH_POSITION_TOP_LEFT, "WAX", "  ");
             if (watch_get_lcd_type() == WATCH_LCD_TYPE_CLASSIC) {
+                watch_set_pixel(2, 13);
+                watch_set_pixel(2, 15);
                 watch_set_pixel(1, 14);
-                watch_set_pixel(2, 14);
+                watch_set_pixel(1, 13);
                 watch_set_pixel(1, 15);
-                watch_set_pixel(0, 14);
-                watch_set_pixel(0, 13);
             }
             break;
         case 4:
-            watch_display_text_with_fallback(WATCH_POSITION_BOTTOM, "FULL  ", "LLENA ");
+            watch_display_text_with_fallback(WATCH_POSITION_BOTTOM, "FULL  ", " FULL ");
             watch_display_text_with_fallback(WATCH_POSITION_TOP_LEFT, "   ", "  ");
             if (watch_get_lcd_type() == WATCH_LCD_TYPE_CLASSIC) {
                 watch_set_pixel(2, 13);
@@ -120,33 +120,33 @@ static void _update(moon_phase_state_t *state, uint32_t offset) {
             }
             break;
         case 5:
-            watch_display_text_with_fallback(WATCH_POSITION_BOTTOM, "GbboUs", " GibMe");
+            watch_display_text_with_fallback(WATCH_POSITION_BOTTOM, "GbboUs", " Gibb ");
             watch_display_text_with_fallback(WATCH_POSITION_TOP_LEFT, "WAN", "  ");
             if (watch_get_lcd_type() == WATCH_LCD_TYPE_CLASSIC) {
-                watch_set_pixel(2, 13);
-                watch_set_pixel(2, 15);
                 watch_set_pixel(1, 14);
-                watch_set_pixel(1, 13);
+                watch_set_pixel(2, 14);
                 watch_set_pixel(1, 15);
+                watch_set_pixel(0, 14);
+                watch_set_pixel(0, 13);
             }
             break;
         case 6:
-            watch_display_text_with_fallback(WATCH_POSITION_BOTTOM, "3rdQtr", "4#meng");
+            watch_display_text_with_fallback(WATCH_POSITION_BOTTOM, "3rdQtr", " 3rd q");
             watch_display_text_with_fallback(WATCH_POSITION_TOP_LEFT, "WAN", "  ");
             if (watch_get_lcd_type() == WATCH_LCD_TYPE_CLASSIC) {
-                watch_set_pixel(2, 13);
-                watch_set_pixel(2, 15);
-                watch_set_pixel(1, 13);
                 watch_set_pixel(1, 14);
+                watch_set_pixel(2, 14);
+                watch_set_pixel(0, 14);
+                watch_set_pixel(0, 13);
             }
             break;
         case 7:
-            watch_display_text(WATCH_POSITION_BOTTOM, "MENGUA");
+            watch_display_text(WATCH_POSITION_BOTTOM, "CresNt");
             watch_display_text_with_fallback(WATCH_POSITION_TOP_LEFT, "WAN", "  ");
             if (watch_get_lcd_type() == WATCH_LCD_TYPE_CLASSIC) {
-                watch_set_pixel(2, 13);
-                watch_set_pixel(2, 15);
-                if (currentfrac < 0.875) watch_set_pixel(1, 13);
+                watch_set_pixel(0, 14);
+                watch_set_pixel(0, 13);
+                if (currentfrac < 0.875) watch_set_pixel(2, 14);
             }
             break;
     }