55#include < PubSubClient.h>
66#include " MqttEntry.h"
77#include " WebPortal.h"
8- #include " ConfigEntry.h"
98
109class EasyMqtt : public MqttEntry {
1110 private:
1211 WiFiClient wifiClient;
1312 PubSubClient mqttClient;
1413 WebPortal webPortal;
1514
16- ConfigEntry* configEntry;
17-
1815 String deviceId = " deviceId"
1916 long mqttDelay = 0 ;
2017
18+ const char * wifi_ssid = " N/A"
19+ const char * wifi_password = " N/A"
20+
21+ const char * mqtt_host = " N/A"
22+ int mqtt_port = 1883 ;
23+ const char * mqtt_username = " N/A"
24+ const char * mqtt_password = " N/A"
25+
2126 protected:
2227 /* *
2328 Handle connections to mqtt
2429 */
2530 void connectWiFi () {
2631 if (WiFi.status () == WL_DISCONNECTED) {
27- debug (" Connecting to wifi: " + config (). getString ( " wifi.ssid " , " " ) );
32+ debug (" Connecting to wifi"
2833 WiFi.mode (WIFI_STA);
2934
30- WiFi.begin (config (). getCString ( " wifi.ssid " , " " ), config (). getCString ( " wifi.password " , " " ) );
35+ WiFi.begin (wifi_ssid, wifi_password );
3136
3237 #ifdef DEBUG
3338 WiFi.printDiag (Serial);
@@ -45,7 +50,7 @@ class EasyMqtt : public MqttEntry {
4550 } else {
4651 debug (" WiFi connection timeout - Setup AP"
4752 WiFi.mode (WIFI_AP);
48- WiFi.softAP (config (). getCString ( " wifi.ap " , " EasyMqtt" ) , " 123456"
53+ WiFi.softAP (" EasyMqtt" " 123456"
4954 debug (" IP address" softAPIP ().toString ());
5055 }
5156 debug (" devideId"
@@ -63,9 +68,9 @@ class EasyMqtt : public MqttEntry {
6368 });
6469 });
6570
66- mqttClient.setServer (config (). getCString ( " mqtt.host " , " " ), config (). getInt ( " mqtt.port " , 1883 ) );
71+ mqttClient.setServer (mqtt_host, mqtt_port );
6772
68- if (mqttClient.connect (deviceId.c_str (), config (). getCString ( " mqtt.username " , " " ), config (). getCString ( " mqtt.password " , " " ) )) {
73+ if (mqttClient.connect (deviceId.c_str (), mqtt_username, mqtt_password )) {
6974 debug (" Connected to MQTT"
7075
7176 setPublishFunction ([&](MqttEntry* entry, String message){
@@ -95,16 +100,12 @@ class EasyMqtt : public MqttEntry {
95100 #endif
96101 deviceId = String (ESP.getChipId ());
97102
98- configEntry = new ConfigEntry (mqttClient, *this );
99- addChild (configEntry);
103+ setInterval (10 );
100104
101105 get (" system" setInterval (30 );
102106 get (" system" " deviceId" this ]() {
103107 return deviceId;
104108 };
105- get (" system" " name" this ]() {
106- return config ().getString (" device.name"
107- };
108109 get (" system" " mem" " heap"
109110 return String (ESP.getFreeHeap ());
110111 };
@@ -140,11 +141,6 @@ class EasyMqtt : public MqttEntry {
140141 ESP.restart ();
141142 }
142143 };
143- get (" system" " config" " reset" this ](String value) {
144- if (value == " reset"
145- config ().reset ();
146- }
147- };
148144 }
149145
150146 void debug (String msg) {
@@ -160,10 +156,6 @@ class EasyMqtt : public MqttEntry {
160156 debug (key + " = "
161157 }
162158
163- ConfigEntry & config () {
164- return *configEntry;
165- }
166-
167159 void debug (String msg) {
168160 #ifdef DEBUG
169161 Serial.println (msg);
@@ -190,19 +182,19 @@ class EasyMqtt : public MqttEntry {
190182 Deprecated
191183 */
192184 void wifi (const char * ssid, const char * password) {
193- config (). set ( " wifi. ssid" , ssid) ;
194- config (). set ( " wifi. password" , password) ;
185+ wifi_ssid = ssid;
186+ wifi_password = password;
195187 }
196188
197189 /* *
198190 Configure mqtt
199191 Deprecated
200192 */
201193 void mqtt (const char * host, int port, const char * username, const char * password) {
202- config (). set ( " mqtt. host" , host) ;
203- config (). set ( " mqtt. port" , String (port)) ;
204- config (). set ( " mqtt. username" , username) ;
205- config (). set ( " mqtt. password" , password) ;
194+ mqtt_host = host;
195+ mqtt_port = port;
196+ mqtt_username = username;
197+ mqtt_password = password;
206198 }
207199
208200 /* *
0 commit comments