From 379a795ad3975d7fd922af5a72991ef5ff716ba3 Mon Sep 17 00:00:00 2001
From: joeycastillo <joeycastillo@utexas.edu>
Date: Sun, 29 Sep 2024 08:53:39 -0400
Subject: [PATCH] refactor LE and TO intervals to function calls

---
 movement.c                                       | 16 ++++++++++++++++
 movement.h                                       |  6 ++++++
 movement/watch_faces/demo/demo_face.c            |  2 +-
 .../sensor/accel_interrupt_count_face.c          |  2 +-
 .../watch_faces/sensor/thermistor_testing_face.c |  2 +-
 watch-faces/settings/preferences_face.c          |  8 ++++----
 6 files changed, 29 insertions(+), 7 deletions(-)

diff --git a/movement.c b/movement.c
index fdc28d3c..25ae9303 100644
--- a/movement.c
+++ b/movement.c
@@ -353,6 +353,22 @@ void movement_set_use_imperial_units(bool value) {
     movement_state.settings.bit.use_imperial_units = value;
 }
 
+uint8_t movement_get_fast_tick_timeout(void) {
+    return movement_state.settings.bit.to_interval;
+}
+
+void movement_set_fast_tick_timeout(uint8_t value) {
+    movement_state.settings.bit.to_interval = value;
+}
+
+uint8_t movement_get_low_energy_timeout(void) {
+    return movement_state.settings.bit.le_interval;
+}
+
+void movement_set_low_energy_timeout(uint8_t value) {
+    movement_state.settings.bit.le_interval = value;
+}
+
 movement_color_t movement_backlight_color(void) {
     return (movement_color_t) {
         .red = movement_state.settings.bit.led_red_color,
diff --git a/movement.h b/movement.h
index 20c4cf38..f56f90b9 100644
--- a/movement.h
+++ b/movement.h
@@ -340,6 +340,12 @@ void movement_set_clock_mode_24h(movement_clock_mode_t value);
 bool movement_use_imperial_units(void);
 void movement_set_use_imperial_units(bool value);
 
+uint8_t movement_get_fast_tick_timeout(void);
+void movement_set_fast_tick_timeout(uint8_t value);
+
+uint8_t movement_get_low_energy_timeout(void);
+void movement_set_low_energy_timeout(uint8_t value);
+
 movement_color_t movement_backlight_color(void);
 void movement_set_backlight_color(movement_color_t color);
 
diff --git a/movement/watch_faces/demo/demo_face.c b/movement/watch_faces/demo/demo_face.c
index 7026d3ac..2f4d0b93 100644
--- a/movement/watch_faces/demo/demo_face.c
+++ b/movement/watch_faces/demo/demo_face.c
@@ -57,7 +57,7 @@ void demo_face_activate(movement_settings_t *settings, void *context) {
     (void) context;
     movement_request_tick_frequency(0);
     // ensure the watch never enters low energy mode
-    settings->bit.le_interval = 0;
+    movement_set_low_energy_timeout(0);
     settings->bit.led_duration = 3;
 }
 
diff --git a/movement/watch_faces/sensor/accel_interrupt_count_face.c b/movement/watch_faces/sensor/accel_interrupt_count_face.c
index 6473988a..b0eb28d5 100644
--- a/movement/watch_faces/sensor/accel_interrupt_count_face.c
+++ b/movement/watch_faces/sensor/accel_interrupt_count_face.c
@@ -82,7 +82,7 @@ void accel_interrupt_count_face_activate(movement_settings_t *settings, void *co
     state->is_setting = false;
 
     // force LE interval to never sleep
-    settings->bit.le_interval = 0;
+    movement_set_low_energy_timeout(0);
 }
 
 bool accel_interrupt_count_face_loop(movement_event_t event, movement_settings_t *settings, void *context) {
diff --git a/movement/watch_faces/sensor/thermistor_testing_face.c b/movement/watch_faces/sensor/thermistor_testing_face.c
index ca6cebf1..26b8e001 100644
--- a/movement/watch_faces/sensor/thermistor_testing_face.c
+++ b/movement/watch_faces/sensor/thermistor_testing_face.c
@@ -46,7 +46,7 @@ void thermistor_testing_face_setup(movement_settings_t *settings, uint8_t watch_
     (void) context_ptr;
     // force one setting: never enter low energy mode.
     // I'm using this watch face to test the temperature sensor boards; there's no need for it.
-    settings->bit.le_interval = 0;
+    movement_set_low_energy_timeout(0);
 }
 
 void thermistor_testing_face_activate(movement_settings_t *settings, void *context) {
diff --git a/watch-faces/settings/preferences_face.c b/watch-faces/settings/preferences_face.c
index 1eaf4b73..db5bbac5 100644
--- a/watch-faces/settings/preferences_face.c
+++ b/watch-faces/settings/preferences_face.c
@@ -96,7 +96,7 @@ bool preferences_face_loop(movement_event_t event, movement_settings_t *settings
                         }
                         break;
                     case PREFERENCES_PAGE_TIMEOUT:
-                        switch (settings->bit.to_interval) {
+                        switch (movement_get_fast_tick_timeout()) {
                             case 0:
                                 watch_display_text(WATCH_POSITION_BOTTOM, "60 SeC");
                                 break;
@@ -112,7 +112,7 @@ bool preferences_face_loop(movement_event_t event, movement_settings_t *settings
                         }
                         break;
                     case PREFERENCES_PAGE_LOW_ENERGY:
-                        switch (settings->bit.le_interval) {
+                        switch (movement_get_low_energy_timeout()) {
                             case 0:
                                 watch_display_text(WATCH_POSITION_BOTTOM, " Never");
                                 break;
@@ -189,10 +189,10 @@ bool preferences_face_loop(movement_event_t event, movement_settings_t *settings
                     movement_set_button_should_sound(!movement_button_should_sound());
                     break;
                 case PREFERENCES_PAGE_TIMEOUT:
-                    settings->bit.to_interval = settings->bit.to_interval + 1;
+                    movement_set_fast_tick_timeout((movement_get_fast_tick_timeout() + 1));
                     break;
                 case PREFERENCES_PAGE_LOW_ENERGY:
-                    settings->bit.le_interval = settings->bit.le_interval + 1;
+                    movement_set_low_energy_timeout((movement_get_low_energy_timeout() + 1));
                     break;
                 case PREFERENCES_PAGE_LED_DURATION:
                     settings->bit.led_duration = settings->bit.led_duration + 1;