config reorganization

This commit is contained in:
Florian committed 2018-04-11 19:39:13 +02:00
1 parent 02970519b6
commit b25eacdcbb
2 files changed
+14 -42

No files matched your search

+14 -6
View File
@@ -38,20 +38,28 @@ char mqtt_user[20] = "your_username"; // not compulsory only if your broker need
char mqtt_pass[20] = "your_password"; // not compulsory only if your broker needs authentication
char mqtt_server[40] = "192.168.1.17";
char mqtt_port[6] = "1883";
#if defined(ESP32) || defined(ESPWifiManualSetup) // for nodemcu, weemos and esp8266
#define wifi_ssid "wifi ssid"
#define wifi_password "wifi password"
#else // for arduino + W5100
const byte mac[] = { 0xDE, 0xED, 0xBA, 0xFE, 0x54, 0x95 }; //W5100 ethernet shield mac adress
#endif
#define WifiManager_password "your_password"
//#define MDNS_SD //comment if you don't want to use mdns for discovering automatically your ip server, please note that MDNS with ESP32 can cause the BLE to not work
//set minimum quality of signal so it ignores AP's under that quality
#define MinimumWifiSignalQuality 8
//#define ESPWifiManualSetup true //uncomment you don't want to use wifimanager for your credential settings on ESP
#define Gateway_Name "/OpenMQTTGateway"
#define Base_Topic "home"
#define WifiManager_password "your_password"
#define version_Topic Base_Topic Gateway_Name "/version"
#define will_Topic Base_Topic Gateway_Name "/LWT"
#define will_QoS 0
#define will_Retain true
#define will_Message "Offline"
#define Gateway_AnnouncementMsg "Online"
//#define MDNS_SD //comment if you don't want to use mdns for discovering automatically your ip server, please note that MDNS with ESP32 can cause the BLE to not work
//set minimu quality of signal so it ignores AP's under that quality
#define MinimumWifiSignalQuality 8
//#define ESPWifiManualSetup true //uncomment you don't want to use wifimanager for your credential settings on ESP
/*-------------DEFINE YOUR NETWORK PARAMETERS BELOW----------------*/
// Update these with values suitable for your network.
-36
View File
@@ -83,82 +83,46 @@ const byte subnet[] = { 255, 255, 255, 0 }; //ip adress
//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 ZgatewaySRFB
#include "config_SRFB.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_TSL2561.h"
#define ZsensorTSL2561
#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 mega + 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 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"
#endif
/*----------------------------OTHER PARAMETERS-----------------------------*/
#ifdef ZgatewaySRFB