MySmartHome/MySensors
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into development

Browse Source 
Conflicts:
	libraries/MySensors/MySensor.cpp
	libraries/MySensors/examples/EthernetGateway/EthernetGateway.ino
This commit is contained in:
Henrik Ekblad
2014-11-25 16:52:07 +01:00
parent f143fcd7a2 843e163328
commit 0dd6687488
14 changed files with 116 additions and 131 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/MySensors/MyConfig.h
+2 -2
View File
@@ -6,8 +6,8 @@
*/
// pick ONE of these - other board layouts can be easily added this way
// #define MYSENSORS_SENSOR
#define MYSENSORS_SERIAL_GATEWAY
#define MYSENSORS_SENSOR
//#define MYSENSORS_SERIAL_GATEWAY
//#define MYSENSORS_ETHERNET_MQTT_GATEWAY
// Choose radio type by enabling one of the following