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
This commit is contained in:
Henrik Ekblad
2015-02-10 23:38:05 +01:00
parent 97641902c9 7b99a2ef94
commit b238a2e61e
27 changed files with 3300 additions and 148 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/MySensors/MyConfig.h
+2 -2
View File
@@ -11,8 +11,8 @@
//#define MYSENSORS_ETHERNET_MQTT_GATEWAY
// Choose radio type by enabling one of the following
//#define MYSENSORS_RF_NRF24
#define MYSENSORS_RF_RF69
#define MYSENSORS_RF_NRF24
//#define MYSENSORS_RF_RF69