diff --git a/watch-library/shared/watch/watch_utility.c b/watch-library/shared/watch/watch_utility.c index c00791e7..51b8538c 100644 --- a/watch-library/shared/watch/watch_utility.c +++ b/watch-library/shared/watch/watch_utility.c @@ -167,7 +167,7 @@ static int __month_to_secs(int month, int is_leap) // Function adapted from `src/time/__tm_to_secs.c` of musl libc // https://musl.libc.org -uint32_t watch_utility_convert_to_unix_time(uint16_t year, uint8_t month, uint8_t day, uint8_t hour, uint8_t minute, uint8_t second, uint32_t utc_offset) { +uint32_t watch_utility_convert_to_unix_time(uint16_t year, uint8_t month, uint8_t day, uint8_t hour, uint8_t minute, uint8_t second, int32_t utc_offset) { int is_leap; // POSIX tm struct starts year at 1900 and month at 0 @@ -185,7 +185,7 @@ uint32_t watch_utility_convert_to_unix_time(uint16_t year, uint8_t month, uint8_ return timestamp; } -uint32_t watch_utility_date_time_to_unix_time(watch_date_time date_time, uint32_t utc_offset) { +uint32_t watch_utility_date_time_to_unix_time(watch_date_time date_time, int32_t utc_offset) { return watch_utility_convert_to_unix_time(date_time.unit.year + WATCH_RTC_REFERENCE_YEAR, date_time.unit.month, date_time.unit.day, date_time.unit.hour, date_time.unit.minute, date_time.unit.second, utc_offset); } @@ -195,7 +195,7 @@ uint32_t watch_utility_date_time_to_unix_time(watch_date_time date_time, uint32_ #define DAYS_PER_100Y (365*100 + 24) #define DAYS_PER_4Y (365*4 + 1) -watch_date_time watch_utility_date_time_from_unix_time(uint32_t timestamp, uint32_t utc_offset) { +watch_date_time watch_utility_date_time_from_unix_time(uint32_t timestamp, int32_t utc_offset) { watch_date_time retval; retval.reg = 0; int32_t days, secs; diff --git a/watch-library/shared/watch/watch_utility.h b/watch-library/shared/watch/watch_utility.h index 5533e196..462963e0 100644 --- a/watch-library/shared/watch/watch_utility.h +++ b/watch-library/shared/watch/watch_utility.h @@ -91,14 +91,14 @@ uint8_t is_leap(uint16_t year); * @note Implemented by Wesley Ellis (tahnok) and based on BSD-licensed code by Josh Haberman: * https://blog.reverberate.org/2020/05/12/optimizing-date-algorithms.html */ -uint32_t watch_utility_convert_to_unix_time(uint16_t year, uint8_t month, uint8_t day, uint8_t hour, uint8_t minute, uint8_t second, uint32_t utc_offset); +uint32_t watch_utility_convert_to_unix_time(uint16_t year, uint8_t month, uint8_t day, uint8_t hour, uint8_t minute, uint8_t second, int32_t utc_offset); /** @brief Returns the UNIX time (seconds since 1970) for a given watch_date_time struct. * @param date_time The watch_date_time that you wish to convert. * @param utc_offset The number of seconds that date_time is offset from UTC, or 0 if the time is UTC. * @return A UNIX timestamp for the given watch_date_time and UTC offset. */ -uint32_t watch_utility_date_time_to_unix_time(watch_date_time date_time, uint32_t utc_offset); +uint32_t watch_utility_date_time_to_unix_time(watch_date_time date_time, int32_t utc_offset); /** @brief Converts a duration in seconds to a watch_duration_t struct. * @param seconds A positive number of seconds that you wish to convert to a formatted duration. @@ -114,7 +114,7 @@ watch_duration_t watch_utility_seconds_to_duration(uint32_t seconds); * @note Adapted from MIT-licensed code from musl, Copyright © 2005-2014 Rich Felker, et al.: * https://github.com/esmil/musl/blob/1cc81f5cb0df2b66a795ff0c26d7bbc4d16e13c6/src/time/__secs_to_tm.c */ -watch_date_time watch_utility_date_time_from_unix_time(uint32_t timestamp, uint32_t utc_offset); +watch_date_time watch_utility_date_time_from_unix_time(uint32_t timestamp, int32_t utc_offset); /** @brief Converts a watch_date_time for 12-hour display. * @param date_time A pointer to the watch_date_time that you wish to convert for display. Note that this