Merge branch 'master' into development

Conflicts:
	libraries/MySensors/MyGateway.cpp
	libraries/MySensors/MyGateway.h
	libraries/MySensors/MyMessage.h
	libraries/MySensors/examples/LightLuxSensor/LightLuxSensor.ino
This commit is contained in:
Henrik Ekblad
2015-07-30 14:15:26 +02:00
30 changed files with 2547 additions and 719 deletions
@@ -77,7 +77,7 @@ float SmokeCurve[3] ={2.3,0.53,-0.44}; //two points are taken from
MySensor gw;
MyMessage msg(CHILD_ID_MQ, V_VAR1);
MyMessage msg(CHILD_ID_MQ, V_LEVEL);
void setup()