automatically determine number of watch faces

diff --git a/movement/movement_config.h b/movement/movement_config.h
index 172736f1464429a8f9f40dd0a731c9d6ff0a08e4..e95e46c0ab0f6942ed12975596e1dd49d6ce8c5d 100644 (file)
--- 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_

diff --git a/movement/watch_faces/clock/simple_clock_face.h b/movement/watch_faces/clock/simple_clock_face.h
index 7daaba3e3093135e30948a6e3bedb9cc68a2337d..3db894d20c448bc3d5f6c12eb5c2418479607577 100644 (file)
--- a/movement/watch_faces/clock/simple_clock_face.h
+++ b/movement/watch_faces/clock/simple_clock_face.h
@@ -10,12 +10,12 @@ void simple_clock_face_resign(movement_settings_t *settings, void *context);
 
 uint8_t simple_clock_face_get_weekday(uint16_t day, uint16_t month, uint16_t year);
 
-#define simple_clock_face { \
-    simple_clock_face_setup, \
-    simple_clock_face_activate, \
-    simple_clock_face_loop, \
-    simple_clock_face_resign, \
-    NULL, \
-}
+static const watch_face_t simple_clock_face = {
+    simple_clock_face_setup,
+    simple_clock_face_activate,
+    simple_clock_face_loop,
+    simple_clock_face_resign,
+    NULL
+};
 
-#endif // FAKE_FACE_H_
\ No newline at end of file
+#endif // SIMPLE_CLOCK_FACE_H_
\ No newline at end of file

diff --git a/movement/watch_faces/complications/pulseometer_face.h b/movement/watch_faces/complications/pulseometer_face.h
index 5a9c66b0c85e1409b5302a08d0cb9db95d3cd9af..52bccf24dce2e7d41ae06b1525b0e8535cd5615c 100644 (file)
--- a/movement/watch_faces/complications/pulseometer_face.h
+++ b/movement/watch_faces/complications/pulseometer_face.h
@@ -14,12 +14,12 @@ void pulseometer_face_activate(movement_settings_t *settings, void *context);
 bool pulseometer_face_loop(movement_event_t event, movement_settings_t *settings, void *context);
 void pulseometer_face_resign(movement_settings_t *settings, void *context);
 
-#define pulseometer_face { \
-    pulseometer_face_setup, \
-    pulseometer_face_activate, \
-    pulseometer_face_loop, \
-    pulseometer_face_resign, \
-    NULL, \
-}
+static const watch_face_t pulseometer_face = {
+    pulseometer_face_setup,
+    pulseometer_face_activate,
+    pulseometer_face_loop,
+    pulseometer_face_resign,
+    NULL
+};
 
 #endif // PULSEOMETER_FACE_H_
\ No newline at end of file

diff --git a/movement/watch_faces/settings/preferences_face.h b/movement/watch_faces/settings/preferences_face.h
index 5b735db978dc7f45365bac8d7c87166d0f4fd887..af628ba35fb35cb3e58b30664c31f4c491329a3b 100644 (file)
--- a/movement/watch_faces/settings/preferences_face.h
+++ b/movement/watch_faces/settings/preferences_face.h
@@ -8,12 +8,12 @@ void preferences_face_activate(movement_settings_t *settings, void *context);
 bool preferences_face_loop(movement_event_t event, movement_settings_t *settings, void *context);
 void preferences_face_resign(movement_settings_t *settings, void *context);
 
-#define preferences_face { \
-    preferences_face_setup, \
-    preferences_face_activate, \
-    preferences_face_loop, \
-    preferences_face_resign, \
-    NULL, \
-}
+static const watch_face_t preferences_face = {
+    preferences_face_setup,
+    preferences_face_activate,
+    preferences_face_loop,
+    preferences_face_resign,
+    NULL
+};
 
 #endif // PREFERENCES_FACE_H_
\ No newline at end of file

diff --git a/movement/watch_faces/settings/set_time_face.h b/movement/watch_faces/settings/set_time_face.h
index 06dbe2cec4411be6302e1eeb0449fffa9e3386b9..21fb1e442380401fc5199517f387b13e62d016f1 100644 (file)
--- a/movement/watch_faces/settings/set_time_face.h
+++ b/movement/watch_faces/settings/set_time_face.h
@@ -8,12 +8,12 @@ void set_time_face_activate(movement_settings_t *settings, void *context);
 bool set_time_face_loop(movement_event_t event, movement_settings_t *settings, void *context);
 void set_time_face_resign(movement_settings_t *settings, void *context);
 
-#define set_time_face { \
-    set_time_face_setup, \
-    set_time_face_activate, \
-    set_time_face_loop, \
-    set_time_face_resign, \
-    NULL, \
-}
+static const watch_face_t set_time_face = {
+    set_time_face_setup,
+    set_time_face_activate,
+    set_time_face_loop,
+    set_time_face_resign,
+    NULL
+};
 
 #endif // SET_TIME_FACE_H_