MQTT fix

jniebuhr · Feb 1, 2025 · 0ce7c95 · 0ce7c95
1 parent 3d14266
commit 0ce7c95
Show file tree

Hide file tree

Showing 7 changed files with 30 additions and 17 deletions.
diff --git a/data/assets/index-uXV-rOlN.js → data/assets/index-BgUxzvid.js b/data/assets/index-uXV-rOlN.js → data/assets/index-BgUxzvid.js
diff --git a/platformio.ini b/platformio.ini
@@ -33,7 +33,7 @@ build_flags =
     -std=c++17
     -std=gnu++17
 	-DLV_CONF_INCLUDE_SIMPLE
-	-DLV_CONF_PATH=${platformio.src_dir}/display/lv_conf.h
+	-DLV_CONF_PATH="${platformio.src_dir}"/display/lv_conf.h
 	-DDISABLE_ALL_LIBRARY_WARNINGS
 	-DLV_CONF_SUPPRESS_DEFINE_CHECK
 	-DARDUINO_USB_CDC_ON_BOOT=1

diff --git a/src/display/plugins/MQTTPlugin.cpp b/src/display/plugins/MQTTPlugin.cpp
@@ -1,22 +1,31 @@
 #include "MQTTPlugin.h"
 #include "../core/Controller.h"
 
+void MQTTPlugin::connect(Controller *controller) {
+    Settings settings = controller->getSettings();
+    String ip = settings.getHomeAssistantIP();
+    int haPort = settings.getHomeAssistantPort();
+    String clientId = "GaggiMate";
+    String haUser = settings.getHomeAssistantUser();
+    String haPassword = settings.getHomeAssistantPassword();
+    int keepAline = 60;
+
+    client.begin(ip.c_str(), haPort, net);
+    while (!client.connect(clientId.c_str(), haUser.c_str(), haPassword.c_str())) {
+        void setKeepAlive(int keepAlive);
+        Serial.print(".");
+        delay(5000);
+    }
+}
+
 void MQTTPlugin::setup(Controller *controller, PluginManager *pluginManager) {
     pluginManager->on("controller:wifi:connect", [this, controller](Event& event) {
-        Settings settings = controller->getSettings();
-        String ip = settings.getHomeAssistantIP();
-        String clientId = "GaggiMate";
-        String haUser = settings.getHomeAssistantUser();
-        String haPassword = settings.getHomeAssistantPassword();
-        char hostname[ip.length() + 2];
-        ip.toCharArray(hostname, ip.length());
-        client.begin(hostname, settings.getHomeAssistantPort(), net);
-        client.connect(clientId.c_str(), haUser.c_str(), haPassword.c_str());
+        connect(controller);
         String mac = WiFi.macAddress();
         mac.replace(":", "_");
         const char* cmac = mac.c_str();
         char topic[50], json[500];
-        sprintf(topic, "homeassistant/device/%s/config", cmac);
+        sprintf(topic, "gaggimate/%s/config", cmac);
         sprintf(json, R"***({"dev":{"ids":"%s","name":"GaggiMate","mf":"GaggiMate","mdl":"GaggiMate","sw":"1.0","sn":"%s","hw":"1.0"},"o":{"name":"GaggiMate","sw":"v0.3.0","url":"https://gaggimate.eu/"},"cmps":{"boiler":{"p":"sensor","device_class":"temperature","unit_of_measurement":"°C","value_template":"{{ value_json.temperature }}","unique_id":"boiler0Tmp","state_topic":"gaggimate/%s/boilers/0/temperature"}},"state_topic":"gaggimate/%s/state","qos":2})***", cmac, cmac, cmac, cmac);
         client.publish(topic, json);
     });

diff --git a/src/display/plugins/MQTTPlugin.h b/src/display/plugins/MQTTPlugin.h
@@ -7,6 +7,7 @@
 class MQTTPlugin : public Plugin {
 public:
     void setup(Controller *controller, PluginManager *pluginManager) override;
+    void connect(Controller *controller);
     void loop() override {};
 private:
     MQTTClient client;

diff --git a/src/display/plugins/WebUIPlugin.cpp b/src/display/plugins/WebUIPlugin.cpp
@@ -121,9 +121,9 @@ void WebUIPlugin::handleSettings(AsyncWebServerRequest *request) {
             settings->setSmartGrindToggle(request->hasArg("smartGrindToggle"));
             settings->setHomeAssistant(request->hasArg("homeAssistant"));
             if (request->hasArg("haUser"))
-                settings->setHomeAssistantIP(request->arg("haUser"));
+                settings->setHomeAssistantUser(request->arg("haUser"));
             if (request->hasArg("haPassword"))
-                settings->setHomeAssistantIP(request->arg("haPassword"));
+                settings->setHomeAssistantPassword(request->arg("haPassword"));
             if (request->hasArg("haIP"))
                 settings->setHomeAssistantIP(request->arg("haIP"));
             if (request->hasArg("haPort"))

diff --git a/web/index.html b/web/index.html
@@ -4,6 +4,9 @@
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <meta name="color-scheme" content="light dark" />
+    <meta http-equiv="Cache-Control" content="no-cache, no-store, must-revalidate" />
+    <meta http-equiv="Pragma" content="no-cache" />
+    <meta http-equiv="Expires" content="0" />
     <link rel="shortcut icon" type="image/svg+xml" href="/gm.svg" />
     <link rel="preconnect" href="https://fonts.googleapis.com" />
     <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin />

diff --git a/web/src/pages/Settings/index.jsx b/web/src/pages/Settings/index.jsx
@@ -410,7 +410,7 @@ export function Settings() {
                         name="haUser"
                         type="text"
                         className="input-field"
-                        placeholder="0"
+                        placeholder="user"
                         value={formData.haUser}
                         onChange={onChange('haUser')}
                     />
@@ -424,8 +424,8 @@ export function Settings() {
                         name="haPassword"
                         type="password"
                         className="input-field"
-                        placeholder="0"
-                        value={formData.haUser}
+                        placeholder="password"
+                        value={formData.haPassword}
                         onChange={onChange('haPassword')}
                     />
                   </div>