diff options
| author | Joey Castillo <joeycastillo@utexas.edu> | 2021-12-20 17:02:17 -0600 |
|---|---|---|
| committer | Joey Castillo <joeycastillo@utexas.edu> | 2021-12-20 17:02:17 -0600 |
| commit | 60fe9691917f7e40effc72b1b6c929f9ba0ba3ee (patch) | |
| tree | fe3e64a49d0d440f94e3f8ac948c71edf8b2538b /movement/watch_faces/clock | |
| parent | 03e107b81a63c08443165497d57dc2d756b78094 (diff) | |
| download | Sensor-Watch-60fe9691917f7e40effc72b1b6c929f9ba0ba3ee.tar.gz Sensor-Watch-60fe9691917f7e40effc72b1b6c929f9ba0ba3ee.tar.bz2 Sensor-Watch-60fe9691917f7e40effc72b1b6c929f9ba0ba3ee.zip | |
Movement: give watch faces their index at setup time
Diffstat (limited to 'movement/watch_faces/clock')
| -rw-r--r-- | movement/watch_faces/clock/simple_clock_face.c | 3 | ||||
| -rw-r--r-- | movement/watch_faces/clock/simple_clock_face.h | 2 | ||||
| -rw-r--r-- | movement/watch_faces/clock/world_clock_face.c | 3 | ||||
| -rw-r--r-- | movement/watch_faces/clock/world_clock_face.h | 2 |
4 files changed, 6 insertions, 4 deletions
diff --git a/movement/watch_faces/clock/simple_clock_face.c b/movement/watch_faces/clock/simple_clock_face.c index 72f7713f..0b26812f 100644 --- a/movement/watch_faces/clock/simple_clock_face.c +++ b/movement/watch_faces/clock/simple_clock_face.c @@ -3,8 +3,9 @@ #include "watch.h" #include "watch_utility.h" -void simple_clock_face_setup(movement_settings_t *settings, void ** context_ptr) { +void simple_clock_face_setup(movement_settings_t *settings, uint8_t watch_face_index, void ** context_ptr) { (void) settings; + (void) watch_face_index; // the only context we need is the timestamp of the previous tick. if (*context_ptr == NULL) *context_ptr = malloc(sizeof(uint32_t)); } diff --git a/movement/watch_faces/clock/simple_clock_face.h b/movement/watch_faces/clock/simple_clock_face.h index 3db894d2..a6cb6ac2 100644 --- a/movement/watch_faces/clock/simple_clock_face.h +++ b/movement/watch_faces/clock/simple_clock_face.h @@ -3,7 +3,7 @@ #include "movement.h" -void simple_clock_face_setup(movement_settings_t *settings, void ** context_ptr); +void simple_clock_face_setup(movement_settings_t *settings, uint8_t watch_face_index, void ** context_ptr); void simple_clock_face_activate(movement_settings_t *settings, void *context); bool simple_clock_face_loop(movement_event_t event, movement_settings_t *settings, void *context); void simple_clock_face_resign(movement_settings_t *settings, void *context); diff --git a/movement/watch_faces/clock/world_clock_face.c b/movement/watch_faces/clock/world_clock_face.c index e1d96c97..5f2a1a86 100644 --- a/movement/watch_faces/clock/world_clock_face.c +++ b/movement/watch_faces/clock/world_clock_face.c @@ -4,8 +4,9 @@ #include "watch.h" #include "watch_utility.h" -void world_clock_face_setup(movement_settings_t *settings, void ** context_ptr) { +void world_clock_face_setup(movement_settings_t *settings, uint8_t watch_face_index, void ** context_ptr) { (void) settings; + (void) watch_face_index; if (*context_ptr == NULL) { *context_ptr = malloc(sizeof(world_clock_state_t)); world_clock_state_t *state = (world_clock_state_t *)*context_ptr; diff --git a/movement/watch_faces/clock/world_clock_face.h b/movement/watch_faces/clock/world_clock_face.h index 1c4525a4..b5e766bd 100644 --- a/movement/watch_faces/clock/world_clock_face.h +++ b/movement/watch_faces/clock/world_clock_face.h @@ -15,7 +15,7 @@ typedef struct { uint32_t previous_date_time; } world_clock_state_t; -void world_clock_face_setup(movement_settings_t *settings, void ** context_ptr); +void world_clock_face_setup(movement_settings_t *settings, uint8_t watch_face_index, void ** context_ptr); void world_clock_face_activate(movement_settings_t *settings, void *context); bool world_clock_face_loop(movement_event_t event, movement_settings_t *settings, void *context); void world_clock_face_resign(movement_settings_t *settings, void *context); |