Merge branch 'milesburton:master' into master

Author: RobTillaart

DallasTemperature.cpp

@@ -3,8 +3,6 @@
 // License as published by the Free Software Foundation; either
 // version 2.1 of the License, or (at your option) any later version.
 
-#include "DallasTemperature.h"
-
 // for Particle support
 // yield() is not a standard function, but instead wraps Particle process
 // https://community.particle.io/t/syscall-yield-operation/40708/2
@@ -20,6 +18,8 @@ extern "C" {
 }
 #endif
 
+#include "DallasTemperature.h"
+
 // OneWire commands
 #define STARTCONVO      0x44  // Tells device to take a temperature reading and put it on the scratchpad
 #define COPYSCRATCH     0x48  // Copy scratchpad to EEPROM
@@ -152,19 +152,19 @@ bool DallasTemperature::validAddress(const uint8_t* deviceAddress) {
 // finds an address at a given index on the bus
 // returns true if the device was found
 bool DallasTemperature::getAddress(uint8_t* deviceAddress, uint8_t index) {
+	if (index < devices) {
+		uint8_t depth = 0;
 
-	uint8_t depth = 0;
-
-	_wire->reset_search();
+		_wire->reset_search();
 
-	while (depth <= index && _wire->search(deviceAddress)) {
-		if (depth == index && validAddress(deviceAddress))
-			return true;
-		depth++;
+		while (depth <= index && _wire->search(deviceAddress)) {
+			if (depth == index && validAddress(deviceAddress))
+				return true;
+			depth++;
+		}
 	}
 
 	return false;
-
 }
 
 // attempt to determine if the device at the given address is connected to the bus
@@ -723,22 +723,27 @@ int32_t DallasTemperature::calculateTemperature(const uint8_t* deviceAddress,
 // the numeric value of DEVICE_DISCONNECTED_RAW is defined in
 // DallasTemperature.h. It is a large negative number outside the
 // operating range of the device
-int32_t DallasTemperature::getTemp(const uint8_t* deviceAddress) {
+int32_t DallasTemperature::getTemp(const uint8_t* deviceAddress, byte retryCount = 0) {
 
 	ScratchPad scratchPad;
-	if (isConnected(deviceAddress, scratchPad))
-		return calculateTemperature(deviceAddress, scratchPad);
-	return DEVICE_DISCONNECTED_RAW;
-
+	
+	byte retries = 0;
+	
+	while (retries++ <= retryCount) {
+    if (isConnected(deviceAddress, scratchPad))
+      return calculateTemperature(deviceAddress, scratchPad);
+  	}
+  
+  	return DEVICE_DISCONNECTED_RAW;
 }
 
 // returns temperature in degrees C or DEVICE_DISCONNECTED_C if the
 // device's scratch pad cannot be read successfully.
 // the numeric value of DEVICE_DISCONNECTED_C is defined in
 // DallasTemperature.h. It is a large negative number outside the
 // operating range of the device
-float DallasTemperature::getTempC(const uint8_t* deviceAddress) {
-	return rawToCelsius(getTemp(deviceAddress));
+float DallasTemperature::getTempC(const uint8_t* deviceAddress, byte retryCount = 0) {
+	return rawToCelsius(getTemp(deviceAddress, retryCount));
 }
 
 // returns temperature in degrees F or DEVICE_DISCONNECTED_F if the

DallasTemperature.h

@@ -159,10 +159,10 @@ class DallasTemperature {
 	request_t requestTemperaturesByIndex(uint8_t);
 
 	// returns temperature raw value (12 bit integer of 1/128 degrees C)
-	int32_t getTemp(const uint8_t*);
+	int32_t getTemp(const uint8_t*, byte retryCount = 0);
 
 	// returns temperature in degrees C
-	float getTempC(const uint8_t*);
+	float getTempC(const uint8_t*, byte retryCount = 0);
 
 	// returns temperature in degrees F
 	float getTempF(const uint8_t*);

README.md

@@ -67,16 +67,24 @@ https://www.milesburton.com/w/index.php/Dallas_Temperature_Control_Library
 
 # License
 
-This library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Lesser General Public
-License as published by the Free Software Foundation; either
-version 2.1 of the License, or (at your option) any later version.
-
-This library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public
-License along with this library; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+MIT License
+
+Copyright (c) [2025] [Miles Burton]
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.