From: voloved <36523934+voloved@users.noreply.github.com> Date: Sat, 14 Mar 2026 13:59:32 +0000 (-0400) Subject: Merge branch 'main' into local-solar-time X-Git-Url: https://git.earman.xyz/?a=commitdiff_plain;h=b31a69d72b750b395660dae8e65bf925aa895283;p=sensor-watch.git Merge branch 'main' into local-solar-time --- b31a69d72b750b395660dae8e65bf925aa895283 diff --cc movement_faces.h index cf940da,8419702..ca9d90d --- a/movement_faces.h +++ b/movement_faces.h @@@ -80,5 -80,5 +80,6 @@@ #include "simon_face.h" #include "ping_face.h" #include "rtccount_face.h" + #include "tomato_face.h" +#include "solar_time_face.h" // New includes go above this line. diff --cc watch-faces.mk index 95bd22a,dd9c7f3..e87e8a6 --- a/watch-faces.mk +++ b/watch-faces.mk @@@ -55,5 -55,5 +55,6 @@@ SRCS += ./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 \ # New watch faces go above this line.