Merge pull request milesburton#134 from LustigePerson/master

milesburton · web-flow · commit 5021c288f6c2 · 2019-07-01T18:56:24.000+01:00
Correct first fix
diff --git a/DallasTemperature.cpp b/DallasTemperature.cpp
@@ -528,7 +528,7 @@ int16_t DallasTemperature::calculateTemperature(const uint8_t* deviceAddress,
 	 */
 
 	if (deviceAddress[0] == DS18S20MODEL) {
-		fpTemperature = ((fpTemperature & 0xfff0) << 3)
+		fpTemperature = ((fpTemperature & 0xfff0) << 3) - 32
 				+ (((scratchPad[COUNT_PER_C] - scratchPad[COUNT_REMAIN]) << 7)
 						/ scratchPad[COUNT_PER_C]);
 	}

Original file line number	Diff line number	Diff line change
`@@ -528,7 +528,7 @@ int16_t DallasTemperature::calculateTemperature(const uint8_t* deviceAddress,`
`528`	`528`	`*/`
`529`	`529`
`530`	`530`	`if (deviceAddress[0] == DS18S20MODEL) {`
`531`		`- fpTemperature = ((fpTemperature & 0xfff0) << 3)`
	`531`	`+ fpTemperature = ((fpTemperature & 0xfff0) << 3) - 32`
`532`	`532`	`+ (((scratchPad[COUNT_PER_C] - scratchPad[COUNT_REMAIN]) << 7)`
`533`	`533`	`/ scratchPad[COUNT_PER_C]);`
`534`	`534`	`}`