From 7374108bd434a7421939977b83e3d9d7de3e5c7a Mon Sep 17 00:00:00 2001 From: Ken Willmott Date: Tue, 10 Apr 2018 10:37:26 -0400 Subject: [PATCH] fix PR#487 and #488 --- STM32F1/libraries/RTClock/src/utility/rtc_util.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/STM32F1/libraries/RTClock/src/utility/rtc_util.c b/STM32F1/libraries/RTClock/src/utility/rtc_util.c index 3a49e42..3d7a262 100644 --- a/STM32F1/libraries/RTClock/src/utility/rtc_util.c +++ b/STM32F1/libraries/RTClock/src/utility/rtc_util.c @@ -169,8 +169,8 @@ uint32 rtc_get_count() { rtc_wait_sync(); rtc_wait_finished(); do { - h = RTC->regs->CNTH & 0xffff; - l = RTC->regs->CNTL & 0xffff; + h = RTC->regs->CNTH & 0xffff; + l = RTC->regs->CNTL & 0xffff; } while (h != (RTC->regs->CNTH & 0xffff)); return (h << 16) | l; } @@ -184,8 +184,8 @@ void rtc_set_count(uint32 value) { rtc_wait_sync(); rtc_wait_finished(); rtc_enter_config_mode(); - h = RTC->regs->CNTH & 0xffff; - l = RTC->regs->CNTL & 0xffff; + RTC->regs->CNTH = (value >> 16) & 0xffff; + RTC->regs->CNTL = value & 0xffff; rtc_exit_config_mode(); rtc_wait_finished(); }