From e8461984d60a80841a5f4b219358cc20567114f8 Mon Sep 17 00:00:00 2001 From: Joey Castillo Date: Sat, 16 Oct 2021 12:58:14 -0400 Subject: launcher is now movement --- movement/movement_config.h | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 movement/movement_config.h (limited to 'movement/movement_config.h') diff --git a/movement/movement_config.h b/movement/movement_config.h new file mode 100644 index 00000000..49f342ca --- /dev/null +++ b/movement/movement_config.h @@ -0,0 +1,18 @@ +#ifndef MOVEMENT_CONFIG_H_ +#define MOVEMENT_CONFIG_H_ + +#include "simple_clock_widget.h" +#include "preferences_widget.h" +#include "set_time_widget.h" +#include "pulseometer_widget.h" + +#define MOVEMENT_NUM_WIDGETS 3 + +WatchWidget widgets[MOVEMENT_NUM_WIDGETS] = { + simple_clock_widget, + preferences_widget, + set_time_widget, +}; + + +#endif // MOVEMENT_CONFIG_H_ -- cgit v1.2.3 From d5ac4cb71b4e328a27e26843cfdc6719b152ac7d Mon Sep 17 00:00:00 2001 From: Joey Castillo Date: Sat, 16 Oct 2021 13:14:52 -0400 Subject: widgets are now watch faces --- movement/movement_config.h | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'movement/movement_config.h') diff --git a/movement/movement_config.h b/movement/movement_config.h index 49f342ca..41066d19 100644 --- a/movement/movement_config.h +++ b/movement/movement_config.h @@ -1,17 +1,17 @@ #ifndef MOVEMENT_CONFIG_H_ #define MOVEMENT_CONFIG_H_ -#include "simple_clock_widget.h" -#include "preferences_widget.h" -#include "set_time_widget.h" -#include "pulseometer_widget.h" +#include "simple_clock_face.h" +#include "preferences_face.h" +#include "set_time_face.h" +#include "pulseometer_face.h" -#define MOVEMENT_NUM_WIDGETS 3 +#define MOVEMENT_NUM_FACES 3 -WatchWidget widgets[MOVEMENT_NUM_WIDGETS] = { - simple_clock_widget, - preferences_widget, - set_time_widget, +WatchFace watch_faces[MOVEMENT_NUM_FACES] = { + simple_clock_face, + preferences_face, + set_time_face, }; -- cgit v1.2.3 From d36331ce4e79d275e0ef09414a1a1a1a8949b0ea Mon Sep 17 00:00:00 2001 From: Joey Castillo Date: Sat, 16 Oct 2021 13:23:23 -0400 Subject: rename types to be more c-like --- movement/movement_config.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'movement/movement_config.h') diff --git a/movement/movement_config.h b/movement/movement_config.h index 41066d19..172736f1 100644 --- a/movement/movement_config.h +++ b/movement/movement_config.h @@ -8,7 +8,7 @@ #define MOVEMENT_NUM_FACES 3 -WatchFace watch_faces[MOVEMENT_NUM_FACES] = { +watch_face_t watch_faces[MOVEMENT_NUM_FACES] = { simple_clock_face, preferences_face, set_time_face, -- cgit v1.2.3 From 05fe055f99b9b950086b1e38a9c795d7e076c5b2 Mon Sep 17 00:00:00 2001 From: Joey Castillo Date: Sat, 16 Oct 2021 16:25:30 -0400 Subject: automatically determine number of watch faces --- movement/movement_config.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'movement/movement_config.h') diff --git a/movement/movement_config.h b/movement/movement_config.h index 172736f1..e95e46c0 100644 --- a/movement/movement_config.h +++ b/movement/movement_config.h @@ -6,13 +6,12 @@ #include "set_time_face.h" #include "pulseometer_face.h" -#define MOVEMENT_NUM_FACES 3 - -watch_face_t watch_faces[MOVEMENT_NUM_FACES] = { +const watch_face_t watch_faces[] = { simple_clock_face, preferences_face, set_time_face, }; +#define MOVEMENT_NUM_FACES (sizeof(watch_faces) / sizeof(watch_face_t)) #endif // MOVEMENT_CONFIG_H_ -- cgit v1.2.3 From c27dbc779b252c32370e2cd34a22f51d120d0f38 Mon Sep 17 00:00:00 2001 From: Joey Castillo Date: Sat, 16 Oct 2021 16:51:36 -0400 Subject: fix misspelling of pulsometer --- movement/movement_config.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'movement/movement_config.h') diff --git a/movement/movement_config.h b/movement/movement_config.h index e95e46c0..6a7aec5a 100644 --- a/movement/movement_config.h +++ b/movement/movement_config.h @@ -4,7 +4,7 @@ #include "simple_clock_face.h" #include "preferences_face.h" #include "set_time_face.h" -#include "pulseometer_face.h" +#include "pulsometer_face.h" const watch_face_t watch_faces[] = { simple_clock_face, -- cgit v1.2.3