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/settings | |
| 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/settings')
| -rw-r--r-- | movement/watch_faces/settings/preferences_face.c | 3 | ||||
| -rw-r--r-- | movement/watch_faces/settings/preferences_face.h | 2 | ||||
| -rw-r--r-- | movement/watch_faces/settings/set_time_face.c | 3 | ||||
| -rw-r--r-- | movement/watch_faces/settings/set_time_face.h | 2 |
4 files changed, 6 insertions, 4 deletions
diff --git a/movement/watch_faces/settings/preferences_face.c b/movement/watch_faces/settings/preferences_face.c index ef65b1af..8cbe4c68 100644 --- a/movement/watch_faces/settings/preferences_face.c +++ b/movement/watch_faces/settings/preferences_face.c @@ -17,8 +17,9 @@ const char preferences_face_titles[PREFERENCES_FACE_NUM_PREFEFENCES][11] = { "LT red ", // Light: red component }; -void preferences_face_setup(movement_settings_t *settings, void ** context_ptr) { +void preferences_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(uint8_t)); } diff --git a/movement/watch_faces/settings/preferences_face.h b/movement/watch_faces/settings/preferences_face.h index af628ba3..54b4cff0 100644 --- a/movement/watch_faces/settings/preferences_face.h +++ b/movement/watch_faces/settings/preferences_face.h @@ -3,7 +3,7 @@ #include "movement.h" -void preferences_face_setup(movement_settings_t *settings, void ** context_ptr); +void preferences_face_setup(movement_settings_t *settings, uint8_t watch_face_index, void ** context_ptr); 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); diff --git a/movement/watch_faces/settings/set_time_face.c b/movement/watch_faces/settings/set_time_face.c index 0f5af312..a32efe9f 100644 --- a/movement/watch_faces/settings/set_time_face.c +++ b/movement/watch_faces/settings/set_time_face.c @@ -5,8 +5,9 @@ #define SET_TIME_FACE_NUM_SETTINGS (7) const char set_time_face_titles[SET_TIME_FACE_NUM_SETTINGS][3] = {"HR", "M1", "SE", "YR", "MO", "DA", "ZO"}; -void set_time_face_setup(movement_settings_t *settings, void ** context_ptr) { +void set_time_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(uint8_t)); } diff --git a/movement/watch_faces/settings/set_time_face.h b/movement/watch_faces/settings/set_time_face.h index 21fb1e44..d58c4618 100644 --- a/movement/watch_faces/settings/set_time_face.h +++ b/movement/watch_faces/settings/set_time_face.h @@ -3,7 +3,7 @@ #include "movement.h" -void set_time_face_setup(movement_settings_t *settings, void ** context_ptr); +void set_time_face_setup(movement_settings_t *settings, uint8_t watch_face_index, void ** context_ptr); 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); |