counter face: move beep_on to watch face state

diff --git a/movement/watch_faces/complication/counter_face.c b/movement/watch_faces/complication/counter_face.c
index 1ebcb42dacb4a5811c9f3ec12ffb662a3d177a78..69ca1f7383cca16c6da38446b062eaa84b008ba8 100644 (file)
--- a/movement/watch_faces/complication/counter_face.c
+++ b/movement/watch_faces/complication/counter_face.c
@@ -27,23 +27,23 @@
 #include "counter_face.h"
 #include "watch.h"
 
-bool beep_on = true;
-
 void counter_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(counter_state_t));
         memset(*context_ptr, 0, sizeof(counter_state_t));
+        counter_state_t *state = (counter_state_t *)*context_ptr;
+        state->beep_on = true;
     }
 }
 
 void counter_face_activate(movement_settings_t *settings, void *context) {
     (void) settings;
-    if (beep_on) {
+    counter_state_t *state = (counter_state_t *)context;
+    if (state->beep_on) {
         watch_set_indicator(WATCH_INDICATOR_SIGNAL);
     }
-    (void) context;
 }
 
 bool counter_face_loop(movement_event_t event, movement_settings_t *settings, void *context) {
@@ -59,14 +59,14 @@ bool counter_face_loop(movement_event_t event, movement_settings_t *settings, vo
                 state->counter_idx=0;//reset counter index
             }
             print_counter(state);
-            if (beep_on) {
+            if (state->beep_on) {
                 beep_counter(state);
             }
             break;
         case EVENT_LIGHT_LONG_PRESS:
             watch_buzzer_abort_sequence();
-            beep_on = !beep_on;
-            if (beep_on) {
+            state->beep_on = !state->beep_on;
+            if (state->beep_on) {
                 watch_set_indicator(WATCH_INDICATOR_SIGNAL);
             } else {
                 watch_clear_indicator(WATCH_INDICATOR_SIGNAL);

diff --git a/movement/watch_faces/complication/counter_face.h b/movement/watch_faces/complication/counter_face.h
index 430f5a8e1230896991baf07c657d4c815e74a6c5..85f203e959950d51eb454efd9b9517e08aa9e1a8 100644 (file)
--- a/movement/watch_faces/complication/counter_face.h
+++ b/movement/watch_faces/complication/counter_face.h
@@ -30,6 +30,7 @@
 // Counter face is designed to count the number of running laps during excercises.
 typedef struct {
     uint8_t counter_idx;
+    bool beep_on;
 } counter_state_t;