mqtt critical fix

DmytroKorniienko · Nov 5, 2020 · f276d20 · f276d20
1 parent fee53ef
commit f276d20
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 11 deletions.
diff --git a/EmbUI/EmbUI.h b/EmbUI/EmbUI.h
@@ -203,6 +203,12 @@ class EmbUI
 
     char mc[7]; // id из последних 3 байт mac-адреса "ffffff"
 
+    String m_pref; // к сожалению они нужны, т.к. в клиент передаются указатели на уже имеющийся объект, значит на конфиг ссылку отдавать нельзя!!!
+    String m_host;
+    String m_port;
+    String m_user;
+    String m_pass;
+
     void var(const String &key, const String &value, bool force = false);
     void var_create(const String &key, const String &value);
     void section_handle_add(const String &btn, buttonCallback response);

diff --git a/EmbUI/mqtt.cpp b/EmbUI/mqtt.cpp
@@ -9,11 +9,12 @@ extern EmbUI embui;
 void EmbUI::connectToMqtt() {
     LOG(println, PSTR("UI: Connecting to MQTT..."));
 
-    //String m_pref=param(FPSTR(P_m_pref));
-    String m_host=param(FPSTR(P_m_host));
-    String m_port=param(FPSTR(P_m_port));
-    String m_user=param(FPSTR(P_m_user));
-    String m_pass=param(FPSTR(P_m_pass));
+    m_pref=param(FPSTR(P_m_pref));
+    m_host=param(FPSTR(P_m_host));
+    m_port=param(FPSTR(P_m_port));
+    m_user=param(FPSTR(P_m_user));
+    m_pass=param(FPSTR(P_m_pass));
+
     IPAddress ip; 
     bool isIP = ip.fromString(m_host);
     mqttClient.setCredentials(m_user.c_str(), m_pass.c_str());
@@ -22,11 +23,13 @@ void EmbUI::connectToMqtt() {
     else
         mqttClient.setServer(m_host.c_str(), m_port.toInt());
 
+    mqttClient.setClientId(m_pref.isEmpty() ? mc : m_pref.c_str());
+
     mqttClient.connect();
 }
 
 String EmbUI::id(const String &topic){
-    String ret = param(FPSTR(P_m_pref));
+    String ret = m_pref;
     if (ret.isEmpty()) return topic;
 
     ret += '/'; ret += topic;
@@ -56,11 +59,11 @@ void EmbUI::mqtt(const String &pref, const String &host, int port, const String
         LOG(println, PSTR("UI: MQTT host is empty - disabled!"));
         return;   // выходим если host не задан
     }
-    String m_pref=param(FPSTR(P_m_pref));
-    String m_host=param(FPSTR(P_m_host));
-    String m_port=param(FPSTR(P_m_port));
-    String m_user=param(FPSTR(P_m_user));
-    String m_pass=param(FPSTR(P_m_pass));
+    m_pref=param(FPSTR(P_m_pref));
+    m_host=param(FPSTR(P_m_host));
+    m_port=param(FPSTR(P_m_port));
+    m_user=param(FPSTR(P_m_user));
+    m_pass=param(FPSTR(P_m_pass));
     IPAddress ip; 
     bool isIP = ip.fromString(m_host);
 
@@ -81,6 +84,7 @@ void EmbUI::mqtt(const String &pref, const String &host, int port, const String
     mqttClient.onUnsubscribe(onMqttUnsubscribe);
     mqttClient.onMessage(onMqttMessage);
     mqttClient.onPublish(onMqttPublish);
+    mqttClient.setClientId(m_pref.isEmpty() ? mc : m_pref.c_str());
     mqttClient.setCredentials(m_user.c_str(), m_pass.c_str());
     if(isIP)
         mqttClient.setServer(ip, m_port.toInt());