rooty/Arduino
1
0
Fork 0
mirror of https://github.com/arduino/Arduino.git synced 2025-02-20 14:54:31 +01:00
Code Issues Releases Activity

Fixed micros()-not-monothonic bug

Browse Source
This commit is contained in:
Cristian Maglie 2012-09-21 11:50:52 +02:00
parent d994e48c55
commit 31719589b2
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
hardware/arduino/sam/cores/arduino/wiring.c
View File

@ -31,13 +31,16 @@ uint32_t millis( void )
uint32_t micros( void ) uint32_t micros( void )
{ {
uint32_t dwTicks ; uint32_t ticks ;
uint32_t count ;
__disable_irq() ; SysTick->CTRL;
dwTicks=SysTick->VAL ; do {
__enable_irq() ; ticks = SysTick->VAL;
count = GetTickCount();
} while (SysTick->CTRL & SysTick_CTRL_COUNTFLAG_Msk);
return (GetTickCount()*1000) + ((SysTick->LOAD + 1 - dwTicks)/(SystemCoreClock/1000000)) ; return count * 1000 + (SysTick->LOAD + 1 - ticks) / (SystemCoreClock/1000000) ;
} }
void delay( uint32_t dwMs ) void delay( uint32_t dwMs )