From ccdf08da876d2c66bbc54cc246443676c4f9bf2e Mon Sep 17 00:00:00 2001 From: joeycastillo Date: Fri, 4 Mar 2022 14:52:49 -0600 Subject: Movement: Astronomy and Orrery watch faces (#55) --- movement/make/Makefile | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'movement/make') diff --git a/movement/make/Makefile b/movement/make/Makefile index 9231d5ce..cd4471b5 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 \ @@ -50,6 +54,8 @@ SRCS += \ ../watch_faces/complication/countdown_face.c \ ../watch_faces/complication/blinky_face.c \ ../watch_faces/complication/moon_phase_face.c \ + ../watch_faces/complication/orrery_face.c \ + ../watch_faces/complication/astronomy_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. -- cgit v1.2.3 From 3025984eb558442e86edf0c99f5d7fbb0d619f10 Mon Sep 17 00:00:00 2001 From: Joey Castillo Date: Fri, 4 Mar 2022 14:44:42 -0600 Subject: movement: first pass at mars clock --- movement/make/Makefile | 1 + 1 file changed, 1 insertion(+) (limited to 'movement/make') diff --git a/movement/make/Makefile b/movement/make/Makefile index 9231d5ce..415bc152 100755 --- a/movement/make/Makefile +++ b/movement/make/Makefile @@ -50,6 +50,7 @@ SRCS += \ ../watch_faces/complication/countdown_face.c \ ../watch_faces/complication/blinky_face.c \ ../watch_faces/complication/moon_phase_face.c \ + ../watch_faces/clock/mars_time_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. -- cgit v1.2.3 From 4ebc4e97ce3aa46909907f8b50a23ceb520326e0 Mon Sep 17 00:00:00 2001 From: Joey Castillo Date: Fri, 1 Apr 2022 15:42:49 -0400 Subject: movement: add thermistor testing watch face --- movement/make/Makefile | 1 + 1 file changed, 1 insertion(+) (limited to 'movement/make') diff --git a/movement/make/Makefile b/movement/make/Makefile index cd4471b5..1e529954 100755 --- a/movement/make/Makefile +++ b/movement/make/Makefile @@ -41,6 +41,7 @@ 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 \ -- cgit v1.2.3 From 1ec1f2e4207405d55c34c936e2c458cb4a7e8806 Mon Sep 17 00:00:00 2001 From: Wesley Ellis Date: Wed, 6 Apr 2022 14:33:24 -0400 Subject: Add tomato face: a pomodoro style timer (#61) --- movement/make/Makefile | 1 + 1 file changed, 1 insertion(+) (limited to 'movement/make') diff --git a/movement/make/Makefile b/movement/make/Makefile index 1e529954..0f1e711a 100755 --- a/movement/make/Makefile +++ b/movement/make/Makefile @@ -57,6 +57,7 @@ SRCS += \ ../watch_faces/complication/moon_phase_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. -- cgit v1.2.3 From d91274e782b17b49bfa639de09dbd988777fec97 Mon Sep 17 00:00:00 2001 From: Joey Castillo Date: Sun, 10 Apr 2022 16:21:12 -0400 Subject: remove old lis2dh driver --- movement/make/Makefile | 1 - 1 file changed, 1 deletion(-) (limited to 'movement/make') diff --git a/movement/make/Makefile b/movement/make/Makefile index 0f1e711a..a773fee4 100755 --- a/movement/make/Makefile +++ b/movement/make/Makefile @@ -44,7 +44,6 @@ SRCS += \ ../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/demo_face.c \ ../watch_faces/demo/hello_there_face.c \ ../watch_faces/complication/pulsometer_face.c \ -- cgit v1.2.3 From 6e9e264c65f30e4046efbf27ebe801cd1f338122 Mon Sep 17 00:00:00 2001 From: Joey Castillo Date: Sun, 10 Apr 2022 18:08:37 -0400 Subject: rewrite lis2dh logger for lis2dw --- movement/make/Makefile | 1 + 1 file changed, 1 insertion(+) (limited to 'movement/make') diff --git a/movement/make/Makefile b/movement/make/Makefile index a773fee4..03b18190 100755 --- a/movement/make/Makefile +++ b/movement/make/Makefile @@ -44,6 +44,7 @@ SRCS += \ ../watch_faces/sensor/thermistor_testing_face.c \ ../watch_faces/demo/character_set_face.c \ ../watch_faces/demo/voltage_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 \ -- cgit v1.2.3 From 263e7c6543ab580bed0567b018d1f198f918a64b Mon Sep 17 00:00:00 2001 From: Joey Castillo Date: Wed, 20 Apr 2022 11:44:21 -0400 Subject: add counter face to movement build --- movement/make/Makefile | 1 + 1 file changed, 1 insertion(+) (limited to 'movement/make') diff --git a/movement/make/Makefile b/movement/make/Makefile index 3bed1963..5bed6bd2 100755 --- a/movement/make/Makefile +++ b/movement/make/Makefile @@ -53,6 +53,7 @@ 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/clock/mars_time_face.c \ -- cgit v1.2.3 From b0bdf35d8f6340be04aebe7fbd368418d8c15043 Mon Sep 17 00:00:00 2001 From: Joey Castillo Date: Wed, 20 Apr 2022 17:18:58 -0400 Subject: add mechanism for building alternate firmware images --- movement/make/.gitignore | 1 + movement/make/make_alternate_fw.sh | 36 ++++++++++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+) create mode 100755 movement/make/make_alternate_fw.sh (limited to 'movement/make') 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/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." -- cgit v1.2.3