Merge branch 'main' into watch-face-simple-coin-flip

movement/make/Makefile

@@ -119,6 +119,11 @@ SRCS += \
   ../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.

movement/make/make_alternate_fw.sh

@@ -21,12 +21,12 @@ do
     for color in "${colors[@]}"
     do
         COLOR=$(echo "$color" | tr '[:lower:]' '[:upper:]')
-        make clean
+        make COLOR=$COLOR clean
         make COLOR=$COLOR FIRMWARE=$VARIANT
         mv "build/watch.uf2" "$fw_dir/$variant-$color.uf2"
     done
     rm -rf ./build-sim
-    emmake make FIRMWARE=$VARIANT
+    emmake make COLOR=GREEN FIRMWARE=$VARIANT
     mkdir "$sim_dir/$variant/"
     mv "build-sim/watch.wasm" "$sim_dir/$variant/"
     mv "build-sim/watch.js" "$sim_dir/$variant/"