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

diff --cc movement/make/Makefile
index c1808d688e0f1bda765805ec9e5a4cd2c052ddc2,5bed6bd2f8ed57a212524790afdde26a9d6550eb..0936a26c5308402aa29c59dd6ee772e710066cba
--- 1/movement/make/Makefile
--- 2/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 e4ef102bec38bb309cc05d99e8b216eb9a5a844d,f27d9f91415fad929351b472432baa458384a386..e7e78ff4db9ff4f25ff8401c23d7d1831fc1191a
--- 1/movement/movement_faces.h
--- 2/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_

diff --cc watch-library/shared/driver/lis2dw.c
Simple merge

diff --cc watch-library/shared/driver/lis2dw.h
Simple merge