rooty/Arduino
1
0
Fork 0
mirror of https://github.com/arduino/Arduino.git synced 2024-11-30 11:24:12 +01:00
Code Issues Releases Activity

Fixing delay() to delay at least N milliseconds.

Browse Source 
Fixing register name in micros() for ATmega8.
This commit is contained in:
David A. Mellis 2008-12-23 00:17:14 +00:00
parent 32b1245ee9
commit 9fc613ad6f
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hardware/cores/arduino/wiring.c
View File

@ -59,8 +59,14 @@ unsigned long micros() {
cli(); cli();
t = TCNT0; t = TCNT0;
#ifdef TIFR0
if ((TIFR0 & _BV(TOV0)) && (t == 0)) if ((TIFR0 & _BV(TOV0)) && (t == 0))
t = 256; t = 256;
#else
if ((TIFR & _BV(TOV0)) && (t == 0))
t = 256;
#endif
m = timer0_overflow_count; m = timer0_overflow_count;
SREG = oldSREG; SREG = oldSREG;
@ -72,7 +78,7 @@ void delay(unsigned long ms)
{ {
unsigned long start = millis(); unsigned long start = millis();
while (millis() - start < ms) while (millis() - start <= ms)
; ;
} }