From: voloved <36523934+voloved@users.noreply.github.com>
Date: Wed, 1 Apr 2026 20:40:57 +0000 (-0400)
Subject: Merge branch 'main' into tide_face
X-Git-Url: https://git.earman.xyz/?a=commitdiff_plain;h=1f8e96c3fe19f57bf4aebbca88df2c5d22ca28d8;p=sensor-watch.git

Merge branch 'main' into tide_face
---

1f8e96c3fe19f57bf4aebbca88df2c5d22ca28d8
diff --cc movement_faces.h
index 81ca394,ca9d90d..3c2f5b7
--- a/movement_faces.h
+++ b/movement_faces.h
@@@ -73,5 -73,13 +73,14 @@@
  #include "wareki_face.h"
  #include "deadline_face.h"
  #include "wordle_face.h"
+ #include "blackjack_face.h"
+ #include "endless_runner_face.h"
+ #include "higher_lower_game_face.h"
+ #include "lander_face.h"
+ #include "simon_face.h"
+ #include "ping_face.h"
+ #include "rtccount_face.h"
+ #include "tomato_face.h"
+ #include "solar_time_face.h"
 +#include "tide_face.h"
  // New includes go above this line.
diff --cc watch-faces.mk
index 6c8000d,e87e8a6..c9e4a4f
--- a/watch-faces.mk
+++ b/watch-faces.mk
@@@ -48,5 -49,12 +49,13 @@@ SRCS += 
    ./watch-faces/sensor/lis2dw_monitor_face.c \
    ./watch-faces/complication/wareki_face.c \
    ./watch-faces/complication/deadline_face.c \
+   ./watch-faces/complication/blackjack_face.c \
+   ./watch-faces/complication/endless_runner_face.c \
+   ./watch-faces/complication/higher_lower_game_face.c \
+   ./watch-faces/complication/lander_face.c \
+   ./watch-faces/complication/simon_face.c \
+   ./watch-faces/complication/ping_face.c \
+   ./watch-faces/complication/tomato_face.c \
+   ./watch-faces/clock/solar_time_face.c \
 +  ./watch-faces/complication/tide_face.c \
  # New watch faces go above this line.