rooty/Arduino
1
0
Fork 0
mirror of https://github.com/arduino/Arduino.git synced 2025-01-18 07:52:14 +01:00
Code Issues Releases Activity

pulseIn() now times out while measuring the pulse, not just while waiting for it to start.

Browse Source
This commit is contained in:
David A. Mellis 2010-11-22 23:33:59 -05:00
parent 012b4b0f0f
commit 4dad13532f
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
hardware/arduino/cores/arduino/wiring_pulse.c
View File

@ -55,12 +55,15 @@ unsigned long pulseIn(uint8_t pin, uint8_t state, unsigned long timeout)
return 0;
// wait for the pulse to stop
while ((*portInputRegister(port) & bit) == stateMask)
while ((*portInputRegister(port) & bit) == stateMask) {
if (numloops++ == maxloops)
return 0;
width++;
}
// convert the reading to microseconds. The loop has been determined
// to be 10 clock cycles long and have about 16 clocks between the edge
// 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.
return clockCyclesToMicroseconds(width * 10 + 16);
return clockCyclesToMicroseconds(width * 21 + 16);
}