chriz/OpenMQTT-Gateway
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 5 Wiki Activity

correct merge

Browse Source
This commit is contained in:
1technophile committed 2017-09-23 16:39:43 +02:00
1 parent 2d2cea3240
commit 66b607015b
1 file changed
-6
Download Patch File Download Diff File Expand all files Collapse all files
User_config.h
-6
View File
@@ -85,15 +85,9 @@ const byte subnet[] = { 255, 255, 255, 0 }; //ip adress
#else // for arduino + W5100 #else // for arduino + W5100
#define ZgatewayRF #define ZgatewayRF
#include "config_RF.h" #include "config_RF.h"
<<<<<<< HEAD
//#define ZgatewayRF2 // too big for UNO //#define ZgatewayRF2 // too big for UNO
#ifdef RFM69_Wiring
//#define ZgatewayRFM69 not tested //#define ZgatewayRFM69 not tested
//#include "config_RFM69.h" //#include "config_RFM69.h"
#endif
=======
#define ZgatewayRF2
>>>>>>> New-wiring
#define ZgatewayIR #define ZgatewayIR
#include "config_IR.h" #include "config_IR.h"
#define ZgatewayBT #define ZgatewayBT