Rob tillaart master

[milesburton]

Merged with RobTillart

[RobTillaart]

@milesburton
Had another look at the code and most things are style related. One might use a style formatter to get it consistent e.g. - http://astyle.sourceforge.net/astyle.html#_General_Information

I found one function with a bug in it. (already existed)

void DallasTemperature::blockTillConversionComplete(uint8_t bitResolution, const uint8_t* deviceAddress){
    int delms = millisToWaitForConversion(bitResolution);
    if (deviceAddress != NULL && checkForConversion && !parasite){
        unsigned long timend = millis() + delms;
        while(!isConversionAvailable(deviceAddress) && (millis() < timend));
    } else {
        delay(delms);
    }
}

should be

void DallasTemperature::blockTillConversionComplete(uint8_t bitResolution, const uint8_t* deviceAddress){
    int delms = millisToWaitForConversion(bitResolution);
    if (deviceAddress != NULL && checkForConversion && !parasite){
        unsigned long now = millis();
        while(!isConversionAvailable(deviceAddress) && (millis() - delms < now));
    } else {
        delay(delms);
    }
}

As times may only be subtracted otherwise the comparison fails when the uint32_t rolls over.

for the rest it looks good to me.

[milesburton]

Ah that would be useful. I'll take a look at that formatter. I'll make those modifications and merge later today.

[milesburton]

Okay cool, I'm going to merge this change then create a new branch to sort out the style and rollover bug