From 60fe9691917f7e40effc72b1b6c929f9ba0ba3ee Mon Sep 17 00:00:00 2001 From: Joey Castillo Date: Mon, 20 Dec 2021 17:02:17 -0600 Subject: Movement: give watch faces their index at setup time --- movement/watch_faces/demos/character_set_face.c | 3 ++- movement/watch_faces/demos/character_set_face.h | 2 +- movement/watch_faces/demos/demo_face.c | 3 ++- movement/watch_faces/demos/demo_face.h | 2 +- movement/watch_faces/demos/lis2dh_logging_face.c | 3 ++- movement/watch_faces/demos/lis2dh_logging_face.h | 2 +- movement/watch_faces/demos/voltage_face.c | 3 ++- movement/watch_faces/demos/voltage_face.h | 2 +- 8 files changed, 12 insertions(+), 8 deletions(-) (limited to 'movement/watch_faces/demos') diff --git a/movement/watch_faces/demos/character_set_face.c b/movement/watch_faces/demos/character_set_face.c index eabb133f..127c0fb3 100644 --- a/movement/watch_faces/demos/character_set_face.c +++ b/movement/watch_faces/demos/character_set_face.c @@ -3,8 +3,9 @@ #include "character_set_face.h" #include "watch.h" -void character_set_face_setup(movement_settings_t *settings, void ** context_ptr) { +void character_set_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(char)); } diff --git a/movement/watch_faces/demos/character_set_face.h b/movement/watch_faces/demos/character_set_face.h index b27a8359..0c7cb85c 100644 --- a/movement/watch_faces/demos/character_set_face.h +++ b/movement/watch_faces/demos/character_set_face.h @@ -3,7 +3,7 @@ #include "movement.h" -void character_set_face_setup(movement_settings_t *settings, void ** context_ptr); +void character_set_face_setup(movement_settings_t *settings, uint8_t watch_face_index, void ** context_ptr); void character_set_face_activate(movement_settings_t *settings, void *context); bool character_set_face_loop(movement_event_t event, movement_settings_t *settings, void *context); void character_set_face_resign(movement_settings_t *settings, void *context); diff --git a/movement/watch_faces/demos/demo_face.c b/movement/watch_faces/demos/demo_face.c index 82256767..44a180ab 100644 --- a/movement/watch_faces/demos/demo_face.c +++ b/movement/watch_faces/demos/demo_face.c @@ -14,8 +14,9 @@ typedef enum { DEMO_FACE_NUM_FACES } demo_face_index_t; -void demo_face_setup(movement_settings_t *settings, void ** context_ptr) { +void demo_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(demo_face_index_t)); memset(*context_ptr, 0, sizeof(demo_face_index_t)); diff --git a/movement/watch_faces/demos/demo_face.h b/movement/watch_faces/demos/demo_face.h index b9e36ffc..1bc39c4f 100644 --- a/movement/watch_faces/demos/demo_face.h +++ b/movement/watch_faces/demos/demo_face.h @@ -3,7 +3,7 @@ #include "movement.h" -void demo_face_setup(movement_settings_t *settings, void ** context_ptr); +void demo_face_setup(movement_settings_t *settings, uint8_t watch_face_index, void ** context_ptr); void demo_face_activate(movement_settings_t *settings, void *context); bool demo_face_loop(movement_event_t event, movement_settings_t *settings, void *context); void demo_face_resign(movement_settings_t *settings, void *context); diff --git a/movement/watch_faces/demos/lis2dh_logging_face.c b/movement/watch_faces/demos/lis2dh_logging_face.c index 9f5783fe..76892d07 100644 --- a/movement/watch_faces/demos/lis2dh_logging_face.c +++ b/movement/watch_faces/demos/lis2dh_logging_face.c @@ -86,8 +86,9 @@ static void _lis2dh_logging_face_log_data(lis2dh_logger_state_t *logger_state) { logger_state->z_interrupts_this_hour = 0; } -void lis2dh_logging_face_setup(movement_settings_t *settings, void ** context_ptr) { +void lis2dh_logging_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(lis2dh_logger_state_t)); memset(*context_ptr, 0, sizeof(lis2dh_logger_state_t)); diff --git a/movement/watch_faces/demos/lis2dh_logging_face.h b/movement/watch_faces/demos/lis2dh_logging_face.h index b0faeca5..02b7ce9b 100644 --- a/movement/watch_faces/demos/lis2dh_logging_face.h +++ b/movement/watch_faces/demos/lis2dh_logging_face.h @@ -25,7 +25,7 @@ typedef struct { lis2dh_logger_data_point_t data[LIS2DH_LOGGING_NUM_DATA_POINTS]; } lis2dh_logger_state_t; -void lis2dh_logging_face_setup(movement_settings_t *settings, void ** context_ptr); +void lis2dh_logging_face_setup(movement_settings_t *settings, uint8_t watch_face_index, void ** context_ptr); void lis2dh_logging_face_activate(movement_settings_t *settings, void *context); bool lis2dh_logging_face_loop(movement_event_t event, movement_settings_t *settings, void *context); void lis2dh_logging_face_resign(movement_settings_t *settings, void *context); diff --git a/movement/watch_faces/demos/voltage_face.c b/movement/watch_faces/demos/voltage_face.c index fe43343f..a2b66854 100644 --- a/movement/watch_faces/demos/voltage_face.c +++ b/movement/watch_faces/demos/voltage_face.c @@ -11,8 +11,9 @@ static void _voltage_face_update_display(void) { watch_display_string(buf, 0); } -void voltage_face_setup(movement_settings_t *settings, void ** context_ptr) { +void voltage_face_setup(movement_settings_t *settings, uint8_t watch_face_index, void ** context_ptr) { (void) settings; + (void) watch_face_index; (void) context_ptr; } diff --git a/movement/watch_faces/demos/voltage_face.h b/movement/watch_faces/demos/voltage_face.h index da580da5..530cf34f 100644 --- a/movement/watch_faces/demos/voltage_face.h +++ b/movement/watch_faces/demos/voltage_face.h @@ -3,7 +3,7 @@ #include "movement.h" -void voltage_face_setup(movement_settings_t *settings, void ** context_ptr); +void voltage_face_setup(movement_settings_t *settings, uint8_t watch_face_index, void ** context_ptr); void voltage_face_activate(movement_settings_t *settings, void *context); bool voltage_face_loop(movement_event_t event, movement_settings_t *settings, void *context); void voltage_face_resign(movement_settings_t *settings, void *context); -- cgit v1.2.3