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

3 files changed, 48 insertions, 1 deletions

diff --git a/movement/make/.gitignore b/movement/make/.gitignore
index 3722ac63..45eba6ef 100755
--- a/movement/make/.gitignore
+++ b/movement/make/.gitignore
@@ -1 +1,2 @@
 build/

+firmware/

diff --git a/movement/make/Makefile b/movement/make/Makefile
index c1808d68..0936a26c 100755
--- a/movement/make/Makefile
+++ b/movement/make/Makefile
@@ -18,6 +18,8 @@ INCLUDES += \
   -I../watch_faces/demo/ \
   -I../lib/TOTP-MCU/ \
   -I../lib/sunriset/ \
+  -I../lib/vsop87/ \
+  -I../lib/astrolib/ \
 
 # If you add any other source files you wish to compile, add them after ../app.c
 # Note that you will need to add a backslash at the end of any line you wish to continue, i.e.
@@ -29,6 +31,8 @@ SRCS += \
   ../lib/TOTP-MCU/sha1.c \
   ../lib/TOTP-MCU/TOTP.c \
   ../lib/sunriset/sunriset.c \
+  ../lib/vsop87/vsop87a_milli.c \
+  ../lib/astrolib/astrolib.c \
   ../movement.c \
   ../watch_faces/clock/simple_clock_face.c \
   ../watch_faces/clock/world_clock_face.c \
@@ -37,9 +41,10 @@ SRCS += \
   ../watch_faces/settings/set_time_face.c \
   ../watch_faces/sensor/thermistor_readout_face.c \
   ../watch_faces/sensor/thermistor_logging_face.c \
+  ../watch_faces/sensor/thermistor_testing_face.c \
   ../watch_faces/demo/character_set_face.c \
   ../watch_faces/demo/voltage_face.c \
-  ../watch_faces/demo/lis2dh_logging_face.c \
+  ../watch_faces/demo/lis2dw_logging_face.c \
   ../watch_faces/demo/demo_face.c \
   ../watch_faces/demo/hello_there_face.c \
   ../watch_faces/complication/pulsometer_face.c \
@@ -48,9 +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 --git a/movement/make/make_alternate_fw.sh b/movement/make/make_alternate_fw.sh
new file mode 100755
index 00000000..575c9e52
--- /dev/null
+++ b/movement/make/make_alternate_fw.sh
@@ -0,0 +1,36 @@
+#!/bin/bash
+
+fw_dir="firmware/download"
+sim_dir="firmware/simulate"
+colors=("green" "blue")
+variants=("standard" "alt_time" "deep_space_now" "focus" "the_athlete" "the_backpacker" "the_stargazer")
+
+if [ -d "$fw_dir" ] ; then
+    rm -r "$fw_dir"
+fi
+if [ -d "$sim_dir" ] ; then
+    rm -r "$sim_dir"
+fi
+
+mkdir -p "$fw_dir"
+mkdir -p "$sim_dir"
+
+for variant in "${variants[@]}"
+do
+    VARIANT=$(echo "$variant" | tr '[:lower:]' '[:upper:]')
+    for color in "${colors[@]}"
+    do
+        COLOR=$(echo "$color" | tr '[:lower:]' '[:upper:]')
+        make clean
+        make LED=$COLOR FIRMWARE=$VARIANT
+        mv "build/watch.uf2" "$fw_dir/$variant-$color.uf2"
+    done
+    make clean
+    emmake make FIRMWARE=$VARIANT
+    mkdir "$sim_dir/$variant/"
+    mv "build/watch.wasm" "$sim_dir/$variant/"
+    mv "build/watch.js" "$sim_dir/$variant/"
+    mv "build/watch.html" "$sim_dir/$variant/index.html"
+done
+
+echo "Done."