From: Ekaitz Zárraga <ekaitz@elenq.tech>
Date: Sun, 19 Nov 2023 14:36:52 +0000 (+0100)
Subject: Merge branch 'main' into couch-2-5k
X-Git-Url: https://git.earman.xyz/?a=commitdiff_plain;h=735bbc97d7cdf8564f8f7efe16f2a14d48cd0e28;p=sensor-watch.git

Merge branch 'main' into couch-2-5k
---

735bbc97d7cdf8564f8f7efe16f2a14d48cd0e28
diff --cc movement/make/Makefile
index d27b796,376ee74..c294b06
--- a/movement/make/Makefile
+++ b/movement/make/Makefile
@@@ -118,7 -118,8 +118,9 @@@ SRCS += 
    ../watch_faces/complication/flashlight_face.c \
    ../watch_faces/clock/decimal_time_face.c \
    ../watch_faces/clock/wyoscan_face.c \
 +  ../watch_faces/complication/couch_to_5k_face.c \
+   ../watch_faces/clock/minute_repeater_decimal_face.c \
+   ../watch_faces/complication/tuning_tones_face.c \
  # New watch faces go above this line.
  
  # Leave this line at the bottom of the file; it has all the targets for making your project.
diff --cc movement/movement_faces.h
index a88b322,96fc60a..cb58612
--- a/movement/movement_faces.h
+++ b/movement/movement_faces.h
@@@ -95,7 -95,8 +95,9 @@@
  #include "flashlight_face.h"
  #include "decimal_time_face.h"
  #include "wyoscan_face.h"
 +#include "couch_to_5k_face.h"
+ #include "minute_repeater_decimal_face.h"
+ #include "tuning_tones_face.h"
  // New includes go above this line.
  
  #endif // MOVEMENT_FACES_H_