diff options
| author | Alex Maestas <git@se30.xyz> | 2023-12-17 03:23:26 +0000 |
|---|---|---|
| committer | Alex Maestas <git@se30.xyz> | 2023-12-17 03:23:26 +0000 |
| commit | 0e801ed505cb0c368bf1eb0473058efb6c275a3e (patch) | |
| tree | a472bb7a8b6b1221a91db1b9425bef4f0d9e9773 | |
| parent | 8eae6eabd61beb665b73a99904d6e2adc71b7b6b (diff) | |
| download | Sensor-Watch-0e801ed505cb0c368bf1eb0473058efb6c275a3e.tar.gz Sensor-Watch-0e801ed505cb0c368bf1eb0473058efb6c275a3e.tar.bz2 Sensor-Watch-0e801ed505cb0c368bf1eb0473058efb6c275a3e.zip | |
make the watch-face a global in movement.c, actually
| -rw-r--r-- | movement/movement.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/movement/movement.c b/movement/movement.c index cdae9ca7..05b2a078 100644 --- a/movement/movement.c +++ b/movement/movement.c @@ -79,6 +79,7 @@ watch_date_time scheduled_tasks[MOVEMENT_NUM_FACES]; const int32_t movement_le_inactivity_deadlines[8] = {INT_MAX, 3600, 7200, 21600, 43200, 86400, 172800, 604800}; const int16_t movement_timeout_inactivity_deadlines[4] = {60, 120, 300, 1800}; movement_event_t event; +const watch_face_t *wf; const int16_t movement_timezone_offsets[] = { 0, // 0 : 0:00:00 (UTC) @@ -414,7 +415,7 @@ void app_setup(void) { watch_faces[i].setup(&movement_state.settings, i, &watch_face_contexts[i]); } - watch_faces[movement_state.current_face_idx].activate(&movement_state.settings, watch_face_contexts[movement_state.current_face_idx]); + wf->activate(&movement_state.settings, watch_face_contexts[movement_state.current_face_idx]); event.subsecond = 0; event.event_type = EVENT_ACTIVATE; } @@ -434,7 +435,7 @@ static void _sleep_mode_app_loop(void) { if (movement_state.needs_background_tasks_handled) _movement_handle_background_tasks(); event.event_type = EVENT_LOW_ENERGY_UPDATE; - watch_faces[movement_state.current_face_idx].loop(event, &movement_state.settings, watch_face_contexts[movement_state.current_face_idx]); + wf->loop(event, &movement_state.settings, watch_face_contexts[movement_state.current_face_idx]); // if we need to wake immediately, do it! if (movement_state.needs_wake) return; @@ -444,7 +445,7 @@ static void _sleep_mode_app_loop(void) { } bool app_loop(void) { - const watch_face_t *wf = &watch_faces[movement_state.current_face_idx]; + wf = &watch_faces[movement_state.current_face_idx]; if (movement_state.watch_face_changed) { if (movement_state.settings.bit.button_should_sound) { // low note for nonzero case, high note for return to watch_face 0 |