Merge branch 'master' into master

This commit is contained in:
steadramon authored and GitHub committed 2018-09-21 17:56:30 +01:00
commit 0e743a0e33
48 files changed
+1030 -207

No files matched your search

+3
View File
@@ -103,6 +103,7 @@ const byte subnet[] = { 255, 255, 255, 0 }; //ip adress
#define ZsensorTSL2561 "TSL2561"
#define ZsensorDHT "DHT"// If you uncomment this you can't use I2C due to the fact that I2C use also D1
#define ZgatewayRFM69 "RFM69"// If you uncomment this you can't use RF and BT due to the fact that RF use also D8 and BT use also D6/D7
#define ZsensorGPIOInput "GPIOInput"
#define ZgatewayPilight "Pilight"
#elif ESP32
#define ZgatewayRF "RF"
@@ -119,6 +120,7 @@ const byte subnet[] = { 255, 255, 255, 0 }; //ip adress
//#define ZsensorBME280
#define ZsensorDHT "DHT"// If you uncomment this you can't use I2C due to the fact that I2C use also D1
//#define ZgatewayRFM69 // If you uncomment this you can't use RF and BT due to the fact that RF use also D8 and BT use also D6/D7
//#define ZsensorGPIOInput "GPIOInput" //untested
#else // for arduino mega + W5100
#define ZgatewayRF "RF"
//#define Zgateway2G (not tested yet)
@@ -134,6 +136,7 @@ const byte subnet[] = { 255, 255, 255, 0 }; //ip adress
//#define ZsensorHCSR501
//#define ZsensorADC
//#define ZgatewayRFM69 not tested
//#define ZsensorGPIOInput //not tested
#endif
/*----------------------------OTHER PARAMETERS-----------------------------*/
#ifdef ZgatewaySRFB