Merge pull request milesburton#62 from webbes/master

Fixed single device conversion request bug. No way to ask a specific …

Author: milesburton

DallasTemperature.cpp

@@ -309,15 +309,6 @@ bool DallasTemperature::getCheckForConversion(){
     return checkForConversion;
 }
 
-bool DallasTemperature::isConversionAvailable(const uint8_t* deviceAddress){
-
-    // Check if the clock has been raised indicating the conversion is complete
-    ScratchPad scratchPad;
-    readScratchPad(deviceAddress, scratchPad);
-    return scratchPad[0];
-
-}
-
 bool DallasTemperature::isConversionComplete()
 {
    uint8_t b = _wire->read_bit();
@@ -333,7 +324,7 @@ void DallasTemperature::requestTemperatures(){
 
     // ASYNC mode?
     if (!waitForConversion) return;
-    blockTillConversionComplete(bitResolution, NULL);
+    blockTillConversionComplete(bitResolution);
 
 }
 
@@ -347,31 +338,27 @@ bool DallasTemperature::requestTemperaturesByAddress(const uint8_t* deviceAddres
      return false; //Device disconnected
     }
 
-    if (_wire->reset() == 0){
-        return false;
-    }
-
+    _wire->reset();
     _wire->select(deviceAddress);
     _wire->write(STARTCONVO, parasite);
 
-
     // ASYNC mode?
     if (!waitForConversion) return true;
 
-    blockTillConversionComplete(bitResolution, deviceAddress);
+    blockTillConversionComplete(bitResolution);
 
     return true;
 
 }
 
 
 // Continue to check if the IC has responded with a temperature
-void DallasTemperature::blockTillConversionComplete(uint8_t bitResolution, const uint8_t* deviceAddress){
+void DallasTemperature::blockTillConversionComplete(uint8_t bitResolution){
 
     int delms = millisToWaitForConversion(bitResolution);
-    if (deviceAddress != NULL && checkForConversion && !parasite){
+    if (checkForConversion && !parasite){
         unsigned long now = millis();
-        while(!isConversionAvailable(deviceAddress) && (millis() - delms < now));
+        while(!isConversionComplete() && (millis() - delms < now));
     } else {
         delay(delms);
     }

DallasTemperature.h

@@ -146,8 +146,6 @@ class DallasTemperature
 
     // returns true if the bus requires parasite power
     bool isParasitePowerMode(void);
-
-    bool isConversionAvailable(const uint8_t*);
 
      // Is a conversion complete on the wire?
     bool isConversionComplete(void);
@@ -254,7 +252,7 @@ class DallasTemperature
 
     int16_t millisToWaitForConversion(uint8_t);
 
-    void	blockTillConversionComplete(uint8_t, const uint8_t*);
+    void	blockTillConversionComplete(uint8_t);
 
 #if REQUIRESALARMS