Merge pull request arduino#123 from Kolbi/development

Some changes for the DallasTemperatureSensors.ino and BatteryPoweredSensor.ino

Author: henrikekblad

libraries/MySensors/examples/BatteryPoweredSensor/BatteryPoweredSensor.ino

@@ -30,6 +30,8 @@
 #include <SPI.h>
 #include <MySensor.h>
 
+#define DEBUG 1 // Debug enables Serial.print 1 = Yes 0 = No
+
 int BATTERY_SENSE_PIN = A0;  // select the input pin for the battery sense point
 
 MySensor gw;
@@ -50,7 +52,9 @@ void loop()
 {
    // get the battery Voltage
    int sensorValue = analogRead(BATTERY_SENSE_PIN);
+   #if DEBUG > 0
    Serial.println(sensorValue);
+   #endif
 
    // 1M, 470K divider across battery and using internal ADC ref of 1.1V
    // Sense point is bypassed with 0.1 uF cap to reduce noise at that point
@@ -59,13 +63,15 @@ void loop()
    float batteryV  = sensorValue * 0.003363075;
    int batteryPcnt = sensorValue / 10;
 
+   #if DEBUG > 0
    Serial.print("Battery Voltage: ");
    Serial.print(batteryV);
    Serial.println(" V");
 
    Serial.print("Battery percent: ");
    Serial.print(batteryPcnt);
    Serial.println(" %");
+   #endif
 
    if (oldBatteryPcnt != batteryPcnt) {
      // Power up radio after sleep

libraries/MySensors/examples/DallasTemperatureSensor/DallasTemperatureSensor.ino

@@ -29,11 +29,13 @@
 #include <DallasTemperature.h>
 #include <OneWire.h>
 
+#define COMPARE_TEMP 1 // Send temperature only if changed? 1 = Yes 0 = No
+
 #define ONE_WIRE_BUS 3 // Pin where dallase sensor is connected 
 #define MAX_ATTACHED_DS18B20 16
 unsigned long SLEEP_TIME = 30000; // Sleep time between reads (in milliseconds)
-OneWire oneWire(ONE_WIRE_BUS);
-DallasTemperature sensors(&oneWire);
+OneWire oneWire(ONE_WIRE_BUS); // Setup a oneWire instance to communicate with any OneWire devices (not just Maxim/Dallas temperature ICs)
+DallasTemperature sensors(&oneWire); // Pass the oneWire reference to Dallas Temperature. 
 MySensor gw;
 float lastTemperature[MAX_ATTACHED_DS18B20];
 int numSensors=0;
@@ -44,14 +46,14 @@ MyMessage msg(0,V_TEMP);
 
 void setup()  
 { 
-  // Startup OneWire 
+  // Startup up the OneWire library
   sensors.begin();
 
   // Startup and initialize MySensors library. Set callback for incoming messages. 
-  gw.begin(); 
+  gw.begin();
 
   // Send the sketch version information to the gateway and Controller
-  gw.sendSketchInfo("Temperature Sensor", "1.0");
+  gw.sendSketchInfo("Temperature Sensor", "1.1");
 
   // Fetch the number of attached temperature sensors  
   numSensors = sensors.getDeviceCount();
@@ -78,10 +80,15 @@ void loop()
     float temperature = static_cast<float>(static_cast<int>((gw.getConfig().isMetric?sensors.getTempCByIndex(i):sensors.getTempFByIndex(i)) * 10.)) / 10.;
 
     // Only send data if temperature has changed and no error
-    if (lastTemperature[i] != temperature && temperature != -127.00) {
+    #if COMPARE_TEMP == 1
+    if (lastTemperature[i] != temperature && temperature != -127.00 && temperature != 85.00) {
+    #else
+    if (temperature != -127.00 && temperature != 85.00) {
+    #endif
 
       // Send in the new temperature
       gw.send(msg.setSensor(i).set(temperature,1));
+      // Save new temperatures for next compare
       lastTemperature[i]=temperature;
     }
   }