diff options
| -rw-r--r-- | movement/alt_fw/alt_time.h | 2 | ||||
| -rw-r--r-- | movement/alt_fw/backer.h | 2 | ||||
| -rw-r--r-- | movement/alt_fw/deep_space_now.h | 2 | ||||
| -rw-r--r-- | movement/alt_fw/focus.h | 2 | ||||
| -rw-r--r-- | movement/alt_fw/the_athlete.h | 2 | ||||
| -rw-r--r-- | movement/alt_fw/the_backpacker.h | 2 | ||||
| -rw-r--r-- | movement/alt_fw/the_stargazer.h | 2 | ||||
| -rw-r--r-- | movement/alt_fw/timers.h | 2 | ||||
| -rwxr-xr-x | movement/make/make_alternate_fw.sh | 2 | ||||
| -rw-r--r-- | movement/movement.c | 2 | ||||
| -rw-r--r-- | movement/movement_config.h | 1 |
11 files changed, 19 insertions, 2 deletions
diff --git a/movement/alt_fw/alt_time.h b/movement/alt_fw/alt_time.h index 8108bcf3..956928d7 100644 --- a/movement/alt_fw/alt_time.h +++ b/movement/alt_fw/alt_time.h @@ -38,4 +38,6 @@ const watch_face_t watch_faces[] = { #define MOVEMENT_NUM_FACES (sizeof(watch_faces) / sizeof(watch_face_t)) +#define SIGNAL_TUNE_DEFAULT + #endif // MOVEMENT_CONFIG_H_ diff --git a/movement/alt_fw/backer.h b/movement/alt_fw/backer.h index 3abcf457..d41f567d 100644 --- a/movement/alt_fw/backer.h +++ b/movement/alt_fw/backer.h @@ -40,4 +40,6 @@ const watch_face_t watch_faces[] = { #define MOVEMENT_NUM_FACES (sizeof(watch_faces) / sizeof(watch_face_t)) +#define SIGNAL_TUNE_DEFAULT + #endif // MOVEMENT_CONFIG_H_ diff --git a/movement/alt_fw/deep_space_now.h b/movement/alt_fw/deep_space_now.h index 6cb34237..d2096a69 100644 --- a/movement/alt_fw/deep_space_now.h +++ b/movement/alt_fw/deep_space_now.h @@ -58,4 +58,6 @@ const watch_face_t watch_faces[] = { #define MOVEMENT_NUM_FACES (sizeof(watch_faces) / sizeof(watch_face_t)) +#define SIGNAL_TUNE_DEFAULT + #endif // MOVEMENT_CONFIG_H_ diff --git a/movement/alt_fw/focus.h b/movement/alt_fw/focus.h index ab5525a5..a8fd5736 100644 --- a/movement/alt_fw/focus.h +++ b/movement/alt_fw/focus.h @@ -40,4 +40,6 @@ const watch_face_t watch_faces[] = { #define MOVEMENT_NUM_FACES (sizeof(watch_faces) / sizeof(watch_face_t)) +#define SIGNAL_TUNE_DEFAULT + #endif // MOVEMENT_CONFIG_H_ diff --git a/movement/alt_fw/the_athlete.h b/movement/alt_fw/the_athlete.h index 5d9d9529..660a304c 100644 --- a/movement/alt_fw/the_athlete.h +++ b/movement/alt_fw/the_athlete.h @@ -40,4 +40,6 @@ const watch_face_t watch_faces[] = { #define MOVEMENT_NUM_FACES (sizeof(watch_faces) / sizeof(watch_face_t)) +#define SIGNAL_TUNE_DEFAULT + #endif // MOVEMENT_CONFIG_H_ diff --git a/movement/alt_fw/the_backpacker.h b/movement/alt_fw/the_backpacker.h index 01af7b06..0a599cff 100644 --- a/movement/alt_fw/the_backpacker.h +++ b/movement/alt_fw/the_backpacker.h @@ -41,4 +41,6 @@ const watch_face_t watch_faces[] = { #define MOVEMENT_NUM_FACES (sizeof(watch_faces) / sizeof(watch_face_t)) +#define SIGNAL_TUNE_DEFAULT + #endif // MOVEMENT_CONFIG_H_ diff --git a/movement/alt_fw/the_stargazer.h b/movement/alt_fw/the_stargazer.h index a13dc3ac..844c6807 100644 --- a/movement/alt_fw/the_stargazer.h +++ b/movement/alt_fw/the_stargazer.h @@ -42,4 +42,6 @@ const watch_face_t watch_faces[] = { #define MOVEMENT_NUM_FACES (sizeof(watch_faces) / sizeof(watch_face_t)) +#define SIGNAL_TUNE_DEFAULT + #endif // MOVEMENT_CONFIG_H_ diff --git a/movement/alt_fw/timers.h b/movement/alt_fw/timers.h index c4d27f50..4d36c664 100644 --- a/movement/alt_fw/timers.h +++ b/movement/alt_fw/timers.h @@ -40,4 +40,6 @@ const watch_face_t watch_faces[] = { #define MOVEMENT_NUM_FACES (sizeof(watch_faces) / sizeof(watch_face_t)) +#define SIGNAL_TUNE_DEFAULT + #endif // MOVEMENT_CONFIG_H_ diff --git a/movement/make/make_alternate_fw.sh b/movement/make/make_alternate_fw.sh index 24d9e63a..c65e72d3 100755 --- a/movement/make/make_alternate_fw.sh +++ b/movement/make/make_alternate_fw.sh @@ -2,7 +2,7 @@ fw_dir="firmware/download" sim_dir="firmware/simulate" -colors=("green" "blue") +colors=("green" "blue" "red") variants=("standard" "backer" "alt_time" "deep_space_now" "focus" "the_athlete" "the_backpacker" "the_stargazer") if [ -d "$fw_dir" ] ; then diff --git a/movement/movement.c b/movement/movement.c index 0a5ac2e4..0c6ed319 100644 --- a/movement/movement.c +++ b/movement/movement.c @@ -54,6 +54,8 @@ #include "alt_fw/deep_space_now.h" #endif +#include "movement_custom_signal_tunes.h" + // Default to no secondary face behaviour. #ifndef MOVEMENT_SECONDARY_FACE_INDEX #define MOVEMENT_SECONDARY_FACE_INDEX 0 diff --git a/movement/movement_config.h b/movement/movement_config.h index 1bd15133..6a7f87e0 100644 --- a/movement/movement_config.h +++ b/movement/movement_config.h @@ -51,6 +51,5 @@ const watch_face_t watch_faces[] = { /* Custom hourly chime tune. Check movement_custom_signal_tunes.h for options */ #define SIGNAL_TUNE_DEFAULT -#include "movement_custom_signal_tunes.h" #endif // MOVEMENT_CONFIG_H_ |