]> git.earman.xyz Git - sensor-watch.git/commitdiff
Merge branch 'main' into watch-face-simple-coin-flip
authorWesley Aptekar-Cassels <me@wesleyac.com>
Sun, 21 Jan 2024 07:01:27 +0000 (02:01 -0500)
committerGitHub <noreply@github.com>
Sun, 21 Jan 2024 07:01:27 +0000 (02:01 -0500)
1  2 
movement/make/Makefile
movement/movement_faces.h

index 35f610a5adea1849907e5da7286e4c693c0e5300,df11a9ab0cf230ce7dd3d6ac5665e17ccce6704f..82bae6221ad3dc455c580d110f52d4f2069febfa
@@@ -118,7 -118,11 +118,12 @@@ SRCS += 
    ../watch_faces/complication/flashlight_face.c \
    ../watch_faces/clock/decimal_time_face.c \
    ../watch_faces/clock/wyoscan_face.c \
 +  ../watch_faces/complication/simple_coin_flip_face.c \
+   ../watch_faces/complication/solstice_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 \
+   ../watch_faces/complication/kitchen_conversions_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.
index 0d7227a37e058fdc398c0f80f17e83cf18b40f72,a3ccc130ec5e5ebb2fdf8544b8c379280410326b..d232f0a7ee967025266e3981a3f7594984b7a474
  #include "flashlight_face.h"
  #include "decimal_time_face.h"
  #include "wyoscan_face.h"
 +#include "simple_coin_flip_face.h"
+ #include "solstice_face.h"
+ #include "couch_to_5k_face.h"
+ #include "minute_repeater_decimal_face.h"
+ #include "tuning_tones_face.h"
+ #include "kitchen_conversions_face.h"
  // New includes go above this line.
  
  #endif // MOVEMENT_FACES_H_