]> git.earman.xyz Git - sensor-watch.git/commitdiff
Merge branch 'main' of github.com:joeycastillo/Sensor-Watch into main
authorJoey Castillo <joeycastillo@utexas.edu>
Sun, 16 Jan 2022 00:27:24 +0000 (19:27 -0500)
committerJoey Castillo <joeycastillo@utexas.edu>
Sun, 16 Jan 2022 00:27:24 +0000 (19:27 -0500)
1  2 
movement/make/Makefile
movement/movement.c
movement/movement.h
movement/movement_config.h

index 00a086d079584584b91ea07a710061cdb765b645,850d705ddacf842f78f6f32963dd7cb5e61da71e..5b9779b351ca5ed5f4e370d37a0f8dedd6615c3a
@@@ -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
Simple merge
Simple merge
index f1bed9425cf9245ab0a9c62f090591b97afbbf60,5eba1a68d85025bc812b00ab8f67511f8f002eb5..7a807980a4f9ce553b131fa0d5d49d79e85c7b5b
@@@ -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,