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

index b0ca677496348124d1e96a88734170e77b686f1d,5eb570184c23a100b2af54377fa8ff0b5d6dc462..42dfc644d2d09573893a5bd19fba1d51b5321893
@@@ -118,7 -118,13 +118,14 @@@ SRCS += 
    ../watch_faces/complication/flashlight_face.c \
    ../watch_faces/clock/decimal_time_face.c \
    ../watch_faces/clock/wyoscan_face.c \
 +  ../watch_faces/settings/save_load_face.c \
+   ../watch_faces/clock/day_night_percentage_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 006761cdef1fefb747bcffdad59f819fe2a82aae,e36e5c2ffd3b89eee871d8314b9c192714e51b66..7feb0f408d2169cc4cea9a04bed9e54e8fb6b66e
  #include "flashlight_face.h"
  #include "decimal_time_face.h"
  #include "wyoscan_face.h"
 +#include "save_load_face.h"
+ #include "day_night_percentage_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_