Merge branch 'master' into development

Conflicts:
	libraries/MySensors/MyGateway.cpp
	libraries/MySensors/MySensor.cpp
	libraries/MySensors/examples/EthernetGateway/EthernetGateway.ino

Author: henrikekblad

libraries/MAX6675/MAX6675.cpp

@@ -0,0 +1,109 @@
+/*
+  MAX6675.cpp - Library for reading temperature from a MAX6675.
+
+  This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 Unported License.
+  http://creativecommons.org/licenses/by-sa/3.0/
+*/
+
+#include <MAX6675.h>
+
+MAX6675::MAX6675(uint8_t CS_pin, uint8_t SO_pin, uint8_t SCK_pin, uint8_t units)
+{
+    pinMode(CS_pin, OUTPUT);
+    pinMode(SO_pin, INPUT);
+    pinMode(SCK_pin, OUTPUT);
+
+    digitalWrite(CS_pin, HIGH);
+
+    _CS_pin = CS_pin;
+    _SO_pin = SO_pin;
+    _SCK_pin = SCK_pin;
+    _units = units;
+}
+
+float MAX6675::read_temp()
+{
+    uint16_t value = 0;
+    uint8_t error_tc = 0;
+    float temp = 0.0;
+
+    /*
+      Initiate a temperature conversion. According to MAX's tech notes FAQ's
+      for the chip, Line going high initiates a conversion, which means, we
+      need to clock the chip low to high to initiate the conversion, then wait
+      for the conversion to be complete before trying to read the data from
+      the chip.
+    */
+    digitalWrite(_CS_pin,LOW);
+    delay(2);
+    digitalWrite(_CS_pin,HIGH);
+    delay(220);
+
+    /* Read the chip and return the raw temperature value */
+
+    /*
+      Bring CS pin low to allow us to read the data from
+      the conversion process
+    */
+    digitalWrite(_CS_pin,LOW);
+
+    /* Cycle the clock for dummy bit 15 */
+    digitalWrite(_SCK_pin,HIGH);
+    delay(1);
+    digitalWrite(_SCK_pin,LOW);
+
+     /*
+      Read bits 14-3 from MAX6675 for the Temp. Loop for each bit reading
+      the value and storing the final value in 'temp'
+    */
+    for (int i=11; i>=0; i--) {
+        digitalWrite(_SCK_pin,HIGH);
+        value += digitalRead(_SO_pin) << i;
+        digitalWrite(_SCK_pin,LOW);
+    }
+
+    /* Read the TC Input inp to check for TC Errors */
+    digitalWrite(_SCK_pin,HIGH);
+    error_tc = digitalRead(_SO_pin);
+    digitalWrite(_SCK_pin,LOW);
+
+    /*
+      Read the last two bits from the chip, faliure to do so will result
+      in erratic readings from the chip.
+    */
+    for (int i=1; i>=0; i--) {
+        digitalWrite(_SCK_pin,HIGH);
+        delay(1);
+        digitalWrite(_SCK_pin,LOW);
+    }
+
+    // Disable Device
+    digitalWrite(_CS_pin, HIGH);
+
+    /*
+      Keep in mind that the temp that was just read is on the digital scale
+      from 0˚C to 1023.75˚C at a resolution of 2^12.  We now need to convert
+      to an actual readable temperature (this drove me nuts until I figured
+      this out!).  Now multiply by 0.25.  I tried to avoid float math but
+      it is tough to do a good conversion to ˚F.  THe final value is converted
+      to an int and returned at x10 power.
+
+      2 = temp in deg F
+      1 = temp in deg C
+      0 = raw chip value 0-4095
+    */
+    if(_units == 2) {
+        temp = (value*0.25) * 9.0/5.0 + 32.0;
+    } else if(_units == 1) {
+        temp = (value*0.25);
+    } else {
+        temp = value;
+    }
+
+    /* Output negative of CS_pin if there is a TC error, otherwise return 'temp' */
+    if(error_tc != 0) {
+        return -_CS_pin;
+    } else {
+        return temp;
+    }
+}

