summaryrefslogtreecommitdiffstats
path: root/movement/watch_faces
diff options
context:
space:
mode:
authorJoey Castillo <jose.castillo@gmail.com>2021-10-18 12:15:57 -0400
committerJoey Castillo <jose.castillo@gmail.com>2021-10-18 13:55:22 -0400
commit93624f0b692648eac415a3df5689de6dee06c2db (patch)
treee9f052d71ceed7e2a8a20c42a286e97968c7015e /movement/watch_faces
parent8dbbe92a9bad950219c4bc1a46871f44dda5fef3 (diff)
downloadSensor-Watch-93624f0b692648eac415a3df5689de6dee06c2db.tar.gz
Sensor-Watch-93624f0b692648eac415a3df5689de6dee06c2db.tar.bz2
Sensor-Watch-93624f0b692648eac415a3df5689de6dee06c2db.zip
add timeout event to give faces a chance to resign
Diffstat (limited to 'movement/watch_faces')
-rw-r--r--movement/watch_faces/clock/simple_clock_face.c2
-rw-r--r--movement/watch_faces/complications/pulsometer_face.c4
-rw-r--r--movement/watch_faces/settings/preferences_face.c4
-rw-r--r--movement/watch_faces/settings/set_time_face.c3
4 files changed, 10 insertions, 3 deletions
diff --git a/movement/watch_faces/clock/simple_clock_face.c b/movement/watch_faces/clock/simple_clock_face.c
index 351c7ebc..95db3901 100644
--- a/movement/watch_faces/clock/simple_clock_face.c
+++ b/movement/watch_faces/clock/simple_clock_face.c
@@ -18,7 +18,6 @@ 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) {
- printf("simple_clock_face_loop\n");
const char weekdays[7][3] = {"SA", "SU", "MO", "TU", "WE", "TH", "FR"};
char buf[11];
uint8_t pos;
@@ -28,6 +27,7 @@ bool simple_clock_face_loop(movement_event_t event, movement_settings_t *setting
switch (event.event_type) {
case EVENT_ACTIVATE:
case EVENT_TICK:
+ case EVENT_TIMEOUT:
case EVENT_LOW_ENERGY_UPDATE:
date_time = watch_rtc_get_date_time();
previous_date_time = *((uint32_t *)context);
diff --git a/movement/watch_faces/complications/pulsometer_face.c b/movement/watch_faces/complications/pulsometer_face.c
index db5c5d0e..e54b4551 100644
--- a/movement/watch_faces/complications/pulsometer_face.c
+++ b/movement/watch_faces/complications/pulsometer_face.c
@@ -17,7 +17,6 @@ void pulsometer_face_activate(movement_settings_t *settings, void *context) {
}
bool pulsometer_face_loop(movement_event_t event, movement_settings_t *settings, void *context) {
- printf("pulsometer_face_loop\n");
(void) settings;
pulsometer_state_t *pulsometer_state = (pulsometer_state_t *)context;
char buf[14];
@@ -74,6 +73,9 @@ bool pulsometer_face_loop(movement_event_t event, movement_settings_t *settings,
pulsometer_state->measuring = false;
movement_request_tick_frequency(1);
break;
+ case EVENT_TIMEOUT:
+ movement_move_to_face(0);
+ break;
default:
break;
}
diff --git a/movement/watch_faces/settings/preferences_face.c b/movement/watch_faces/settings/preferences_face.c
index c3b7663c..98a2372d 100644
--- a/movement/watch_faces/settings/preferences_face.c
+++ b/movement/watch_faces/settings/preferences_face.c
@@ -17,7 +17,6 @@ void preferences_face_activate(movement_settings_t *settings, void *context) {
}
bool preferences_face_loop(movement_event_t event, movement_settings_t *settings, void *context) {
- printf("preferences_face_loop\n");
uint8_t current_page = *((uint8_t *)context);
switch (event.event_type) {
case EVENT_MODE_BUTTON_UP:
@@ -47,6 +46,9 @@ bool preferences_face_loop(movement_event_t event, movement_settings_t *settings
break;
}
break;
+ case EVENT_TIMEOUT:
+ movement_move_to_face(0);
+ break;
default:
break;
}
diff --git a/movement/watch_faces/settings/set_time_face.c b/movement/watch_faces/settings/set_time_face.c
index 7bb63d0b..6b82c68b 100644
--- a/movement/watch_faces/settings/set_time_face.c
+++ b/movement/watch_faces/settings/set_time_face.c
@@ -58,6 +58,9 @@ bool set_time_face_loop(movement_event_t event, movement_settings_t *settings, v
}
watch_rtc_set_date_time(date_time);
break;
+ case EVENT_TIMEOUT:
+ movement_move_to_face(0);
+ break;
default:
break;
}