From: Joey Castillo <joeycastillo@utexas.edu>
Date: Mon, 2 May 2022 23:39:45 +0000 (-0500)
Subject: Merge branch 'main' of github.com:joeycastillo/Sensor-Watch into motion-express
X-Git-Url: https://git.earman.xyz/?a=commitdiff_plain;h=cd405735351035df657b64547b3dfc6a3d59db56;p=sensor-watch.git

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

cd405735351035df657b64547b3dfc6a3d59db56
diff --cc movement/make/Makefile
index c1808d6,5bed6bd..0936a26
--- a/movement/make/Makefile
+++ b/movement/make/Makefile
@@@ -48,9 -53,13 +53,14 @@@ SRCS += 
    ../watch_faces/complication/totp_face.c \
    ../watch_faces/complication/sunrise_sunset_face.c \
    ../watch_faces/complication/countdown_face.c \
+   ../watch_faces/complication/counter_face.c \
    ../watch_faces/complication/blinky_face.c \
    ../watch_faces/complication/moon_phase_face.c \
 +  ../watch_faces/sensor/accelerometer_data_acquisition_face.c \
+   ../watch_faces/clock/mars_time_face.c \
+   ../watch_faces/complication/orrery_face.c \
+   ../watch_faces/complication/astronomy_face.c \
+   ../watch_faces/complication/tomato_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 e4ef102,f27d9f9..e7e78ff
--- a/movement/movement_faces.h
+++ b/movement/movement_faces.h
@@@ -43,9 -44,13 +44,14 @@@
  #include "hello_there_face.h"
  #include "sunrise_sunset_face.h"
  #include "countdown_face.h"
+ #include "counter_face.h"
  #include "blinky_face.h"
  #include "moon_phase_face.h"
 +#include "accelerometer_data_acquisition_face.h"
+ #include "mars_time_face.h"
+ #include "orrery_face.h"
+ #include "astronomy_face.h"
+ #include "tomato_face.h"
  // New includes go above this line.
  
  #endif // MOVEMENT_FACES_H_