From 9dfb5f9b015ee74bff1de3e467effe823737e78c Mon Sep 17 00:00:00 2001 From: Florian <1technophile@users.noreply.github.com> Date: Tue, 10 Apr 2018 22:27:17 +0200 Subject: [PATCH] simplify user_config.h as test_config.h represents now the modules we want to tests per board there is no need of keeping differenciation into user_config.h --- User_config.h | 125 +++++++++++++++++--------------------------------- 1 file changed, 42 insertions(+), 83 deletions(-) diff --git a/User_config.h b/User_config.h index 3067a41..cdafa72 100644 --- a/User_config.h +++ b/User_config.h @@ -83,89 +83,48 @@ const byte subnet[] = { 255, 255, 255, 0 }; //ip adress /*-------------DEFINE THE MODULES YOU WANT BELOW----------------*/ //Addons and module management, comment the Z line and the config file if you don't use -#ifdef ESP8266 // for nodemcu, weemos and esp8266 - #define ZgatewayRF - #include "config_RF.h" - //#define ZgatewayRF2 - //#define ZgatewaySRFB - //#include "config_SRFB.h" - #define ZgatewayIR - #include "config_IR.h" - #define ZgatewayBT - #include "config_BT.h" - //#define ZactuatorONOFF - //#include "config_ONOFF.h" - //#define ZsensorINA226 - //#include "config_INA226.h" - //#define ZsensorHCSR501 - //#include "config_HCSR501.h" - //#define ZsensorADC - //#include "config_ADC.h" - //#define ZsensorBH1750 - //#include "config_BH1750.h" - //#define ZsensorTSL2561 - //#include "config_TSL2561.h" - //#define ZsensorBME280 - //#include "config_BME280.h" - //#define ZsensorDHT // If you uncomment this you can't use I2C due to the fact that I2C use also D1 - //#include "config_DHT.h" - //#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 - //#include "config_RFM69.h" -#elif ESP32 - #define ZgatewayRF - #include "config_RF.h" - //#define ZgatewayRF2 - //#define ZgatewayIR - //#include "config_IR.h" - #define ZgatewayBT - #include "config_BT.h" - //#define ZactuatorONOFF - //#include "config_ONOFF.h" - //#define ZsensorINA226 - //#include "config_INA226.h" - //#define ZsensorHCSR501 - //#include "config_HCSR501.h" - //#define ZsensorADC - //#include "config_ADC.h" - //#define ZsensorBH1750 - //#include "config_BH1750.h" - //#define ZsensorBME280 - //#include "config_BME280.h" - //#define ZsensorDHT // If you uncomment this you can't use I2C due to the fact that I2C use also D1 - //#include "config_DHT.h" - //#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 - //#include "config_RFM69.h" -#else // for arduino + W5100 - #define ZgatewayRF - #include "config_RF.h" - //#define ZgatewayRF2 // too big for UNO - //#define ZgatewayRFM69 not tested - //#include "config_RFM69.h" - #define ZgatewayIR - #include "config_IR.h" - #define ZgatewayBT - #include "config_BT.h" - //#define ZactuatorONOFF - //#include "config_ONOFF.h" - //#define ZsensorINA226 - //#include "config_INA226.h" - //#define ZsensorDHT - //#include "config_DHT.h" - //#define ZsensorBH1750 - //#include "config_BH1750.h" - //#define ZsensorTSL2561 - //#include "config_TSL2561.h" - //#define ZsensorBME280 - //#include "config_BME280.h" - //#define ZsensorHCSR501 - //#include "config_HCSR501.h" - //#define ZsensorADC - //#include "config_ADC.h" - //#define ZgatewayRFM69 not tested - //#include "config_RFM69.h" - //#define ZsensorINA226 - //#include "config_INA226.h" -#endif + +#define ZgatewayRF //ESP8266, Arduino, ESP32 +#include "config_RF.h" + +//#define ZgatewayRF2 //ESP8266, Arduino, ESP32 + +//#define ZgatewaySRFB //Sonoff RF Bridge +//#include "config_SRFB.h" + +#define ZgatewayIR //ESP8266, Arduino, Sonoff RF Bridge +#include "config_IR.h" + +#define ZgatewayBT //ESP8266, Arduino, ESP32 +#include "config_BT.h" + +//#define ZactuatorONOFF //ESP8266, Arduino, ESP32, Sonoff RF Bridge +//#include "config_ONOFF.h" + +//#define ZsensorINA226 //ESP8266, Arduino, ESP32 +//#include "config_INA226.h" + +//#define ZsensorHCSR501 //ESP8266, Arduino, ESP32, Sonoff RF Bridge +//#include "config_HCSR501.h" + +//#define ZsensorADC //ESP8266, Arduino, ESP32 +//#include "config_ADC.h" + +//#define ZsensorBH1750 //ESP8266, Arduino, ESP32 +//#include "config_BH1750.h" + +//#define ZsensorTSL2561 //ESP8266, Arduino, ESP32 +//#include "config_TSL2561.h" + +//#define ZsensorBME280 //ESP8266, Arduino, ESP32 +//#include "config_BME280.h" + +//#define ZsensorDHT //ESP8266, Arduino, ESP32, Sonoff RF Bridge +//#include "config_DHT.h" + +//#define ZgatewayRFM69 //ESP8266, Arduino, ESP32 +//#include "config_RFM69.h" + /*----------------------------OTHER PARAMETERS-----------------------------*/ /*-------------------CHANGING THEM IS NOT COMPULSORY-----------------------*/ /*----------------------------USER PARAMETERS-----------------------------*/