summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjoeycastillo <joeycastillo@utexas.edu>2022-11-29 10:01:47 -0600
committerjoeycastillo <joeycastillo@utexas.edu>2022-11-29 10:01:47 -0600
commit967da2465a5d2c90f2cfc82c20a5b420b795d65c (patch)
tree5052d680a00c198201161aae23ae02a0250f86d4
parentef87f44572ea204404dbcc5509fdc1f057d79026 (diff)
downloadSensor-Watch-967da2465a5d2c90f2cfc82c20a5b420b795d65c.tar.gz
Sensor-Watch-967da2465a5d2c90f2cfc82c20a5b420b795d65c.tar.bz2
Sensor-Watch-967da2465a5d2c90f2cfc82c20a5b420b795d65c.zip
new backer firmware with original lineup
-rw-r--r--movement/alt_fw/backer.h (renamed from movement/alt_fw/standard.h)0
-rwxr-xr-xmovement/make/make_alternate_fw.sh4
-rw-r--r--movement/movement.c4
3 files changed, 5 insertions, 3 deletions
diff --git a/movement/alt_fw/standard.h b/movement/alt_fw/backer.h
index 3abcf457..3abcf457 100644
--- a/movement/alt_fw/standard.h
+++ b/movement/alt_fw/backer.h
diff --git a/movement/make/make_alternate_fw.sh b/movement/make/make_alternate_fw.sh
index 739c8557..d1ce7673 100755
--- a/movement/make/make_alternate_fw.sh
+++ b/movement/make/make_alternate_fw.sh
@@ -3,7 +3,7 @@
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")
+variants=("standard" "backer" "alt_time" "deep_space_now" "focus" "the_athlete" "the_backpacker" "the_stargazer")
if [ -d "$fw_dir" ] ; then
rm -r "$fw_dir"
@@ -25,7 +25,7 @@ do
make LED=$COLOR FIRMWARE=$VARIANT
mv "build/watch.uf2" "$fw_dir/$variant-$color.uf2"
done
- make clean
+ rm -rf ./build-sim
emmake make FIRMWARE=$VARIANT
mkdir "$sim_dir/$variant/"
mv "build-sim/watch.wasm" "$sim_dir/$variant/"
diff --git a/movement/movement.c b/movement/movement.c
index 25fa2c5c..3997b4a4 100644
--- a/movement/movement.c
+++ b/movement/movement.c
@@ -37,7 +37,9 @@
#ifndef MOVEMENT_FIRMWARE
#include "movement_config.h"
#elif MOVEMENT_FIRMWARE == MOVEMENT_FIRMWARE_STANDARD
-#include "alt_fw/standard.h"
+#include "movement_config.h"
+#elif MOVEMENT_FIRMWARE == MOVEMENT_FIRMWARE_BACKER
+#include "alt_fw/backer.h"
#elif MOVEMENT_FIRMWARE == MOVEMENT_FIRMWARE_ALT_TIME
#include "alt_fw/alt_time.h"
#elif MOVEMENT_FIRMWARE == MOVEMENT_FIRMWARE_FOCUS