hueso/Sensor-Watch
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Activity

make it clear that the movement_state contains indexes

Browse Source
This commit is contained in:
Alex Maestas 2023-12-16 22:08:10 +00:00
parent 63d6bc6aa0
commit 06d546f179
2 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
movement/movement.c
View File

@ -232,7 +232,7 @@ bool movement_default_loop_handler(movement_event_t event, movement_settings_t *
movement_illuminate_led(); movement_illuminate_led();
break; break;
case EVENT_MODE_LONG_PRESS: case EVENT_MODE_LONG_PRESS:
if (MOVEMENT_SECONDARY_FACE_INDEX && movement_state.current_watch_face == 0) { if (MOVEMENT_SECONDARY_FACE_INDEX && movement_state.current_face_idx == 0) {
movement_move_to_face(MOVEMENT_SECONDARY_FACE_INDEX); movement_move_to_face(MOVEMENT_SECONDARY_FACE_INDEX);
} else { } else {
movement_move_to_face(0); movement_move_to_face(0);
@ -247,25 +247,25 @@ bool movement_default_loop_handler(movement_event_t event, movement_settings_t *
void movement_move_to_face(uint8_t watch_face_index) { void movement_move_to_face(uint8_t watch_face_index) {
movement_state.watch_face_changed = true; movement_state.watch_face_changed = true;
movement_state.next_watch_face = watch_face_index; movement_state.next_face_idx = watch_face_index;
} }
void movement_move_to_next_face(void) { void movement_move_to_next_face(void) {
uint16_t face_max; uint16_t face_max;
if (MOVEMENT_SECONDARY_FACE_INDEX) { if (MOVEMENT_SECONDARY_FACE_INDEX) {
face_max = (movement_state.current_watch_face < (int16_t)MOVEMENT_SECONDARY_FACE_INDEX) ? MOVEMENT_SECONDARY_FACE_INDEX : MOVEMENT_NUM_FACES; face_max = (movement_state.current_face_idx < (int16_t)MOVEMENT_SECONDARY_FACE_INDEX) ? MOVEMENT_SECONDARY_FACE_INDEX : MOVEMENT_NUM_FACES;
} else { } else {
face_max = MOVEMENT_NUM_FACES; face_max = MOVEMENT_NUM_FACES;
} }
movement_move_to_face((movement_state.current_watch_face + 1) % face_max); movement_move_to_face((movement_state.current_face_idx + 1) % face_max);
} }
void movement_schedule_background_task(watch_date_time date_time) { void movement_schedule_background_task(watch_date_time date_time) {
movement_schedule_background_task_for_face(movement_state.current_watch_face, date_time); movement_schedule_background_task_for_face(movement_state.current_face_idx, date_time);
} }
void movement_cancel_background_task(void) { void movement_cancel_background_task(void) {
movement_cancel_background_task_for_face(movement_state.current_watch_face); movement_cancel_background_task_for_face(movement_state.current_face_idx);
} }
void movement_schedule_background_task_for_face(uint8_t watch_face_index, watch_date_time date_time) { void movement_schedule_background_task_for_face(uint8_t watch_face_index, watch_date_time date_time) {
@ -414,7 +414,7 @@ void app_setup(void) {
watch_faces[i].setup(&movement_state.settings, i, &watch_face_contexts[i]); watch_faces[i].setup(&movement_state.settings, i, &watch_face_contexts[i]);
} }
watch_faces[movement_state.current_watch_face].activate(&movement_state.settings, watch_face_contexts[movement_state.current_watch_face]); watch_faces[movement_state.current_face_idx].activate(&movement_state.settings, watch_face_contexts[movement_state.current_face_idx]);
event.subsecond = 0; event.subsecond = 0;
event.event_type = EVENT_ACTIVATE; event.event_type = EVENT_ACTIVATE;
} }
@ -434,7 +434,7 @@ static void _sleep_mode_app_loop(void) {
if (movement_state.needs_background_tasks_handled) _movement_handle_background_tasks(); if (movement_state.needs_background_tasks_handled) _movement_handle_background_tasks();
event.event_type = EVENT_LOW_ENERGY_UPDATE; event.event_type = EVENT_LOW_ENERGY_UPDATE;
watch_faces[movement_state.current_watch_face].loop(event, &movement_state.settings, watch_face_contexts[movement_state.current_watch_face]); watch_faces[movement_state.current_face_idx].loop(event, &movement_state.settings, watch_face_contexts[movement_state.current_face_idx]);
// if we need to wake immediately, do it! // if we need to wake immediately, do it!
if (movement_state.needs_wake) return; if (movement_state.needs_wake) return;
@ -447,13 +447,13 @@ bool app_loop(void) {
if (movement_state.watch_face_changed) { if (movement_state.watch_face_changed) {
if (movement_state.settings.bit.button_should_sound) { if (movement_state.settings.bit.button_should_sound) {
// low note for nonzero case, high note for return to watch_face 0 // low note for nonzero case, high note for return to watch_face 0
watch_buzzer_play_note(movement_state.next_watch_face ? BUZZER_NOTE_C7 : BUZZER_NOTE_C8, 50); watch_buzzer_play_note(movement_state.next_face_idx ? BUZZER_NOTE_C7 : BUZZER_NOTE_C8, 50);
} }
watch_faces[movement_state.current_watch_face].resign(&movement_state.settings, watch_face_contexts[movement_state.current_watch_face]); watch_faces[movement_state.current_face_idx].resign(&movement_state.settings, watch_face_contexts[movement_state.current_face_idx]);
movement_state.current_watch_face = movement_state.next_watch_face; movement_state.current_face_idx = movement_state.next_face_idx;
watch_clear_display(); watch_clear_display();
movement_request_tick_frequency(1); movement_request_tick_frequency(1);
watch_faces[movement_state.current_watch_face].activate(&movement_state.settings, watch_face_contexts[movement_state.current_watch_face]); watch_faces[movement_state.current_face_idx].activate(&movement_state.settings, watch_face_contexts[movement_state.current_face_idx]);
event.subsecond = 0; event.subsecond = 0;
event.event_type = EVENT_ACTIVATE; event.event_type = EVENT_ACTIVATE;
movement_state.watch_face_changed = false; movement_state.watch_face_changed = false;
@ -498,7 +498,7 @@ bool app_loop(void) {
if (event.event_type) { if (event.event_type) {
event.subsecond = movement_state.subsecond; event.subsecond = movement_state.subsecond;
can_sleep = watch_faces[movement_state.current_watch_face].loop(event, &movement_state.settings, watch_face_contexts[movement_state.current_watch_face]); can_sleep = watch_faces[movement_state.current_face_idx].loop(event, &movement_state.settings, watch_face_contexts[movement_state.current_face_idx]);
event.event_type = EVENT_NONE; event.event_type = EVENT_NONE;
} }
@ -510,9 +510,9 @@ bool app_loop(void) {
event.event_type = EVENT_TIMEOUT; event.event_type = EVENT_TIMEOUT;
} }
event.subsecond = movement_state.subsecond; event.subsecond = movement_state.subsecond;
watch_faces[movement_state.current_watch_face].loop(event, &movement_state.settings, watch_face_contexts[movement_state.current_watch_face]); watch_faces[movement_state.current_face_idx].loop(event, &movement_state.settings, watch_face_contexts[movement_state.current_face_idx]);
event.event_type = EVENT_NONE; event.event_type = EVENT_NONE;
if (movement_state.settings.bit.to_always && movement_state.current_watch_face != 0) { if (movement_state.settings.bit.to_always && movement_state.current_face_idx != 0) {
// ...but if the user has "timeout always" set, give it the boot. // ...but if the user has "timeout always" set, give it the boot.
movement_move_to_face(0); movement_move_to_face(0);
} }

4
movement/movement.h
View File

@ -244,8 +244,8 @@ typedef struct {
movement_settings_t settings; movement_settings_t settings;
// transient properties // transient properties
int16_t current_watch_face; int16_t current_face_idx;
int16_t next_watch_face; int16_t next_face_idx;
bool watch_face_changed; bool watch_face_changed;
bool fast_tick_enabled; bool fast_tick_enabled;
int16_t fast_ticks; int16_t fast_ticks;