arduino/esp8266
1
0
Fork 0
mirror of https://github.com/esp8266/Arduino.git synced 2025-06-17 22:23:10 +03:00
Code Activity

[sam] Fixed wrap-around bug in delay() (Mark Tillotson)

Browse Source 
Fixes #1736
This commit is contained in:
Cristian Maglie
2013-12-14 00:31:45 +01:00
parent e2b15c852b
commit 2e7b645571
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
build/shared/revisions.txt
View File

@ -8,6 +8,9 @@ ARDUINO 1.5.6 BETA
* TFT: warning messages in PImage class and strings inside examples now stored in flash to save RAM. * TFT: warning messages in PImage class and strings inside examples now stored in flash to save RAM.
* Ethernet: added operator == for EthernetClient class (Norbert Truchsess) * Ethernet: added operator == for EthernetClient class (Norbert Truchsess)
[core]
* sam: Fixed wrap-around bug in delay() (Mark Tillotson)
ARDUINO 1.5.5 BETA 2013.11.28 ARDUINO 1.5.5 BETA 2013.11.28
NOTICE: NOTICE:

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

@ -25,7 +25,7 @@ extern "C" {
uint32_t millis( void ) uint32_t millis( void )
{ {
// todo: ensure no interrupts // todo: ensure no interrupts
return GetTickCount() ; return GetTickCount() ;
} }
// Interrupt-compatible version of micros // Interrupt-compatible version of micros
@ -74,9 +74,12 @@ uint32_t micros( void )
void delay( uint32_t ms ) void delay( uint32_t ms )
{ {
uint32_t end = GetTickCount() + ms; if (ms == 0)
while (GetTickCount() < end) return;
yield(); uint32_t start = GetTickCount();
do {
yield();
} while (GetTickCount() - start < ms);
} }
#if defined ( __ICCARM__ ) /* IAR Ewarm 5.41+ */ #if defined ( __ICCARM__ ) /* IAR Ewarm 5.41+ */