improved MQTT

src/app.cpp

@@ -27,6 +27,11 @@ void app::setup(uint32_t timeout) {
     mSettings.getPtr(mConfig);
     DPRINTLN(DBG_INFO, F("Settings valid: ") + String((mSettings.getValid()) ? F("true") : F("false")));
 
+    mSys = new HmSystemType();
+    mSys->enableDebug();
+    mSys->setup(mConfig->nrf.amplifierPower, mConfig->nrf.pinIrq, mConfig->nrf.pinCe, mConfig->nrf.pinCs);
+    mSys->addInverters(&mConfig->inst);
+
 #if !defined(AP_ONLY)
     mMqtt.setup(&mConfig->mqtt, mConfig->sys.deviceName, mVersion, mSys, &mUtcTimestamp, &mSunrise, &mSunset);
 #endif
@@ -34,10 +39,6 @@ void app::setup(uint32_t timeout) {
     mWifi = new ahoywifi(mConfig);
     mWifi->setup(timeout, mSettings.getValid());
 
-    mSys = new HmSystemType();
-    mSys->enableDebug();
-    mSys->setup(mConfig->nrf.amplifierPower, mConfig->nrf.pinIrq, mConfig->nrf.pinCe, mConfig->nrf.pinCs);
-    mSys->addInverters(&mConfig->inst);
 
     mPayload.setup(mSys);
     mPayload.enableSerialDebug(mConfig->serial.debug);
@@ -222,6 +223,9 @@ void app::resetSystem(void) {
     mUtcTimestamp = 0;
 #endif
 
+    mSunrise = 0;
+    mSunset  = 0;
+
     mHeapStatCnt = 0;
 
     mSendTicker = 0xffff;

src/publisher/pubMqtt.h

@@ -29,7 +29,9 @@ template<class HMSYSTEM>
 class PubMqtt {
     public:
         PubMqtt() {
+            mRxCnt = 0;
             mTxCnt = 0;
+            mEnReconnect = false;
         }
 
         ~PubMqtt() { }
@@ -43,6 +45,8 @@ class PubMqtt {
             mSunrise        = sunrise;
             mSunset         = sunset;
 
+            snprintf(mLwtTopic, MQTT_TOPIC_LEN + 7, "%s/status", mCfgMqtt->topic);
+
             mHWifiCon = WiFi.onStationModeGotIP(std::bind(&PubMqtt::onWifiConnect, this, std::placeholders::_1));
             mHWifiDiscon = WiFi.onStationModeDisconnected(std::bind(&PubMqtt::onWifiDisconnect, this, std::placeholders::_1));
 
@@ -51,11 +55,10 @@ class PubMqtt {
                 mClient.setCredentials(mCfgMqtt->user, mCfgMqtt->pwd);
             mClient.setClientId(mDevName); // TODO: add mac?
             mClient.setServer(mCfgMqtt->broker, mCfgMqtt->port);
+            mClient.setWill(mLwtTopic, QOS_0, true, mLwtOffline);
             mClient.onConnect(std::bind(&PubMqtt::onConnect, this, std::placeholders::_1));
             mClient.onDisconnect(std::bind(&PubMqtt::onDisconnect, this, std::placeholders::_1));
-            mClient.onSubscribe(std::bind(&PubMqtt::onSubscribe, this, std::placeholders::_1, std::placeholders::_2, std::placeholders::_3));
+            mClient.onMessage(std::bind(&PubMqtt::onMessage, this, std::placeholders::_1, std::placeholders::_2, std::placeholders::_3, std::placeholders::_4, std::placeholders::_5, std::placeholders::_6));
-            mClient.onPublish(std::bind(&PubMqtt::onPublish, this, std::placeholders::_1));
-            //mClient.setWill
         }
 
         void loop() {
@@ -71,6 +74,11 @@ class PubMqtt {
             snprintf(val, 12, "%ld", millis() / 1000);
             publish("uptime", val);
             publish("wifi_rssi", String(WiFi.RSSI()).c_str());
+
+            if(!mClient.connected()) {
+                if(mEnReconnect)
+                    mClient.connect();
+            }
         }
 
         void tickerHour() {
@@ -78,10 +86,13 @@ class PubMqtt {
             publish("sunset", String(*mSunset).c_str(), true);
         }
 
-        void publish(const char *subTopic, const char *payload, bool retained = false) {
+        void publish(const char *subTopic, const char *payload, bool retained = false, bool addTopic = true) {
             char topic[MQTT_TOPIC_LEN + 2];
             snprintf(topic, (MQTT_TOPIC_LEN + 2), "%s/%s", mCfgMqtt->topic, subTopic);
+            if(addTopic)
                 mClient.publish(topic, QOS_0, retained, payload);
+            else
+                mClient.publish(subTopic, QOS_0, retained, payload);
             mTxCnt++;
         }
 
@@ -99,6 +110,10 @@ class PubMqtt {
             return mTxCnt;
         }
 
+        inline uint32_t getRxCnt(void) {
+            return mRxCnt;
+        }
+
         void payloadEventListener(uint8_t cmd) {
             mSendList.push(cmd);
         }
@@ -112,11 +127,11 @@ class PubMqtt {
                 if (NULL != iv) {
                     record_t<> *rec = iv->getRecordStruct(RealTimeRunData_Debug);
                     DynamicJsonDocument deviceDoc(128);
-                    deviceDoc["name"] = iv->config->name;
+                    deviceDoc[F("name")] = iv->config->name;
-                    deviceDoc["ids"] = String(iv->config->serial.u64, HEX);
+                    deviceDoc[F("ids")] = String(iv->config->serial.u64, HEX);
-                    deviceDoc["cu"] = F("http://") + String(WiFi.localIP().toString());
+                    deviceDoc[F("cu")] = F("http://") + String(WiFi.localIP().toString());
-                    deviceDoc["mf"] = "Hoymiles";
+                    deviceDoc[F("mf")] = F("Hoymiles");
-                    deviceDoc["mdl"] = iv->config->name;
+                    deviceDoc[F("mdl")] = iv->config->name;
                     JsonObject deviceObj = deviceDoc.as<JsonObject>();
                     DynamicJsonDocument doc(384);
 
@@ -132,19 +147,19 @@ class PubMqtt {
                         const char *devCls = getFieldDeviceClass(rec->assign[i].fieldId);
                         const char *stateCls = getFieldStateClass(rec->assign[i].fieldId);
 
-                        doc["name"] = name;
+                        doc[F("name")] = name;
-                        doc["stat_t"] = stateTopic;
+                        doc[F("stat_t")] = stateTopic;
-                        doc["unit_of_meas"] = iv->getUnit(i, rec);
+                        doc[F("unit_of_meas")] = iv->getUnit(i, rec);
-                        doc["uniq_id"] = String(iv->config->serial.u64, HEX) + "_" + uniq_id;
+                        doc[F("uniq_id")] = String(iv->config->serial.u64, HEX) + "_" + uniq_id;
-                        doc["dev"] = deviceObj;
+                        doc[F("dev")] = deviceObj;
-                        doc["exp_aft"] = MQTT_INTERVAL + 5;  // add 5 sec if connection is bad or ESP too slow @TODO: stimmt das wirklich als expire!?
+                        doc[F("exp_aft")] = MQTT_INTERVAL + 5;  // add 5 sec if connection is bad or ESP too slow @TODO: stimmt das wirklich als expire!?
                         if (devCls != NULL)
-                            doc["dev_cla"] = devCls;
+                            doc[F("dev_cla")] = devCls;
                         if (stateCls != NULL)
-                            doc["stat_cla"] = stateCls;
+                            doc[F("stat_cla")] = stateCls;
 
                         serializeJson(doc, buffer);
-                        publish(discoveryTopic, buffer, true);
+                        publish(discoveryTopic, buffer, true, false);
                         doc.clear();
                     }
 
@@ -160,17 +175,22 @@ class PubMqtt {
         }
 
         void onWifiDisconnect(const WiFiEventStationModeDisconnected& event) {
-            DPRINTLN(DBG_WARN, F("TODO: MQTT reconnect!"));
+            mEnReconnect = false;
         }
 
         void onConnect(bool sessionPreset) {
             DPRINTLN(DBG_INFO, F("MQTT connected"));
+            mEnReconnect = true;
 
             publish("version", mVersion, true);
             publish("device", mDevName, true);
             publish("uptime", "0");
 
-            subscribe("devcontrol/#"); // TODO: register onMessage callback!
+            publish(mLwtTopic, mLwtOnline, true, false);
+
+            subscribe("ctrl/#");
+            subscribe("setup/#");
+            subscribe("status/#");
         }
 
         void onDisconnect(espMqttClientTypes::DisconnectReason reason) {
@@ -199,58 +219,57 @@ class PubMqtt {
             }
         }
 
-        void onSubscribe(uint16_t packetId, const espMqttClientTypes::SubscribeReturncode* codes, size_t len) {
+        void onMessage(const espMqttClientTypes::MessageProperties& properties, const char* topic, const uint8_t* payload, size_t len, size_t index, size_t total) {
-            DPRINTLN(DBG_INFO, F("MQTT Subscribe"));
+            DPRINTLN(DBG_VERBOSE, F("MQTT got topic: ") + String(topic));
-            Serial.print("  packetId: ");
+            char *tpc = new char[strlen(topic) + 1];
-            Serial.println(packetId);
+            uint8_t cnt = 0;
-            for (size_t i = 0; i < len; ++i) {
+            DynamicJsonDocument json(128);
-                Serial.print("  qos: ");
+            JsonObject root = json.to<JsonObject>();
-                Serial.println(static_cast<uint8_t>(codes[i]));
+
-            }
+            strncpy(tpc, topic, strlen(topic) + 1);
+            if(len > 0) {
+                char *pyld = new char[len + 1];
+                strncpy(pyld, (const char*)payload, len);
+                pyld[len] = '\0';
+                root["val"] = atoi(pyld);
+                delete[] pyld;
             }
 
-        void onPublish(uint16_t packetId) {
+            char *p = strtok(tpc, "/");
-            Serial.println("Publish acknowledged.");
+            p = strtok(NULL, "/"); // remove mCfgMqtt->topic
-            Serial.print("  packetId: ");
+            while(NULL != p) {
-            Serial.println(packetId);
+                if(0 == cnt) {
+                    if(0 == strncmp(p, "ctrl", 4)) {
+                        if(NULL != (p = strtok(NULL, "/"))) {
+                            root[F("path")] = F("ctrl");
+                            root[F("cmd")] = p;
                         }
-
+                    } else if(0 == strncmp(p, "setup", 5)) {
-
+                        if(NULL != (p = strtok(NULL, "/"))) {
-        /*void reconnect(void) {
+                            root[F("path")] = F("setup");
-            DPRINTLN(DBG_DEBUG, F("mqtt.h:reconnect"));
+                            root[F("setup")] = p;
-            DPRINTLN(DBG_DEBUG, F("MQTT mClient->_state ") + String(mClient->state()) );
+                        }
-
+                    } else if(0 == strncmp(p, "status", 6)) {
-            #ifdef ESP8266
+                        if(NULL != (p = strtok(NULL, "/"))) {
-                DPRINTLN(DBG_DEBUG, F("WIFI mEspClient.status ") + String(mEspClient.status()) );
+                            root[F("path")] = F("status");
-            #endif
+                            root[F("cmd")] = p;
-
-            boolean resub = false;
-            if(!mClient->connected() && (millis() - mLastReconnect) > MQTT_RECONNECT_DELAY ) {
-                mLastReconnect = millis();
-                if(strlen(mDevName) > 0) {
-                    // der Server und der Port müssen neu gesetzt werden,
-                    // da ein MQTT_CONNECTION_LOST -3 die Werte zerstört hat.
-                    mClient->setServer(mCfgMqtt->broker, mCfgMqtt->port);
-                    mClient->setBufferSize(MQTT_MAX_PACKET_SIZE);
-
-                    char lwt[MQTT_TOPIC_LEN + 7 ]; // "/uptime" --> + 7 byte
-                    snprintf(lwt, MQTT_TOPIC_LEN + 7, "%s/uptime", mCfgMqtt->topic);
-
-                    if((strlen(mCfgMqtt->user) > 0) && (strlen(mCfgMqtt->pwd) > 0))
-                        resub = mClient->connect(mDevName, mCfgMqtt->user, mCfgMqtt->pwd, lwt, 0, false, "offline");
-                    else
-                        resub = mClient->connect(mDevName, lwt, 0, false, "offline");
-                        // ein Subscribe ist nur nach einem connect notwendig
-                    if(resub) {
-                        char topic[MQTT_TOPIC_LEN + 13 ]; // "/devcontrol/#" --> + 6 byte
-                        // ToDo: "/devcontrol/#" is hardcoded
-                        snprintf(topic, MQTT_TOPIC_LEN + 13, "%s/devcontrol/#", mCfgMqtt->topic);
-                        DPRINTLN(DBG_INFO, F("subscribe to ") + String(topic));
-                        mClient->subscribe(topic); // subscribe to mTopic + "/devcontrol/#"
                         }
                     }
                 }
-        }*/
+                else if(1 == cnt) {
+                    root["id"] = atoi(p);
+                }
+                p = strtok(NULL, "/");
+                cnt++;
+            }
+            delete[] tpc;
+
+            char out[128];
+            serializeJson(root, out, 128);
+            DPRINTLN(DBG_INFO, "json: " + String(out));
+
+            mRxCnt++;
+        }
 
         const char *getFieldDeviceClass(uint8_t fieldId) {
             uint8_t pos = 0;
@@ -487,11 +506,16 @@ class PubMqtt {
         uint32_t *mSunrise, *mSunset;
         HMSYSTEM *mSys;
         uint32_t *mUtcTimestamp;
-        uint32_t mTxCnt;
+        uint32_t mRxCnt, mTxCnt;
         std::queue<uint8_t> mSendList;
+        bool mEnReconnect;
+
+        // last will topic and payload must be available trough lifetime of 'espMqttClient'
+        char mLwtTopic[MQTT_TOPIC_LEN+7];
+        const char* mLwtOnline = "online";
+        const char* mLwtOffline = "offline";
 
         const char *mDevName, *mVersion;
-        //uint32_t mLastReconnect;
 };
 
 #endif /*__PUB_MQTT_H__*/

src/web/html/update.html

@@ -18,12 +18,6 @@
         </div>
         <div id="wrapper">
             <div id="content">
-                <div>
-                    Make sure that you have noted all your settings before starting an update. New versions may have changed their memory layout which can break your existing settings.<br/>
-                    <br/>
-                    <a href="/get_setup" target="_blank">Download your settings (JSON file)</a>
-                </div>
-                <br/><br/>
                 <form method="POST" action="/update" enctype="multipart/form-data" accept-charset="utf-8">
                     <input type="file" name="update"><input type="submit" value="Update">
                 </form>