movement internal time is now UTC
This commit is contained in:
@@ -57,7 +57,7 @@ bool beats_face_loop(movement_event_t event, void *context) {
|
||||
switch (event.event_type) {
|
||||
case EVENT_ACTIVATE:
|
||||
case EVENT_TICK:
|
||||
date_time = watch_rtc_get_date_time();
|
||||
date_time = movement_get_local_date_time();
|
||||
centibeats = clock2beats(date_time.unit.hour, date_time.unit.minute, date_time.unit.second, event.subsecond, movement_get_current_timezone_offset());
|
||||
if (centibeats == state->last_centibeat_displayed) {
|
||||
// we missed this update, try again next subsecond
|
||||
@@ -73,7 +73,7 @@ bool beats_face_loop(movement_event_t event, void *context) {
|
||||
break;
|
||||
case EVENT_LOW_ENERGY_UPDATE:
|
||||
if (!watch_sleep_animation_is_running()) watch_start_sleep_animation(432);
|
||||
date_time = watch_rtc_get_date_time();
|
||||
date_time = movement_get_local_date_time();
|
||||
centibeats = clock2beats(date_time.unit.hour, date_time.unit.minute, date_time.unit.second, event.subsecond, movement_get_current_timezone_offset());
|
||||
sprintf(buf, "%4lu ", centibeats / 100);
|
||||
|
||||
|
||||
@@ -245,11 +245,11 @@ bool clock_face_loop(movement_event_t event, void *context) {
|
||||
switch (event.event_type) {
|
||||
case EVENT_LOW_ENERGY_UPDATE:
|
||||
clock_start_tick_tock_animation();
|
||||
clock_display_low_energy(watch_rtc_get_date_time());
|
||||
clock_display_low_energy(movement_get_local_date_time());
|
||||
break;
|
||||
case EVENT_TICK:
|
||||
case EVENT_ACTIVATE:
|
||||
current = watch_rtc_get_date_time();
|
||||
current = movement_get_local_date_time();
|
||||
|
||||
clock_display_clock(state, current);
|
||||
|
||||
@@ -282,7 +282,7 @@ movement_watch_face_advisory_t clock_face_advise(void *context) {
|
||||
clock_state_t *state = (clock_state_t *) context;
|
||||
|
||||
if (state->time_signal_enabled) {
|
||||
watch_date_time date_time = watch_rtc_get_date_time();
|
||||
watch_date_time date_time = movement_get_local_date_time();
|
||||
retval.wants_background_task = date_time.unit.minute == 0;
|
||||
}
|
||||
|
||||
|
||||
@@ -42,11 +42,6 @@ void world_clock_face_setup(uint8_t watch_face_index, void ** context_ptr) {
|
||||
memset(*context_ptr, 0, sizeof(world_clock_state_t));
|
||||
world_clock_state_t *state = (world_clock_state_t *)*context_ptr;
|
||||
state->settings.bit.timezone_index = 15;
|
||||
uint8_t backup_register = movement_claim_backup_register();
|
||||
if (backup_register) {
|
||||
state->settings.reg = watch_get_backup_data(backup_register);
|
||||
state->backup_register = backup_register;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -72,8 +67,7 @@ static bool world_clock_face_do_display_mode(movement_event_t event, world_clock
|
||||
// fall through
|
||||
case EVENT_TICK:
|
||||
case EVENT_LOW_ENERGY_UPDATE:
|
||||
date_time = watch_rtc_get_date_time();
|
||||
date_time = watch_utility_date_time_convert_zone(date_time, movement_get_current_timezone_offset(), state->current_offset);
|
||||
date_time = movement_get_date_time_in_zone(state->settings.bit.timezone_index);
|
||||
previous_date_time = state->previous_date_time;
|
||||
state->previous_date_time = date_time.reg;
|
||||
if ((date_time.reg >> 6) == (previous_date_time >> 6) && event.event_type != EVENT_LOW_ENERGY_UPDATE) {
|
||||
|
||||
Reference in New Issue
Block a user