summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoey Castillo <joeycastillo@utexas.edu>2021-12-01 11:30:19 -0500
committerJoey Castillo <joeycastillo@utexas.edu>2021-12-01 11:30:19 -0500
commit2504a922a369c8487b18b9d5f09aad9e9743e8b9 (patch)
tree0a8b262fb30509d42a46978b0c7bb449c27416eb
parent0f89c11eba9b0312b0d2fa06f8a73395cfb66973 (diff)
downloadSensor-Watch-2504a922a369c8487b18b9d5f09aad9e9743e8b9.tar.gz
Sensor-Watch-2504a922a369c8487b18b9d5f09aad9e9743e8b9.tar.bz2
Sensor-Watch-2504a922a369c8487b18b9d5f09aad9e9743e8b9.zip
movement: help beats face update the screen less often
-rw-r--r--movement/watch_faces/complications/beats_face.c19
-rw-r--r--movement/watch_faces/complications/beats_face.h5
2 files changed, 22 insertions, 2 deletions
diff --git a/movement/watch_faces/complications/beats_face.c b/movement/watch_faces/complications/beats_face.c
index 9241bf73..519d3e4e 100644
--- a/movement/watch_faces/complications/beats_face.c
+++ b/movement/watch_faces/complications/beats_face.c
@@ -8,17 +8,25 @@ const uint8_t BEAT_REFRESH_FREQUENCY = 8;
void beats_face_setup(movement_settings_t *settings, void ** context_ptr) {
(void) settings;
(void) context_ptr;
+ if (*context_ptr == NULL) {
+ *context_ptr = malloc(sizeof(beats_face_state_t));
+ }
}
void beats_face_activate(movement_settings_t *settings, void *context) {
(void) settings;
- (void) context;
+ beats_face_state_t *state = (beats_face_state_t *)context;
+ state->next_subsecond_update = 0;
+ state->last_centibeat_displayed = 0;
movement_request_tick_frequency(BEAT_REFRESH_FREQUENCY);
}
bool beats_face_loop(movement_event_t event, movement_settings_t *settings, void *context) {
(void) settings;
- (void) context;
+ beats_face_state_t *state = (beats_face_state_t *)context;
+ if (event.event_type == EVENT_TICK && event.subsecond != state->next_subsecond_update) {
+ return true; // math is hard, don't do it if we don't have to.
+ }
char buf[16];
uint32_t centibeats;
@@ -29,6 +37,13 @@ bool beats_face_loop(movement_event_t event, movement_settings_t *settings, void
case EVENT_TICK:
date_time = watch_rtc_get_date_time();
centibeats = clock2beats(date_time.unit.hour, date_time.unit.minute, date_time.unit.second, event.subsecond, movement_timezone_offsets[settings->bit.time_zone]);
+ if (centibeats == state->last_centibeat_displayed) {
+ // we missed this update, try again next subsecond
+ state->next_subsecond_update = (event.subsecond + 1) % BEAT_REFRESH_FREQUENCY;
+ } else {
+ state->next_subsecond_update = (event.subsecond + 1 + (BEAT_REFRESH_FREQUENCY * 2 / 3)) % BEAT_REFRESH_FREQUENCY;
+ state->last_centibeat_displayed = centibeats;
+ }
sprintf(buf, "bt %6ld", centibeats);
watch_display_string(buf, 0);
diff --git a/movement/watch_faces/complications/beats_face.h b/movement/watch_faces/complications/beats_face.h
index 343e9a27..bbe2396c 100644
--- a/movement/watch_faces/complications/beats_face.h
+++ b/movement/watch_faces/complications/beats_face.h
@@ -3,6 +3,11 @@
#include "movement.h"
+typedef struct {
+ int8_t next_subsecond_update;
+ uint32_t last_centibeat_displayed;
+} beats_face_state_t;
+
uint32_t clock2beats(uint32_t hours, uint32_t minutes, uint32_t seconds, uint32_t subseconds, int16_t utc_offset);
void beats_face_setup(movement_settings_t *settings, void ** context_ptr);
void beats_face_activate(movement_settings_t *settings, void *context);