Changed timeout when blocking till conversion complete

Discussed in issue milesburton#110

Author: vdwulp

DallasTemperature.cpp

@@ -423,16 +423,16 @@ bool DallasTemperature::requestTemperaturesByAddress(
 // Continue to check if the IC has responded with a temperature
 void DallasTemperature::blockTillConversionComplete(uint8_t bitResolution) {
 
-unsigned long delms = millisToWaitForConversion(bitResolution);
-if (checkForConversion && !parasite) {
-unsigned long start = millis();
-while (!isConversionComplete() && (millis() - start < delms))
-yield();
-} else {
-  activateExternalPullup();
-delay(delms);
-  deactivateExternalPullup();
-}
+ if (checkForConversion && !parasite) {
+ unsigned long start = millis();
+ while (!isConversionComplete() && (millis() - start < MAX_CONVERSION_TIMEOUT ))
+ yield();
+ } else {
+ unsigned long delms = millisToWaitForConversion(bitResolution);
+ activateExternalPullup();
+ delay(delms);
+ deactivateExternalPullup();
+ }
 
 }
 

DallasTemperature.h

@@ -37,6 +37,9 @@
 #define DEVICE_DISCONNECTED_F -196.6
 #define DEVICE_DISCONNECTED_RAW -7040
 
+// Other
+#define MAX_CONVERSION_TIMEOUT 750
+
 // For readPowerSupply on oneWire bus
 #ifndef nullptr
 #define nullptr NULL