merge miles/master + minor changes

Author: RobTillaart

DallasTemperature.cpp

@@ -618,9 +618,9 @@ int16_t DallasTemperature::calculateTemperature(const uint8_t* deviceAddress,
 	 extended resolution temperature can then be calculated using the
 	 following equation:
 
-	 COUNT_PER_C - COUNT_REMAIN
+	                                  COUNT_PER_C - COUNT_REMAIN
 	 TEMPERATURE = TEMP_READ - 0.25 + --------------------------
-	 COUNT_PER_C
+	                                         COUNT_PER_C
 
 	 Hagai Shatz simplified this to integer arithmetic for a 12 bits
 	 value for a DS18S20, and James Cameron added legacy DS1820 support.

examples/AlarmHandler/AlarmHandler.ino

@@ -14,7 +14,7 @@ DallasTemperature sensors(&oneWire);
 DeviceAddress insideThermometer, outsideThermometer;
 
 // function that will be called when an alarm condition exists during DallasTemperatures::processAlarms();
-void newAlarmHandler(uint8_t* deviceAddress)
+void newAlarmHandler(const uint8_t* deviceAddress)
 {
   Serial.println("Alarm Handler Start"); 
   printAlarmInfo(deviceAddress);
@@ -30,7 +30,7 @@ void printCurrentTemp(DeviceAddress deviceAddress)
   Serial.println();
 }
 
-void printAddress(DeviceAddress deviceAddress)
+void printAddress(const DeviceAddress deviceAddress)
 {
   Serial.print("Address: ");
   for (uint8_t i = 0; i < 8; i++)
@@ -41,7 +41,7 @@ void printAddress(DeviceAddress deviceAddress)
   Serial.print(" ");
 }
 
-void printTemp(DeviceAddress deviceAddress)
+void printTemp(const DeviceAddress deviceAddress)
 {
   float tempC = sensors.getTempC(deviceAddress);
   if (tempC != DEVICE_DISCONNECTED_C)
@@ -53,7 +53,7 @@ void printTemp(DeviceAddress deviceAddress)
   Serial.print(" ");
 }
 
-void printAlarmInfo(DeviceAddress deviceAddress)
+void printAlarmInfo(const DeviceAddress deviceAddress)
 {
   char temp;
   printAddress(deviceAddress);

examples/Multiple/Multiple.ino

@@ -15,7 +15,7 @@ DallasTemperature sensors(&oneWire);
 // arrays to hold device addresses
 DeviceAddress insideThermometer, outsideThermometer;
 
-// Assign address manually. The addresses below will beed to be changed
+// Assign address manually. The addresses below will need to be changed
 // to valid device addresses on your bus. Device address can be retrieved
 // by using either oneWire.search(deviceAddress) or individually via
 // sensors.getAddress(deviceAddress, index)

examples/Timing/Timing.ino

@@ -1,13 +1,14 @@
 //
 //    FILE: Timing.ino
 //  AUTHOR: Rob Tillaart
-// VERSION: 0.0.2
+// VERSION: 0.0.3
 // PURPOSE: show performance of DallasTemperature lib 
 //          compared to datasheet times per resolution
 //
 // HISTORY:
-// 0.0.1 = 2017-07-25 initial version
-// 0.0.2 = 2020-02-13 updates to work with current lib version
+// 0.0.1    2017-07-25 initial version
+// 0.0.2    2020-02-13 updates to work with current lib version
+// 0.0.3    2020-02-20 added timing measurement of setResolution
 
 #include <OneWire.h>
 #include <DallasTemperature.h>
@@ -39,7 +40,13 @@ void loop()
   Serial.println("RES\tTIME\tACTUAL\tGAIN");
   for (int r = 9; r < 13; r++)
   {
+    start = micros();
     sensor.setResolution(r);
+    Serial.println(micros() - start);
+
+    start = micros();
+    sensor.setResolution(r);
+    Serial.println(micros() - start);
 
     uint32_t duration = run(20);
     float avgDuration = duration / 20.0;