Merge pull request milesburton#9 from milesburton/master

merge miles burton master again

Author: RobTillaart

DallasTemperature.h

@@ -19,7 +19,11 @@
 #endif
 
 #include <inttypes.h>
+#ifdef __STM32F1__
+#include <OneWireSTM.h>
+#else
 #include <OneWire.h>
+#endif
 
 // Model IDs
 #define DS18S20MODEL 0x10  // also DS1820

examples/Multiple/Multiple.pde

@@ -102,6 +102,11 @@ void printAddress(DeviceAddress deviceAddress)
 void printTemperature(DeviceAddress deviceAddress)
 {
   float tempC = sensors.getTempC(deviceAddress);
+  if(tempC == DEVICE_DISCONNECTED_C) 
+  {
+    Serial.println("Error: Could not read temperature data");
+    return;
+  }
   Serial.print("Temp C: ");
   Serial.print(tempC);
   Serial.print(" Temp F: ");

examples/setUserData/SetUserData.ino renamed to examples/SetUserData/SetUserData.ino

@@ -36,6 +36,16 @@ void loop(void)
   Serial.println("DONE");
   // After we got the temperatures, we can print them here.
   // We use the function ByIndex, and as an example get the temperature from the first sensor only.
-  Serial.print("Temperature for the device 1 (index 0) is: ");
-  Serial.println(sensors.getTempCByIndex(0));  
-}
+  float tempC = sensors.getTempCByIndex(0);
+
+  // Check if reading was successful
+  if(tempC != DEVICE_DISCONNECTED_C) 
+  {
+    Serial.print("Temperature for the device 1 (index 0) is: ");
+    Serial.println(tempC);
+  } 
+  else
+  {
+    Serial.println("Error: Could not read temperature data");
+  }
+}

examples/Simple/Simple.pde

@@ -85,6 +85,11 @@ void printTemperature(DeviceAddress deviceAddress)
 
   // method 2 - faster
   float tempC = sensors.getTempC(deviceAddress);
+  if(tempC == DEVICE_DISCONNECTED_C) 
+  {
+    Serial.println("Error: Could not read temperature data");
+    return;
+  }
   Serial.print("Temp C: ");
   Serial.print(tempC);
   Serial.print(" Temp F: ");
@@ -113,4 +118,4 @@ void printAddress(DeviceAddress deviceAddress)
     if (deviceAddress[i] < 16) Serial.print("0");
     Serial.print(deviceAddress[i], HEX);
   }
-}
+}

examples/Single/Single.pde

@@ -57,7 +57,7 @@ void setup(void)
 		// set the resolution to TEMPERATURE_PRECISION bit (Each Dallas/Maxim device is capable of several different resolutions)
 		sensors.setResolution(tempDeviceAddress, TEMPERATURE_PRECISION);
 
-		 Serial.print("Resolution actually set to: ");
+		Serial.print("Resolution actually set to: ");
 		Serial.print(sensors.getResolution(tempDeviceAddress), DEC); 
 		Serial.println();
 	}else{
@@ -80,6 +80,11 @@ void printTemperature(DeviceAddress deviceAddress)
 
   // method 2 - faster
   float tempC = sensors.getTempC(deviceAddress);
+  if(tempC == DEVICE_DISCONNECTED_C) 
+  {
+    Serial.println("Error: Could not read temperature data");
+    return;
+  }
   Serial.print("Temp C: ");
   Serial.print(tempC);
   Serial.print(" Temp F: ");
@@ -121,4 +126,4 @@ void printAddress(DeviceAddress deviceAddress)
     if (deviceAddress[i] < 16) Serial.print("0");
     Serial.print(deviceAddress[i], HEX);
   }
-}
+}

examples/Tester/Tester.pde

@@ -5,47 +5,47 @@
 #######################################
 # Datatypes (KEYWORD1)
 #######################################
-DallasTemperature		KEYWORD1
-OneWire					KEYWORD1
-AlarmHandler			KEYWORD1
-DeviceAddress			KEYWORD1
+DallasTemperature	KEYWORD1
+OneWire	KEYWORD1
+AlarmHandler	KEYWORD1
+DeviceAddress	KEYWORD1
 
 #######################################
 # Methods and Functions (KEYWORD2)
 #######################################
 
-setResolution			KEYWORD2
-getResolution			KEYWORD2
-getTempC				KEYWORD2
-toFahrenheit			KEYWORD2
-getTempF				KEYWORD2
-getTempCByIndex 		KEYWORD2
-getTempFByIndex			KEYWORD2
+setResolution	KEYWORD2
+getResolution	KEYWORD2
+getTempC	KEYWORD2
+toFahrenheit	KEYWORD2
+getTempF	KEYWORD2
+getTempCByIndex	KEYWORD2
+getTempFByIndex	KEYWORD2
 setWaitForConversion	KEYWORD2
 getWaitForConversion	KEYWORD2
-requestTemperatures		KEYWORD2
+requestTemperatures	KEYWORD2
 requestTemperaturesByAddress	KEYWORD2
 requestTemperaturesByIndex	KEYWORD2
-isParasitePowerMode		KEYWORD2
-begin					KEYWORD2
-getDeviceCount			KEYWORD2
-getAddress				KEYWORD2
-validAddress			KEYWORD2
-isConnected				KEYWORD2
-readScratchPad			KEYWORD2
-writeScratchPad			KEYWORD2
-readPowerSupply			KEYWORD2
-setHighAlarmTemp		KEYWORD2
-setLowAlarmTemp			KEYWORD2
-getHighAlarmTemp		KEYWORD2
-getLowAlarmTemp			KEYWORD2
-resetAlarmSearch		KEYWORD2
-alarmSearch				KEYWORD2
-hasAlarm				KEYWORD2
-toCelsius				KEYWORD2
-processAlarmss			KEYWORD2
-setAlarmHandlers		KEYWORD2
-defaultAlarmHandler		KEYWORD2
+isParasitePowerMode	KEYWORD2
+begin	KEYWORD2
+getDeviceCount	KEYWORD2
+getAddress	KEYWORD2
+validAddress	KEYWORD2
+isConnected	KEYWORD2
+readScratchPad	KEYWORD2
+writeScratchPad	KEYWORD2
+readPowerSupply	KEYWORD2
+setHighAlarmTemp	KEYWORD2
+setLowAlarmTemp	KEYWORD2
+getHighAlarmTemp	KEYWORD2
+getLowAlarmTemp	KEYWORD2
+resetAlarmSearch	KEYWORD2
+alarmSearch	KEYWORD2
+hasAlarm	KEYWORD2
+toCelsius	KEYWORD2
+processAlarmss	KEYWORD2
+setAlarmHandlers	KEYWORD2
+defaultAlarmHandler	KEYWORD2
 calculateTemperature	KEYWORD2
 
 #######################################