movement: reset tick to 1 Hz between watch faces (fixes #36)

10 files changed, 4 insertions, 13 deletions

diff --git a/movement/watch_faces/clock/world_clock_face.c b/movement/watch_faces/clock/world_clock_face.c
index afde8cf7..6910eca0 100644
--- a/movement/watch_faces/clock/world_clock_face.c
+++ b/movement/watch_faces/clock/world_clock_face.c
@@ -208,5 +208,4 @@ bool world_clock_face_loop(movement_event_t event, movement_settings_t *settings
 void world_clock_face_resign(movement_settings_t *settings, void *context) {
     (void) settings;
     (void) context;
-    movement_request_tick_frequency(1);
 }
diff --git a/movement/watch_faces/complications/beats_face.c b/movement/watch_faces/complications/beats_face.c
index b4c76db1..d1466b33 100644
--- a/movement/watch_faces/complications/beats_face.c
+++ b/movement/watch_faces/complications/beats_face.c
@@ -76,7 +76,6 @@ bool beats_face_loop(movement_event_t event, movement_settings_t *settings, void
 void beats_face_resign(movement_settings_t *settings, void *context) {
     (void) settings;
     (void) context;
-    movement_request_tick_frequency(1);
 }
 
 uint32_t clock2beats(uint32_t hours, uint32_t minutes, uint32_t seconds, uint32_t subseconds, int16_t utc_offset) {
diff --git a/movement/watch_faces/complications/countdown_face.c b/movement/watch_faces/complications/countdown_face.c
index 99eb1243..3dcc08c2 100644
--- a/movement/watch_faces/complications/countdown_face.c
+++ b/movement/watch_faces/complications/countdown_face.c
@@ -219,6 +219,8 @@ bool countdown_face_loop(movement_event_t event, movement_settings_t *settings,
 
 void countdown_face_resign(movement_settings_t *settings, void *context) {
     (void) settings;
-    (void) context;
-    movement_request_tick_frequency(1);
+    countdown_state_t *state = (countdown_state_t *)context;
+    if (state->mode == cd_setting) {
+        state->mode = cd_waiting;
+    }
 }
diff --git a/movement/watch_faces/complications/day_one_face.c b/movement/watch_faces/complications/day_one_face.c
index 4fa14a7f..18d02d4d 100644
--- a/movement/watch_faces/complications/day_one_face.c
+++ b/movement/watch_faces/complications/day_one_face.c
@@ -187,8 +187,6 @@ void day_one_face_resign(movement_settings_t *settings, void *context) {
     (void) settings;
     day_one_state_t *state = (day_one_state_t *)context;
 
-    movement_request_tick_frequency(1);
-
     // if the user changed their birth date, store it to the birth date register
     if (state->birthday_changed) {
         day_one_state_t *state = (day_one_state_t *)context;
diff --git a/movement/watch_faces/complications/pulsometer_face.c b/movement/watch_faces/complications/pulsometer_face.c
index 145b3cfe..28ca1a50 100644
--- a/movement/watch_faces/complications/pulsometer_face.c
+++ b/movement/watch_faces/complications/pulsometer_face.c
@@ -111,5 +111,4 @@ bool pulsometer_face_loop(movement_event_t event, movement_settings_t *settings,
 void pulsometer_face_resign(movement_settings_t *settings, void *context) {
     (void) settings;
     (void) context;
-    movement_request_tick_frequency(1);
 }
diff --git a/movement/watch_faces/complications/sunrise_sunset_face.c b/movement/watch_faces/complications/sunrise_sunset_face.c
index bb7323ec..ceca3515 100644
--- a/movement/watch_faces/complications/sunrise_sunset_face.c
+++ b/movement/watch_faces/complications/sunrise_sunset_face.c
@@ -144,6 +144,4 @@ bool sunrise_sunset_face_loop(movement_event_t event, movement_settings_t *setti
 void sunrise_sunset_face_resign(movement_settings_t *settings, void *context) {
     (void) settings;
     (void) context;
-
-    movement_request_tick_frequency(1);
 }
diff --git a/movement/watch_faces/demos/character_set_face.c b/movement/watch_faces/demos/character_set_face.c
index 7c2740e1..6aa42083 100644
--- a/movement/watch_faces/demos/character_set_face.c
+++ b/movement/watch_faces/demos/character_set_face.c
@@ -72,5 +72,4 @@ bool character_set_face_loop(movement_event_t event, movement_settings_t *settin
 void character_set_face_resign(movement_settings_t *settings, void *context) {
     (void) settings;
     (void) context;
-    movement_request_tick_frequency(1);
 }
diff --git a/movement/watch_faces/demos/demo_face.c b/movement/watch_faces/demos/demo_face.c
index dc2269b7..c9a929a1 100644
--- a/movement/watch_faces/demos/demo_face.c
+++ b/movement/watch_faces/demos/demo_face.c
@@ -138,5 +138,4 @@ bool demo_face_loop(movement_event_t event, movement_settings_t *settings, void
 void demo_face_resign(movement_settings_t *settings, void *context) {
     (void) settings;
     (void) context;
-    movement_request_tick_frequency(1);
 }
diff --git a/movement/watch_faces/settings/preferences_face.c b/movement/watch_faces/settings/preferences_face.c
index 725be01e..790c9de5 100644
--- a/movement/watch_faces/settings/preferences_face.c
+++ b/movement/watch_faces/settings/preferences_face.c
@@ -189,6 +189,5 @@ void preferences_face_resign(movement_settings_t *settings, void *context) {
     (void) settings;
     (void) context;
     watch_set_led_off();
-    movement_request_tick_frequency(1);
     watch_store_backup_data(settings->reg, 0);
 }
diff --git a/movement/watch_faces/settings/set_time_face.c b/movement/watch_faces/settings/set_time_face.c
index ad59843d..f0e7dc6c 100644
--- a/movement/watch_faces/settings/set_time_face.c
+++ b/movement/watch_faces/settings/set_time_face.c
@@ -147,6 +147,5 @@ void set_time_face_resign(movement_settings_t *settings, void *context) {
     (void) settings;
     (void) context;
     watch_set_led_off();
-    movement_request_tick_frequency(1);
     watch_store_backup_data(settings->reg, 0);
 }