Merge pull request #3864 from facchinm/pulseInLongOVF

fix pulseInLong considering overflow

Author: facchinm

Diff for: hardware/arduino/avr/cores/arduino/wiring_pulse.c

@@ -69,22 +69,24 @@ unsigned long pulseInLong(uint8_t pin, uint8_t state, unsigned long timeout)
 	uint8_t port = digitalPinToPort(pin);
 	uint8_t stateMask = (state ? bit : 0);
 
-	unsigned long maxMicros = micros() + timeout;
+	unsigned long startMicros = micros();
 
 	// wait for any previous pulse to end
-	while ((*portInputRegister(port) & bit) == stateMask)
-		if (micros() > maxMicros)
+	while ((*portInputRegister(port) & bit) == stateMask) {
+		if (micros() - startMicros > timeout)
 			return 0;
+	}
 
 	// wait for the pulse to start
-	while ((*portInputRegister(port) & bit) != stateMask)
-		if (micros() > maxMicros)
+	while ((*portInputRegister(port) & bit) != stateMask) {
+		if (micros() - startMicros > timeout)
 			return 0;
+	}
 
 	unsigned long start = micros();
 	// wait for the pulse to stop
 	while ((*portInputRegister(port) & bit) == stateMask) {
-		if (micros() > maxMicros)
+		if (micros() - startMicros > timeout)
 			return 0;
 	}
 	return micros() - start;

Diff for: hardware/arduino/sam/cores/arduino/wiring_pulse.cpp

@@ -69,22 +69,24 @@ uint32_t pulseInLong(uint8_t pin, uint8_t state, unsigned long timeout)
 	uint32_t bit = p.ulPin;
 	uint32_t stateMask = state ? bit : 0;
 
-	unsigned long maxMicros = micros() + timeout;
+	unsigned long startMicros = micros();
 
 	// wait for any previous pulse to end
-	while ((p.pPort->PIO_PDSR & bit) == stateMask)
-		if (micros() > maxMicros)
+	while ((p.pPort->PIO_PDSR & bit) == stateMask) {
+		if (micros() - startMicros > timeout)
 			return 0;
+	}
 
 	// wait for the pulse to start
-	while ((p.pPort->PIO_PDSR & bit) != stateMask)
-		if (micros() > maxMicros)
+	while ((p.pPort->PIO_PDSR & bit) != stateMask) {
+		if (micros() - startMicros > timeout)
 			return 0;
+	}
 
 	unsigned long start = micros();
 	// wait for the pulse to stop
 	while ((p.pPort->PIO_PDSR & bit) == stateMask) {
-		if (micros() > maxMicros)
+		if (micros() - startMicros > timeout)
 			return 0;
 	}
 	return micros() - start;