mirror of
https://github.com/arduino/Arduino.git
synced 2024-12-13 23:48:46 +01:00
2e7b645571
Fixes #1736
103 lines
2.9 KiB
C
103 lines
2.9 KiB
C
/*
|
|
Copyright (c) 2011 Arduino. All right reserved.
|
|
|
|
This library is free software; you can redistribute it and/or
|
|
modify it under the terms of the GNU Lesser General Public
|
|
License as published by the Free Software Foundation; either
|
|
version 2.1 of the License, or (at your option) any later version.
|
|
|
|
This library is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
|
|
See the GNU Lesser General Public License for more details.
|
|
|
|
You should have received a copy of the GNU Lesser General Public
|
|
License along with this library; if not, write to the Free Software
|
|
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
|
*/
|
|
|
|
#include "Arduino.h"
|
|
|
|
#ifdef __cplusplus
|
|
extern "C" {
|
|
#endif
|
|
|
|
uint32_t millis( void )
|
|
{
|
|
// todo: ensure no interrupts
|
|
return GetTickCount() ;
|
|
}
|
|
|
|
// Interrupt-compatible version of micros
|
|
// Theory: repeatedly take readings of SysTick counter, millis counter and SysTick interrupt pending flag.
|
|
// When it appears that millis counter and pending is stable and SysTick hasn't rolled over, use these
|
|
// values to calculate micros. If there is a pending SysTick, add one to the millis counter in the calculation.
|
|
uint32_t micros( void )
|
|
{
|
|
uint32_t ticks, ticks2;
|
|
uint32_t pend, pend2;
|
|
uint32_t count, count2;
|
|
|
|
ticks2 = SysTick->VAL;
|
|
pend2 = !!((SCB->ICSR & SCB_ICSR_PENDSTSET_Msk)||((SCB->SHCSR & SCB_SHCSR_SYSTICKACT_Msk))) ;
|
|
count2 = GetTickCount();
|
|
|
|
do {
|
|
ticks=ticks2;
|
|
pend=pend2;
|
|
count=count2;
|
|
ticks2 = SysTick->VAL;
|
|
pend2 = !!((SCB->ICSR & SCB_ICSR_PENDSTSET_Msk)||((SCB->SHCSR & SCB_SHCSR_SYSTICKACT_Msk))) ;
|
|
count2 = GetTickCount();
|
|
} while ((pend != pend2) || (count != count2) || (ticks < ticks2));
|
|
|
|
return ((count+pend) * 1000) + (((SysTick->LOAD - ticks)*(1048576/(F_CPU/1000000)))>>20) ;
|
|
// this is an optimization to turn a runtime division into two compile-time divisions and
|
|
// a runtime multiplication and shift, saving a few cycles
|
|
}
|
|
|
|
// original function:
|
|
// uint32_t micros( void )
|
|
// {
|
|
// uint32_t ticks ;
|
|
// uint32_t count ;
|
|
//
|
|
// SysTick->CTRL;
|
|
// do {
|
|
// ticks = SysTick->VAL;
|
|
// count = GetTickCount();
|
|
// } while (SysTick->CTRL & SysTick_CTRL_COUNTFLAG_Msk);
|
|
//
|
|
// return count * 1000 + (SysTick->LOAD + 1 - ticks) / (SystemCoreClock/1000000) ;
|
|
// }
|
|
|
|
|
|
void delay( uint32_t ms )
|
|
{
|
|
if (ms == 0)
|
|
return;
|
|
uint32_t start = GetTickCount();
|
|
do {
|
|
yield();
|
|
} while (GetTickCount() - start < ms);
|
|
}
|
|
|
|
#if defined ( __ICCARM__ ) /* IAR Ewarm 5.41+ */
|
|
extern signed int putchar( signed int c ) ;
|
|
/**
|
|
* \brief
|
|
*
|
|
* \param c Character to output.
|
|
*
|
|
* \return The character that was output.
|
|
*/
|
|
extern WEAK signed int putchar( signed int c )
|
|
{
|
|
return c ;
|
|
}
|
|
#endif /* __ICCARM__ */
|
|
|
|
#ifdef __cplusplus
|
|
}
|
|
#endif
|