From 05fe055f99b9b950086b1e38a9c795d7e076c5b2 Mon Sep 17 00:00:00 2001
From: Joey Castillo <jose.castillo@gmail.com>
Date: Sat, 16 Oct 2021 16:25:30 -0400
Subject: automatically determine number of watch faces

---
 movement/watch_faces/settings/preferences_face.h | 14 +++++++-------
 movement/watch_faces/settings/set_time_face.h    | 14 +++++++-------
 2 files changed, 14 insertions(+), 14 deletions(-)

(limited to 'movement/watch_faces/settings')

diff --git a/movement/watch_faces/settings/preferences_face.h b/movement/watch_faces/settings/preferences_face.h
index 5b735db9..af628ba3 100644
--- 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 06dbe2ce..21fb1e44 100644
--- 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_
-- 
cgit v1.2.3