hueso/Sensor-Watch
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Activity

Merge PR #470 - fixes world_clock2 face

Browse Source 
The new DST changes caused problems in one specific face - world_clock2.
An incorrect variable was used due to a confusing name.
It has been revised to fix the problems that were caused.

Closes #475.

Reported-by: CarpeNoctem <cryptomax@pm.me>
Fixed-by: David Volovskiy <devolov@gmail.com>
Tested-by: CarpeNoctem <cryptomax@pm.me>
Tested-on-hardware-by: CarpeNoctem <cryptomax@pm.me>
GitHub-Pull-Request: https://github.com/joeycastillo/Sensor-Watch/pull/470
GitHub-Issue: https://github.com/joeycastillo/Sensor-Watch/issues/475
This commit is contained in:
Matheus Afonso Martins Moreira
2024-09-15 20:45:33 -03:00
parent be969c4deb 1462d18376
commit 3c86a42aa8
4 changed files with 19 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
movement/watch_faces/clock/world_clock_face.c
View File

@@ -69,7 +69,7 @@ static bool world_clock_face_do_display_mode(movement_event_t event, movement_se
case EVENT_LOW_ENERGY_UPDATE:
date_time = watch_rtc_get_date_time();
timestamp = watch_utility_date_time_to_unix_time(date_time, state->tz * 60);
date_time = watch_utility_date_time_from_unix_time(timestamp, state->tz * 60);
date_time = watch_utility_date_time_from_unix_time(timestamp, state->tz_curr * 60);
previous_date_time = state->previous_date_time;
state->previous_date_time = date_time.reg;
@@ -163,6 +163,7 @@ static bool _world_clock_face_do_settings_mode(movement_event_t event, movement_
case 3:
state->settings.bit.timezone_index++;
if (state->settings.bit.timezone_index > 40) state->settings.bit.timezone_index = 0;
state->tz_curr = get_timezone_offset(state->settings.bit.timezone_index, watch_rtc_get_date_time());
break;
}
break;
@@ -177,8 +178,8 @@ static bool _world_clock_face_do_settings_mode(movement_event_t event, movement_
sprintf(buf, "%c%c %3d%02d ",
movement_valid_position_0_chars[state->settings.bit.char_0],
movement_valid_position_1_chars[state->settings.bit.char_1],
(int8_t) (state->tz / 60),
(int8_t) (state->tz % 60) * (state->tz < 0 ? -1 : 1));
(int8_t) (state->tz_curr / 60),
(int8_t) (state->tz_curr % 60) * (state->tz_curr < 0 ? -1 : 1));
watch_set_colon();
watch_clear_indicator(WATCH_INDICATOR_PM);