libraries/MAX6675/MAX6675.h

@@ -0,0 +1,30 @@
+/*
+  MAX6675.h - Library for reading temperature from a MAX6675.
+
+  This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 Unported License.
+  http://creativecommons.org/licenses/by-sa/3.0/
+*/
+
+#ifndef MAX6675_h
+#define MAX6675_h
+
+#if defined(ARDUINO) && ARDUINO >= 100
+#include "Arduino.h"
+#else
+#include "WProgram.h"
+#endif
+
+class MAX6675
+{
+  public:
+    MAX6675(uint8_t CS_pin, uint8_t SO_pin, uint8_t SCK_pin, uint8_t units);
+    float read_temp();
+  private:
+    uint8_t _CS_pin;
+    uint8_t _SO_pin;
+    uint8_t _SCK_pin;
+    uint8_t _units;
+    uint8_t chip_read(uint8_t CS_pin, uint8_t &error_tc);
+};
+
+#endif

libraries/MAX6675/README.markdown

@@ -0,0 +1,28 @@
+MAX6675 Arduino Library
+=======================
+Version: **2.0.1**
+
+This work is licensed under a <a rel="license" href="http://creativecommons.org/licenses/by-sa/3.0/">Creative Commons Attribution-ShareAlike 3.0 Unported License</a>.
+
+
+Summary
+-------
+
+The primary use of the library is to easily interface with a MAX6675 chip via it's SPI interface.  Use the following code to initialize the library.  V2 also greatly improves performance and timing of the chip for more accurate reads.  Thanks Ed!
+
+	MAX6675 temp0(CS,SO,SCK,units);
+
+Variables:	
+
+*	CS is chip select pin of chip
+*	SO is data out of the chip
+*	SCK is the clock pin of the chip
+*	units is one of the following:
+	*	0 = raw 0-4095 value
+	*	1 = temp in ˚C
+	*	2 = temp in ˚F
+	
+Following this you can use the _read_temp()_ function to return the temperature as a float.
+
+	temperature = temp0.read_temp();
+	

libraries/MAX6675/examples/read_temp/read_temp.pde

@@ -0,0 +1,47 @@
+/*
+  Single_Temp.pde - Example using the MAX6675 Library.
+  Created by Ryan McLaughlin <ryanjmclaughlin@gmail.com>
+
+  This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 Unported License.
+  http://creativecommons.org/licenses/by-sa/3.0/
+*/
+
+#include <MAX6675.h>
+
+int LED1 = 9;             // Status LED Pin
+int CS = 10;             // CS pin on MAX6675
+int SO = 12;              // SO pin of MAX6675
+int SCK = 13;             // SCK pin of MAX6675
+int units = 2;            // Units to readout temp (0 = raw, 1 = ˚C, 2 = ˚F)
+float temperature = 0.0;  // Temperature output variable
+
+
+// Initialize the MAX6675 Library for our chip
+MAX6675 temp(CS,SO,SCK,units);
+
+
+// Setup Serial output and LED Pin  
+// MAX6675 Library already sets pin modes for MAX6675 chip!
+void setup() {
+  Serial.begin(9600);
+  pinMode(LED1, OUTPUT);
+}
+
+void loop() {
+	// Read the temp from the MAX6675
+	temperature = temp.read_temp();
+
+	if(temperature < 0) {                   
+		// If there is an error with the TC, temperature will be < 0
+		Serial.print("Thermocouple Error on CS");
+		Serial.println( temperature ); 
+		digitalWrite(LED1, HIGH);
+	} else {
+		Serial.print("Current Temperature: ");
+		Serial.println( temperature ); 
+		digitalWrite(LED1, LOW);
+	}
+ 
+	// Wait one second before reading again
+	delay(1000);	
+}

libraries/MAX6675/keywords.txt

