mirror of https://github.com/noisymime/Arduino.git
Revert "Temporary fix for pulseIn() regression."
This reverts commit 8ddc5198f6
.
To be substituted by ASM generated code
This commit is contained in:
parent
5933a7e8d3
commit
0c9f0d50a5
|
@ -61,25 +61,9 @@ unsigned long pulseIn(uint8_t pin, uint8_t state, unsigned long timeout)
|
||||||
width++;
|
width++;
|
||||||
}
|
}
|
||||||
|
|
||||||
// convert the reading to microseconds. There will be some error introduced by
|
// convert the reading to microseconds. The loop has been determined
|
||||||
|
// to be 20 clock cycles long and have about 16 clocks between the edge
|
||||||
|
// and the start of the loop. There will be some error introduced by
|
||||||
// the interrupt handlers.
|
// the interrupt handlers.
|
||||||
|
|
||||||
// Conversion constants are compiler-dependent, different compiler versions
|
|
||||||
// have different levels of optimization.
|
|
||||||
#if __GNUC__==4 && __GNUC_MINOR__==3 && __GNUC_PATCHLEVEL__==2
|
|
||||||
// avr-gcc 4.3.2
|
|
||||||
return clockCyclesToMicroseconds(width * 21 + 16);
|
return clockCyclesToMicroseconds(width * 21 + 16);
|
||||||
#elif __GNUC__==4 && __GNUC_MINOR__==8 && __GNUC_PATCHLEVEL__==1
|
|
||||||
// avr-gcc 4.8.1
|
|
||||||
return clockCyclesToMicroseconds(width * 24 + 16);
|
|
||||||
#elif __GNUC__<=4 && __GNUC_MINOR__<=3
|
|
||||||
// avr-gcc <=4.3.x
|
|
||||||
#warning "pulseIn() results may not be accurate"
|
|
||||||
return clockCyclesToMicroseconds(width * 21 + 16);
|
|
||||||
#else
|
|
||||||
// avr-gcc >4.3.x
|
|
||||||
#warning "pulseIn() results may not be accurate"
|
|
||||||
return clockCyclesToMicroseconds(width * 24 + 16);
|
|
||||||
#endif
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue