Merge branch 'master' into master

Author: petewill

examples/DallasTemperatureSensor/DallasTemperatureSensor.ino

@@ -90,7 +90,7 @@ void loop()
   for (int i=0; i<numSensors && i<MAX_ATTACHED_DS18B20; i++) {
 
     // Fetch and round temperature to one decimal
-    float temperature = static_cast<float>(static_cast<int>((getConfig().isMetric?sensors.getTempCByIndex(i):sensors.getTempFByIndex(i)) * 10.)) / 10.;
+    float temperature = static_cast<float>(static_cast<int>((getControllerConfig().isMetric?sensors.getTempCByIndex(i):sensors.getTempFByIndex(i)) * 10.)) / 10.;
 
     // Only send data if temperature has changed and no error
     #if COMPARE_TEMP == 1

examples/DhtTemperatureAndHumiditySensor/DhtTemperatureAndHumiditySensor.ino

@@ -44,7 +44,7 @@
 #include <DHT.h>
 
 // Set this to the pin you connected the DHT's data pin to
-#define DHT_DATA_PIN 2
+#define DHT_DATA_PIN 3
 
 // Set this offset if the sensor has a permanent small offset to the real temperatures
 #define SENSOR_TEMP_OFFSET 0
@@ -82,7 +82,7 @@ void presentation()
   present(CHILD_ID_HUM, S_HUM);
   present(CHILD_ID_TEMP, S_TEMP);
 
-  metric = getConfig().isMetric;
+  metric = getControllerConfig().isMetric;
 }
 
 

examples/DistanceSensor/DistanceSensor.ino

@@ -50,7 +50,7 @@ bool metric = true;
 
 void setup()  
 { 
-  metric = getConfig().isMetric;
+  metric = getControllerConfig().isMetric;
 }
 
 void presentation() {

examples/GPSSensor/GPSSensor.ino

@@ -20,22 +20,22 @@
  *
  * REVISION HISTORY
  * Version 1.0 - Henrik Ekblad
- * 
+ *
  * DESCRIPTION
- * Example sketch showing how to interface with a GPS sensor. 
+ * Example sketch showing how to interface with a GPS sensor.
  * A GPS is also an excellent atomic time source.
  * http://www.mysensors.org/build/gps
- */ 
+ */
 
 // Enable debug prints to serial monitor
-#define MY_DEBUG 
+#define MY_DEBUG
 
 // Enable and select radio type attached
 #define MY_RADIO_NRF24
 //#define MY_RADIO_RFM69
 
 // GPS position send interval (in millisectonds)
-#define GPS_SEND_INTERVAL 10000 
+#define GPS_SEND_INTERVAL 10000
 
 // The child id used for the gps sensor
 #define CHILD_ID_GPS 1
@@ -47,7 +47,7 @@ static const int GPS_PIN = A0;
 static const uint32_t GPSBaud = 9600;
 
 // Offset hours adjustment from gps time (UTC)
-const int offset = 1;   
+const int offset = 1;
 
 #include <SPI.h>
 #include <TimeLib.h>
@@ -61,15 +61,15 @@ TinyGPSPlus gps;
 MyMessage msg(CHILD_ID_GPS, V_POSITION);
 
 // The serial connection to the GPS device
-// A5 pin can be left unconnected 
-SoftwareSerial ss(GPS_PIN, A5); 
+// A5 pin can be left unconnected
+SoftwareSerial ss(GPS_PIN, A5);
 
 // Last time GPS position was sent to controller
 unsigned long lastGPSSent = 0;
 
-// Some buffers 
+// Some buffers
 char latBuf[11];
-char lngBuf[11];   
+char lngBuf[11];
 char altBuf[6];
 char payload[30];
 char sz[64];
@@ -81,7 +81,7 @@ void setup() {
 }
 
 
-void present() {
+void presentation() {
   // Send the sketch version information to the gateway and Controller
   sendSketchInfo("GPS Sensor", "1.0");
 
@@ -96,10 +96,10 @@ void loop()
   // Evaluate if it is time to send a new position
   bool timeToSend = currentTime - lastGPSSent > GPS_SEND_INTERVAL;
 
-  // Read gps data  
-  while (ss.available()) 
+  // Read gps data
+  while (ss.available())
     gps.encode(ss.read());
-  
+
   if (timeToSend) {
     // Sync gps time with Arduino
     updateTime();
@@ -121,7 +121,7 @@ void loop()
       sprintf(sz, "%02d/%02d/%02d %02d:%02d:%02d", month(), day(), year(), hour(), minute(), second());
       Serial.println(sz);
 
-      
+
     } else {
       if (millis() > 5000 && gps.charsProcessed() < 10)
         Serial.println(F("No GPS data received: check wiring"));
@@ -141,8 +141,6 @@ void updateTime()
     setTime(t.hour(), t.minute(), t.second(), d.day(), d.month(), d.year());
     adjustTime(offset * SECS_PER_HOUR);
     return;
-  } 
+  }
   Serial.println(F("Unable to adjust time from GPS"));
 }
-
-