@@ -0,0 +1,16 @@
+#######################################
+# Syntax Coloring Map For MAX6675
+#######################################
+
+#######################################
+# Datatypes (KEYWORD1)
+#######################################
+
+MAX6675	KEYWORD1
+
+#######################################
+# Methods and Functions (KEYWORD2)
+#######################################
+
+read_temp	KEYWORD2
+

libraries/MySensors/MyMessage.cpp

@@ -13,12 +13,10 @@ MyMessage::MyMessage(uint8_t _sensor, uint8_t _type) {
 	type = _type;
 }
 
-
 bool MyMessage::isAck() const {
 	return miGetAck();
 }
 
-
 /* Getters for payload converted to desired form */
 void* MyMessage::getCustom() const {
 	return (void *)data;
@@ -42,16 +40,20 @@ char MyMessage::i2h(uint8_t i) const {
 		return 'A' + k - 10;
 }
 
+char* MyMessage::getCustomString(char *buffer) const {
+	for (uint8_t i = 0; i < miGetLength(); i++)
+	{
+		buffer[i * 2] = i2h(data[i] >> 4);
+		buffer[(i * 2) + 1] = i2h(data[i]);
+	}
+	buffer[miGetLength() * 2] = '\0';
+	return buffer;
+}
+
 char* MyMessage::getStream(char *buffer) const {
 	uint8_t cmd = miGetCommand();
 	if ((cmd == C_STREAM) && (buffer != NULL)) {
-		for (uint8_t i = 0; i < miGetLength(); i++)
-		{
-			buffer[i * 2] = i2h(data[i] >> 4);
-			buffer[(i * 2) + 1] = i2h(data[i]);
-		}
-		buffer[miGetLength() * 2] = '\0';
-		return buffer;
+		return getCustomString(buffer);
 	} else {
 		return NULL;
 	}
@@ -73,12 +75,11 @@ char* MyMessage::getString(char *buffer) const {
 		} else if (payloadType == P_LONG32) {
 			ltoa(lValue, buffer, 10);
 		} else if (payloadType == P_ULONG32) {
-		
 			ultoa(ulValue, buffer, 10);
 		} else if (payloadType == P_FLOAT32) {
 			dtostrf(fValue,2,fPrecision,buffer);
 		} else if (payloadType == P_CUSTOM) {
-			return getStream(buffer);
+			return getCustomString(buffer);
 		}
 		return buffer;
 	} else {
@@ -151,7 +152,6 @@ unsigned int MyMessage::getUInt() const {
 
 }
 
-
 MyMessage& MyMessage::setType(uint8_t _type) {
 	type = _type;
 	return *this;
@@ -175,12 +175,11 @@ MyMessage& MyMessage::set(void* value, uint8_t length) {
 	return *this;
 }
 
-
 MyMessage& MyMessage::set(const char* value) {
-	uint8_t length = strlen(value);
+	uint8_t length = min(strlen(value), MAX_PAYLOAD);
 	miSetLength(length);
 	miSetPayloadType(P_STRING);
-	strncpy(data, value, min(length, MAX_PAYLOAD));
+	strncpy(data, value, length);
 	return *this;
 }
 
@@ -191,7 +190,6 @@ MyMessage& MyMessage::set(uint8_t value) {
 	return *this;
 }
 
-
 MyMessage& MyMessage::set(float value, uint8_t decimals) {
 	miSetLength(5); // 32 bit float + persi
 	miSetPayloadType(P_FLOAT32);
@@ -227,5 +225,3 @@ MyMessage& MyMessage::set(int value) {
 	iValue = value;
 	return *this;
 }
-
-

libraries/MySensors/MyMessage.h

@@ -122,6 +122,9 @@ typedef enum {
 #ifdef __cplusplus
 class MyMessage
 {
+private:
+	char* getCustomString(char *buffer) const;
+
 public:
 	// Constructors
 	MyMessage();