Added timeout (in microseconds) parameter to pulseIn(). Defaults to 1000000 (1 second).
This commit is contained in:
parent
f3893aba50
commit
c7cac2f165
|
@ -10,6 +10,8 @@
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
#include "HardwareSerial.h"
|
#include "HardwareSerial.h"
|
||||||
|
|
||||||
|
unsigned long pulseIn(uint8_t pin, uint8_t state, unsigned long timeout = 1000000L);
|
||||||
|
|
||||||
// WMath prototypes
|
// WMath prototypes
|
||||||
long random(long);
|
long random(long);
|
||||||
long random(long, long);
|
long random(long, long);
|
||||||
|
|
|
@ -87,6 +87,7 @@ extern "C"{
|
||||||
|
|
||||||
#define clockCyclesPerMicrosecond() ( F_CPU / 1000000L )
|
#define clockCyclesPerMicrosecond() ( F_CPU / 1000000L )
|
||||||
#define clockCyclesToMicroseconds(a) ( (a) / clockCyclesPerMicrosecond() )
|
#define clockCyclesToMicroseconds(a) ( (a) / clockCyclesPerMicrosecond() )
|
||||||
|
#define microsecondsToClockCycles(a) ( (a) * clockCyclesPerMicrosecond() )
|
||||||
|
|
||||||
typedef uint8_t boolean;
|
typedef uint8_t boolean;
|
||||||
typedef uint8_t byte;
|
typedef uint8_t byte;
|
||||||
|
@ -118,7 +119,7 @@ void printIntegerInBase(unsigned long n, unsigned long base);
|
||||||
unsigned long millis(void);
|
unsigned long millis(void);
|
||||||
void delay(unsigned long);
|
void delay(unsigned long);
|
||||||
void delayMicroseconds(unsigned int us);
|
void delayMicroseconds(unsigned int us);
|
||||||
unsigned long pulseIn(uint8_t pin, uint8_t state);
|
unsigned long pulseIn(uint8_t pin, uint8_t state, unsigned long timeout);
|
||||||
|
|
||||||
void shiftOut(uint8_t dataPin, uint8_t clockPin, uint8_t bitOrder, byte val);
|
void shiftOut(uint8_t dataPin, uint8_t clockPin, uint8_t bitOrder, byte val);
|
||||||
|
|
||||||
|
|
|
@ -26,10 +26,10 @@
|
||||||
#include "pins_arduino.h"
|
#include "pins_arduino.h"
|
||||||
|
|
||||||
/* Measures the length (in microseconds) of a pulse on the pin; state is HIGH
|
/* Measures the length (in microseconds) of a pulse on the pin; state is HIGH
|
||||||
* or LOW, the type of pulse to measure. Works on pulses from 10 microseconds
|
* or LOW, the type of pulse to measure. Works on pulses from 2-3 microseconds
|
||||||
* to 3 minutes in length, but must be called at least N microseconds before
|
* to 3 minutes in length, but must be called at least a few dozen microseconds
|
||||||
* the start of the pulse. */
|
* before the start of the pulse. */
|
||||||
unsigned long pulseIn(uint8_t pin, uint8_t state)
|
unsigned long pulseIn(uint8_t pin, uint8_t state, unsigned long timeout)
|
||||||
{
|
{
|
||||||
// cache the port and bit of the pin in order to speed up the
|
// cache the port and bit of the pin in order to speed up the
|
||||||
// pulse width measuring loop and achieve finer resolution. calling
|
// pulse width measuring loop and achieve finer resolution. calling
|
||||||
|
@ -39,17 +39,23 @@ unsigned long pulseIn(uint8_t pin, uint8_t state)
|
||||||
uint8_t stateMask = (state ? bit : 0);
|
uint8_t stateMask = (state ? bit : 0);
|
||||||
unsigned long width = 0; // keep initialization out of time critical area
|
unsigned long width = 0; // keep initialization out of time critical area
|
||||||
|
|
||||||
|
// convert the timeout from microseconds to a number of times through
|
||||||
|
// the initial loop; it takes 16 clock cycles per iteration.
|
||||||
|
unsigned long numloops = 0;
|
||||||
|
unsigned long maxloops = microsecondsToClockCycles(timeout) / 16;
|
||||||
|
|
||||||
// wait for the pulse to start
|
// wait for the pulse to start
|
||||||
while ((*portInputRegister(port) & bit) != stateMask)
|
while ((*portInputRegister(port) & bit) != stateMask)
|
||||||
;
|
if (numloops++ == maxloops)
|
||||||
|
return 0;
|
||||||
|
|
||||||
// wait for the pulse to stop
|
// wait for the pulse to stop
|
||||||
while ((*portInputRegister(port) & bit) == stateMask)
|
while ((*portInputRegister(port) & bit) == stateMask)
|
||||||
width++;
|
width++;
|
||||||
|
|
||||||
// convert the reading to microseconds. The loop has been determined
|
// convert the reading to microseconds. The loop has been determined
|
||||||
// to be 10 clock cycles long and have about 12 clocks between the edge
|
// to be 10 clock cycles long and have about 16 clocks between the edge
|
||||||
// and the start of the loop. There will be some error introduced by
|
// and the start of the loop. There will be some error introduced by
|
||||||
// the interrupt handlers.
|
// the interrupt handlers.
|
||||||
return clockCyclesToMicroseconds(width * 10 + 12);
|
return clockCyclesToMicroseconds(width * 10 + 16);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue