mirror/second-movement
3
0
Fork 0
mirror of https://github.com/joeycastillo/second-movement.git synced 2025-10-29 19:47:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #25 from berdan/latlong-fix-sunrise_sunset_face

Browse Source 
Fix longitude corruption bug in sunrise/sunset face
This commit is contained in:
Joey Castillo 2025-06-30 19:41:38 -04:00 committed by GitHub
commit 49c31317c8
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 32 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
watch-faces/complication/sunrise_sunset_face.c
View File

@ -127,6 +127,15 @@ static void _sunrise_sunset_face_update(sunrise_sunset_state_t *state) {
if (seconds < 30) scratch_time.unit.minute = floor(minutes); if (seconds < 30) scratch_time.unit.minute = floor(minutes);
else scratch_time.unit.minute = ceil(minutes); else scratch_time.unit.minute = ceil(minutes);
// Handle hour overflow from timezone conversion
while (scratch_time.unit.hour >= 24) {
scratch_time.unit.hour -= 24;
// Increment day (this will be handled by the date arithmetic)
uint32_t timestamp = watch_utility_date_time_to_unix_time(scratch_time, 0);
timestamp += 86400;
scratch_time = watch_utility_date_time_from_unix_time(timestamp, 0);
}
if (scratch_time.unit.minute == 60) { if (scratch_time.unit.minute == 60) {
scratch_time.unit.minute = 0; scratch_time.unit.minute = 0;
scratch_time.unit.hour = (scratch_time.unit.hour + 1) % 24; scratch_time.unit.hour = (scratch_time.unit.hour + 1) % 24;
@ -157,6 +166,15 @@ static void _sunrise_sunset_face_update(sunrise_sunset_state_t *state) {
if (seconds < 30) scratch_time.unit.minute = floor(minutes); if (seconds < 30) scratch_time.unit.minute = floor(minutes);
else scratch_time.unit.minute = ceil(minutes); else scratch_time.unit.minute = ceil(minutes);
// Handle hour overflow from timezone conversion
while (scratch_time.unit.hour >= 24) {
scratch_time.unit.hour -= 24;
// Increment day (this will be handled by the date arithmetic)
uint32_t timestamp = watch_utility_date_time_to_unix_time(scratch_time, 0);
timestamp += 86400;
scratch_time = watch_utility_date_time_from_unix_time(timestamp, 0);
}
if (scratch_time.unit.minute == 60) { if (scratch_time.unit.minute == 60) {
scratch_time.unit.minute = 0; scratch_time.unit.minute = 0;
scratch_time.unit.hour = (scratch_time.unit.hour + 1) % 24; scratch_time.unit.hour = (scratch_time.unit.hour + 1) % 24;
@ -239,6 +257,7 @@ static void _sunrise_sunset_face_update_settings_display(movement_event_t event,
case 0: case 0:
return; return;
case 1: case 1:
// Latitude
watch_display_text_with_fallback(WATCH_POSITION_TOP_LEFT, "LAT", "LA"); watch_display_text_with_fallback(WATCH_POSITION_TOP_LEFT, "LAT", "LA");
if (watch_get_lcd_type() == WATCH_LCD_TYPE_CUSTOM) { if (watch_get_lcd_type() == WATCH_LCD_TYPE_CUSTOM) {
watch_set_decimal_if_available(); watch_set_decimal_if_available();
@ -262,12 +281,13 @@ static void _sunrise_sunset_face_update_settings_display(movement_event_t event,
} }
break; break;
case 2: case 2:
// Longitude
watch_display_text_with_fallback(WATCH_POSITION_TOP_LEFT, "LON", "LO"); watch_display_text_with_fallback(WATCH_POSITION_TOP_LEFT, "LON", "LO");
if (watch_get_lcd_type() == WATCH_LCD_TYPE_CUSTOM) { if (watch_get_lcd_type() == WATCH_LCD_TYPE_CUSTOM) {
watch_set_decimal_if_available(); watch_set_decimal_if_available();
// Handle leading 1 for longitudes >99 // Handle leading 1 for longitudes >99
if (state->working_longitude.tens > 9) watch_set_pixel(0, 22); if (state->working_longitude.hundreds == 1) watch_set_pixel(0, 22);
watch_display_character('0' + state->working_longitude.tens % 10, 4); watch_display_character('0' + state->working_longitude.tens, 4);
watch_display_character('0' + state->working_longitude.ones, 5); watch_display_character('0' + state->working_longitude.ones, 5);
watch_display_character('0' + state->working_longitude.tenths, 6); watch_display_character('0' + state->working_longitude.tenths, 6);
watch_display_character('0' + state->working_longitude.hundredths, 7); watch_display_character('0' + state->working_longitude.hundredths, 7);
@ -326,8 +346,17 @@ static void _sunrise_sunset_face_advance_digit(sunrise_sunset_state_t *state) {
case 2: // longitude case 2: // longitude
switch (state->active_digit) { switch (state->active_digit) {
case 0: case 0:
state->working_longitude.tens = (state->working_longitude.tens + 1) % 18; // Increase tens and handle carry-over to hundreds
state->working_longitude.tens++;
if (state->working_longitude.tens >= 10) {
state->working_longitude.tens = 0;
state->working_longitude.hundreds++;
}
// Reset if we've gone over ±180
if (abs(_sunrise_sunset_face_latlon_from_struct(state->working_longitude)) > 18000) { if (abs(_sunrise_sunset_face_latlon_from_struct(state->working_longitude)) > 18000) {
state->working_longitude.hundreds = 0;
state->working_longitude.tens = 0;
state->working_longitude.ones = 0; state->working_longitude.ones = 0;
state->working_longitude.tenths = 0; state->working_longitude.tenths = 0;
state->working_longitude.hundredths = 0; state->working_longitude.hundredths = 0;
@ -448,7 +477,6 @@ void sunrise_sunset_face_activate(void *context) {
} }
#endif #endif
sunrise_sunset_state_t *state = (sunrise_sunset_state_t *)context; sunrise_sunset_state_t *state = (sunrise_sunset_state_t *)context;
movement_location_t movement_location = load_location_from_filesystem(); movement_location_t movement_location = load_location_from_filesystem();
state->working_latitude = _sunrise_sunset_face_struct_from_latlon(movement_location.bit.latitude); state->working_latitude = _sunrise_sunset_face_struct_from_latlon(movement_location.bit.latitude);