Merge pull request milesburton#100 from RobTillaart/master

issue milesburton#57 - removed defaultAlarmHandler();

Author: milesburton

DallasTemperature.cpp

@@ -39,16 +39,20 @@ extern "C" {
 #define TEMP_11_BIT 0x5F // 11 bit
 #define TEMP_12_BIT 0x7F // 12 bit
 
-DallasTemperature::DallasTemperature() {
-}
-DallasTemperature::DallasTemperature(OneWire* _oneWire)
+#define NO_ALARM_HANDLER ((AlarmHandler *)0)
 
+DallasTemperature::DallasTemperature()
+{
 #if REQUIRESALARMS
-:
-		_AlarmHandler(&defaultAlarmHandler)
+	setAlarmHandler(NO_ALARM_HANDLER);
 #endif
+}
+DallasTemperature::DallasTemperature(OneWire* _oneWire)
 {
 	setOneWire(_oneWire);
+#if REQUIRESALARMS
+	setAlarmHandler(NO_ALARM_HANDLER);
+#endif
 }
 
 bool DallasTemperature::validFamily(const uint8_t* deviceAddress) {
@@ -822,21 +826,24 @@ bool DallasTemperature::hasAlarm(void) {
 	DeviceAddress deviceAddress;
 	resetAlarmSearch();
 	return alarmSearch(deviceAddress);
-
 }
 
 // runs the alarm handler for all devices returned by alarmSearch()
+// unless there no _AlarmHandler exist.
 void DallasTemperature::processAlarms(void) {
 
+if (!hasAlarmHandler())
+{
+	return;
+}
+
 	resetAlarmSearch();
 	DeviceAddress alarmAddr;
 
 	while (alarmSearch(alarmAddr)) {
-
 		if (validAddress(alarmAddr)) {
 			_AlarmHandler(alarmAddr);
 		}
-
 	}
 }
 
@@ -845,8 +852,10 @@ void DallasTemperature::setAlarmHandler(const AlarmHandler *handler) {
 	_AlarmHandler = handler;
 }
 
-// The default alarm handler
-void DallasTemperature::defaultAlarmHandler(const uint8_t* deviceAddress) {
+// checks if AlarmHandler has been set.
+bool DallasTemperature::hasAlarmHandler()
+{
+  return _AlarmHandler != NO_ALARM_HANDLER;
 }
 
 #endif

DallasTemperature.h

@@ -1,7 +1,7 @@
 #ifndef DallasTemperature_h
 #define DallasTemperature_h
 
-#define DALLASTEMPLIBVERSION "3.7.8" // To be deprecated
+#define DALLASTEMPLIBVERSION "3.7.9" // To be deprecated
 
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -168,8 +168,8 @@ class DallasTemperature {
 	// sets the alarm handler
 	void setAlarmHandler(const AlarmHandler *);
 
-	// The default alarm handler
-	static void defaultAlarmHandler(const uint8_t*);
+	// returns true if an AlarmHandler has been set
+	bool hasAlarmHandler();
 
 #endif
 

library.properties

@@ -1,5 +1,5 @@
 name=DallasTemperature
-version=3.7.8
+version=3.7.9
 author=Miles Burton <miles@mnetcs.com>, Tim Newsome <nuisance@casualhacker.net>, Guil Barros <gfbarros@bappos.com>, Rob Tillaart <rob.tillaart@gmail.com>
 maintainer=Miles Burton <miles@mnetcs.com>
 sentence=Arduino Library for Dallas Temperature ICs