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

Fixed Duplicate Network Settings and organized (#193)

Browse Source 
* Fix repeated Wi-fi settings

Removed duplicate wi-fi setting, 
Moved and re-arranged related info into relevant section

* Change Comment header

NETWORK -> MQTT for relevant section

* Updated to reflect User_config.h

Updated to reflect User_config.h
This commit is contained in:
George Vedamanickam authored and Florian committed 2018-04-13 19:56:38 +02:00
1 parent d28a1f40dd
commit 4b6b3992b2
2 files changed
+20 -22
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

User_config.h
+9 -14
View File
@@ -31,7 +31,7 @@
/*-------------------VERSION----------------------*/
#define OMG_VERSION "0.7"
/*-------------DEFINE YOUR NETWORK PARAMETERS BELOW----------------*/
/*-------------DEFINE YOUR MQTT PARAMETERS BELOW----------------*/
//MQTT Parameters definition
//#define mqtt_server_name "www.mqtt_broker.com" // instead of defining the server by its IP you can define it by its name, uncomment this line and set the correct MQTT server host name
char mqtt_user[20] = "your_username"; // not compulsory only if your broker needs authentication
@@ -39,19 +39,6 @@ char mqtt_pass[20] = "your_password"; // not compulsory only if your broker need
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 version_Topic Base_Topic Gateway_Name "/version"
@@ -62,6 +49,14 @@ char mqtt_port[6] = "1883";
#define Gateway_AnnouncementMsg "Online"
/*-------------DEFINE YOUR NETWORK PARAMETERS BELOW----------------*/
//#define ESPWifiManualSetup true //uncomment you don't want to use wifimanager for your credential settings on ESP
#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
// Update these with values suitable for your network.
#if defined(ESP32) || defined(ESPWifiManualSetup) // for nodemcu, weemos and esp8266
#define wifi_ssid "wifi ssid"
tests/Test_config.h
+11 -8
View File
@@ -30,31 +30,34 @@
*/
/*-------------------VERSION----------------------*/
#define OMG_VERSION "0.7"
/*-------------DEFINE YOUR NETWORK PARAMETERS BELOW----------------*/
/*-------------DEFINE YOUR MQTT PARAMETERS BELOW----------------*/
//MQTT Parameters definition
//#define mqtt_server_name "www.mqtt_broker.com" // instead of defining the server by its IP you can define it by its name, uncomment this line and set the correct MQTT server host name
char mqtt_user[20] = "your_username"; // not compulsory only if your broker needs authentication
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";
#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
//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----------------*/
//#define ESPWifiManualSetup true //uncomment you don't want to use wifimanager for your credential settings on ESP
#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
// Update these with values suitable for your network.
#ifdef ESP32 // for nodemcu, wemos, esp32 and esp8266
#if defined(ESP32) || defined(ESPWifiManualSetup) // for nodemcu, weemos and esp8266
#define wifi_ssid "wifi ssid"
#define wifi_password "wifi password"
#else // for arduino + W5100