noisymime
/
Arduino_STM32
mirror of https://github.com/noisymime/Arduino_STM32.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'KenWillmott-master'

This commit is contained in:
Roger Clark 2018-04-13 16:21:25 +10:00
parent 1f85ecb3b9 b1a4fda793
commit 083e98801d
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
STM32F1/libraries/RTClock/src/utility/rtc_util.c
View File

@ -168,8 +168,10 @@ uint32 rtc_get_count() {
rtc_clear_sync();
rtc_wait_sync();
rtc_wait_finished();
h = RTC->regs->CNTH & 0xffff;
l = RTC->regs->CNTL & 0xffff;
do {
h = RTC->regs->CNTH & 0xffff;
l = RTC->regs->CNTL & 0xffff;
} while (h != (RTC->regs->CNTH & 0xffff));
return (h << 16) | l;
}
@ -182,10 +184,8 @@ void rtc_set_count(uint32 value) {
rtc_wait_sync();
rtc_wait_finished();
rtc_enter_config_mode();
do {
h = RTC->regs->CNTH & 0xffff;
l = RTC->regs->CNTL & 0xffff;
} while (h ^ (RTC->regs->CNTH & 0xffff));
RTC->regs->CNTH = (value >> 16) & 0xffff;
RTC->regs->CNTL = value & 0xffff;
rtc_exit_config_mode();
rtc_wait_finished();
}
@ -216,7 +216,7 @@ uint32 rtc_get_divider() {
do {
h = RTC->regs->DIVH & 0x000f;
l = RTC->regs->DIVL & 0xffff;
} while (h ^ (RTC->regs->DIVH & 0x000f));
} while (h != (RTC->regs->DIVH & 0x000f));
return (h << 16) | l;
}