summaryrefslogtreecommitdiffstats
path: root/movement/watch_faces/clock
diff options
context:
space:
mode:
authorjoeycastillo <joeycastillo@utexas.edu>2022-12-23 18:37:13 -0600
committerjoeycastillo <joeycastillo@utexas.edu>2022-12-23 18:45:18 -0600
commita6333f7b8baee52faf6f6fc8dfb03b6204dbf005 (patch)
tree74e9edb27d0a1ffa1a27bf6d46677e6a9f757feb /movement/watch_faces/clock
parent283a21978397fe52ec7a85509bc010f586a42328 (diff)
downloadSensor-Watch-a6333f7b8baee52faf6f6fc8dfb03b6204dbf005.tar.gz
Sensor-Watch-a6333f7b8baee52faf6f6fc8dfb03b6204dbf005.tar.bz2
Sensor-Watch-a6333f7b8baee52faf6f6fc8dfb03b6204dbf005.zip
create movement_get_date_time function
Diffstat (limited to 'movement/watch_faces/clock')
-rw-r--r--movement/watch_faces/clock/beats_face.c4
-rw-r--r--movement/watch_faces/clock/mars_time_face.c2
-rw-r--r--movement/watch_faces/clock/simple_clock_face.c4
-rw-r--r--movement/watch_faces/clock/weeknumber_clock_face.c4
-rw-r--r--movement/watch_faces/clock/world_clock_face.c2
5 files changed, 8 insertions, 8 deletions
diff --git a/movement/watch_faces/clock/beats_face.c b/movement/watch_faces/clock/beats_face.c
index df31ad1c..47c7ef2c 100644
--- a/movement/watch_faces/clock/beats_face.c
+++ b/movement/watch_faces/clock/beats_face.c
@@ -36,7 +36,7 @@ bool beats_face_loop(movement_event_t event, movement_settings_t *settings, void
switch (event.event_type) {
case EVENT_ACTIVATE:
case EVENT_TICK:
- date_time = watch_rtc_get_date_time();
+ date_time = movement_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
@@ -51,7 +51,7 @@ bool beats_face_loop(movement_event_t event, movement_settings_t *settings, void
break;
case EVENT_LOW_ENERGY_UPDATE:
if (!watch_tick_animation_is_running()) watch_start_tick_animation(432);
- date_time = watch_rtc_get_date_time();
+ date_time = movement_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]);
sprintf(buf, "bt %4lu ", centibeats / 100);
diff --git a/movement/watch_faces/clock/mars_time_face.c b/movement/watch_faces/clock/mars_time_face.c
index 7753ae72..b7511bb0 100644
--- a/movement/watch_faces/clock/mars_time_face.c
+++ b/movement/watch_faces/clock/mars_time_face.c
@@ -69,7 +69,7 @@ static void _h_to_hms(mars_clock_hms_t *date_time, double h) {
static void _update(movement_settings_t *settings, mars_time_state_t *state) {
char buf[11];
- watch_date_time date_time = watch_rtc_get_date_time();
+ watch_date_time date_time = movement_get_date_time();
uint32_t now = watch_utility_date_time_to_unix_time(date_time, movement_timezone_offsets[settings->bit.time_zone] * 60);
// TODO: I'm skipping over some steps here.
// https://www.giss.nasa.gov/tools/mars24/help/algorithm.html
diff --git a/movement/watch_faces/clock/simple_clock_face.c b/movement/watch_faces/clock/simple_clock_face.c
index 7721b12a..9f9fe8bc 100644
--- a/movement/watch_faces/clock/simple_clock_face.c
+++ b/movement/watch_faces/clock/simple_clock_face.c
@@ -76,7 +76,7 @@ bool simple_clock_face_loop(movement_event_t event, movement_settings_t *setting
case EVENT_ACTIVATE:
case EVENT_TICK:
case EVENT_LOW_ENERGY_UPDATE:
- date_time = watch_rtc_get_date_time();
+ date_time = movement_get_date_time();
previous_date_time = state->previous_date_time;
state->previous_date_time = date_time.reg;
@@ -169,7 +169,7 @@ bool simple_clock_face_wants_background_task(movement_settings_t *settings, void
simple_clock_state_t *state = (simple_clock_state_t *)context;
if (!state->signal_enabled) return false;
- watch_date_time date_time = watch_rtc_get_date_time();
+ watch_date_time date_time = movement_get_date_time();
return date_time.unit.minute == 0;
}
diff --git a/movement/watch_faces/clock/weeknumber_clock_face.c b/movement/watch_faces/clock/weeknumber_clock_face.c
index e49e5abf..311a5e1d 100644
--- a/movement/watch_faces/clock/weeknumber_clock_face.c
+++ b/movement/watch_faces/clock/weeknumber_clock_face.c
@@ -76,7 +76,7 @@ bool weeknumber_clock_face_loop(movement_event_t event, movement_settings_t *set
case EVENT_ACTIVATE:
case EVENT_TICK:
case EVENT_LOW_ENERGY_UPDATE:
- date_time = watch_rtc_get_date_time();
+ date_time = movement_get_date_time();
previous_date_time = state->previous_date_time;
state->previous_date_time = date_time.reg;
@@ -165,7 +165,7 @@ bool weeknumber_clock_face_wants_background_task(movement_settings_t *settings,
weeknumber_clock_state_t *state = (weeknumber_clock_state_t *)context;
if (!state->signal_enabled) return false;
- watch_date_time date_time = watch_rtc_get_date_time();
+ watch_date_time date_time = movement_get_date_time();
return date_time.unit.minute == 0;
}
diff --git a/movement/watch_faces/clock/world_clock_face.c b/movement/watch_faces/clock/world_clock_face.c
index 4004bab2..245ca854 100644
--- a/movement/watch_faces/clock/world_clock_face.c
+++ b/movement/watch_faces/clock/world_clock_face.c
@@ -66,7 +66,7 @@ static bool world_clock_face_do_display_mode(movement_event_t event, movement_se
// fall through
case EVENT_TICK:
case EVENT_LOW_ENERGY_UPDATE:
- date_time = watch_rtc_get_date_time();
+ date_time = movement_get_date_time();
timestamp = watch_utility_date_time_to_unix_time(date_time, movement_timezone_offsets[settings->bit.time_zone] * 60);
date_time = watch_utility_date_time_from_unix_time(timestamp, movement_timezone_offsets[state->settings.bit.timezone_index] * 60);
previous_date_time = state->previous_date_time;