Merge branch 'master' of https://github.com/milesburton/Arduino-Temperature-Control-Library

RobTillaart · RobTillaart · commit 6e94aae53fd4 · 2020-01-27T15:42:56.000+01:00
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) - 16
+		fpTemperature = ((fpTemperature & 0xfff0) << 3) - 32
 				+ (((scratchPad[COUNT_PER_C] - scratchPad[COUNT_REMAIN]) << 7)
 						/ scratchPad[COUNT_PER_C]);
 	}
diff --git a/library.properties b/library.properties
@@ -7,3 +7,4 @@ paragraph=Supports DS18B20, DS18S20, DS1822, DS1820
 category=Sensors
 url=https://github.com/milesburton/Arduino-Temperature-Control-Library
 architectures=*
+depends=OneWire

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) - 16`
	`531`	`+ fpTemperature = ((fpTemperature & 0xfff0) << 3) - 32`
`532`	`532`	`+ (((scratchPad[COUNT_PER_C] - scratchPad[COUNT_REMAIN]) << 7)`
`533`	`533`	`/ scratchPad[COUNT_PER_C]);`
`534`	`534`	`}`