From 444b911e9042e45e3c3ff051d0f4bd80b1a2b874 Mon Sep 17 00:00:00 2001
From: joeycastillo <joeycastillo@utexas.edu>
Date: Sun, 27 Nov 2022 17:02:30 -0600
Subject: fix sunrise/sunset in last 30 seconds of the hour
---
movement/watch_faces/complication/sunrise_sunset_face.c | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
(limited to 'movement')
diff --git a/movement/watch_faces/complication/sunrise_sunset_face.c b/movement/watch_faces/complication/sunrise_sunset_face.c
index 8dea812e..72424bd0 100644
--- a/movement/watch_faces/complication/sunrise_sunset_face.c
+++ b/movement/watch_faces/complication/sunrise_sunset_face.c
@@ -93,8 +93,16 @@ static void _sunrise_sunset_face_update(movement_settings_t *settings, sunrise_s
minutes = 60.0 * fmod(rise, 1);
seconds = 60.0 * fmod(minutes, 1);
scratch_time.unit.hour = floor(rise);
- if (seconds < 30) scratch_time.unit.minute = floor(minutes);
- else scratch_time.unit.minute = ceil(minutes);
+ if (seconds < 30) {
+ scratch_time.unit.minute = floor(minutes);
+ }
+ else {
+ scratch_time.unit.minute = ceil(minutes);
+ if (scratch_time.unit.minute == 60) {
+ scratch_time.unit.minute = 0;
+ scratch_time.unit.hour = (scratch_time.unit.hour + 1) % 24;
+ }
+ }
if (date_time.reg < scratch_time.reg) _sunrise_sunset_set_expiration(state, scratch_time);
--
cgit v1.2.3