From: Joey Castillo <joeycastillo@utexas.edu>
Date: Sun, 16 Jan 2022 00:27:24 +0000 (-0500)
Subject: Merge branch 'main' of github.com:joeycastillo/Sensor-Watch into main
X-Git-Url: https://git.earman.xyz/?a=commitdiff_plain;h=5fccc24c985f765d33245d07d911e547fa9be30e;p=sensor-watch.git

Merge branch 'main' of github.com:joeycastillo/Sensor-Watch into main
---

5fccc24c985f765d33245d07d911e547fa9be30e
diff --cc movement/make/Makefile
index 00a086d,850d705..5b9779b
--- a/movement/make/Makefile
+++ b/movement/make/Makefile
@@@ -47,7 -45,7 +47,8 @@@ SRCS += 
    ../watch_faces/complications/day_one_face.c \
    ../watch_faces/complications/stopwatch_face.c \
    ../watch_faces/complications/totp_face.c \
 +  ../watch_faces/complications/sunrise_sunset_face.c \
+   ../watch_faces/complications/countdown_face.c \
  
  # Leave this line at the bottom of the file; it has all the targets for making your project.
  include $(TOP)/rules.mk
diff --cc movement/movement_config.h
index f1bed94,5eba1a6..7a80798
--- a/movement/movement_config.h
+++ b/movement/movement_config.h
@@@ -41,7 -17,7 +41,8 @@@
  #include "lis2dh_logging_face.h"
  #include "demo_face.h"
  #include "hello_there_face.h"
 +#include "sunrise_sunset_face.h"
+ #include "countdown_face.h"
  
  const watch_face_t watch_faces[] = {
      simple_clock_face,