faces/clock: move structure definition

Instances of the clock state structure
are only passed to the clock face itself
and only via the opaque context pointer.
No other code uses it.

Thus there is no need to expose it in a header file.
So make it an implementation detail of the watch face
by localizing it inside the translation unit.

diff --git a/movement/watch_faces/clock/clock_face.c b/movement/watch_faces/clock/clock_face.c
index a18bc3a1d21b0a0b6e563bfa047fd3f04c6d0888..070968a78ef97838bcb0b7f010c0939f0a0290c6 100644 (file)
--- a/movement/watch_faces/clock/clock_face.c
+++ b/movement/watch_faces/clock/clock_face.c
@@ -28,6 +28,15 @@
 #include "watch_utility.h"
 #include "watch_private_display.h"
 
+typedef struct {
+    uint32_t previous_date_time;
+    uint8_t last_battery_check;
+    uint8_t watch_face_index;
+    bool signal_enabled;
+    bool battery_low;
+    bool alarm_enabled;
+} clock_state_t;
+
 static void _update_alarm_indicator(bool settings_alarm_enabled, clock_state_t *state) {
     state->alarm_enabled = settings_alarm_enabled;
     if (state->alarm_enabled) watch_set_indicator(WATCH_INDICATOR_SIGNAL);

diff --git a/movement/watch_faces/clock/clock_face.h b/movement/watch_faces/clock/clock_face.h
index d2aa5ecb413f0ce46c1d1335caf5ca78a764d106..f973f2707da64c656475935291efdb749f308a1b 100644 (file)
--- a/movement/watch_faces/clock/clock_face.h
+++ b/movement/watch_faces/clock/clock_face.h
@@ -37,15 +37,6 @@
 
 #include "movement.h"
 
-typedef struct {
-    uint32_t previous_date_time;
-    uint8_t last_battery_check;
-    uint8_t watch_face_index;
-    bool signal_enabled;
-    bool battery_low;
-    bool alarm_enabled;
-} clock_state_t;
-
 void clock_face_setup(movement_settings_t *settings, uint8_t watch_face_index, void ** context_ptr);
 void clock_face_activate(movement_settings_t *settings, void *context);
 bool clock_face_loop(movement_event_t event, movement_settings_t *settings, void *context);