From 58d79beb8c00c5f4c460bd7356d29751208ee861 Mon Sep 17 00:00:00 2001
From: lumapu <lp@lufami.de>
Date: Fri, 22 Apr 2022 20:16:29 +0200
Subject: [PATCH] * send values using mqtt * only send command 0x80 to
 inverter, all replies 0x01, 0x02, 0x03 and 0x84 are received

---
 tools/esp8266/app.cpp   | 53 ++++++++++++++++++++++++++++++++++++-----
 tools/esp8266/defines.h |  2 +-
 tools/esp8266/mqtt.h    | 11 ++++-----
 3 files changed, 52 insertions(+), 14 deletions(-)

diff --git a/tools/esp8266/app.cpp b/tools/esp8266/app.cpp
index 4db8eeee..bf305e7d 100644
--- a/tools/esp8266/app.cpp
+++ b/tools/esp8266/app.cpp
@@ -124,9 +124,9 @@ void app::loop(void) {
         mFlagSend = false;
 
         uint8_t size = 0;
-        if((mSendCnt % 6) == 0)
+        //if((mSendCnt % 6) == 0)
             size = mHoymiles->getTimePacket(mSendBuf, mTimestamp);
-        else if((mSendCnt % 6) == 1)
+        /*else if((mSendCnt % 6) == 1)
             size = mHoymiles->getCmdPacket(mSendBuf, 0x15, 0x81);
         else if((mSendCnt % 6) == 2)
             size = mHoymiles->getCmdPacket(mSendBuf, 0x15, 0x80);
@@ -135,7 +135,7 @@ void app::loop(void) {
         else if((mSendCnt % 6) == 4)
             size = mHoymiles->getCmdPacket(mSendBuf, 0x15, 0x82);
         else if((mSendCnt % 6) == 5)
-            size = mHoymiles->getCmdPacket(mSendBuf, 0x15, 0x84);
+            size = mHoymiles->getCmdPacket(mSendBuf, 0x15, 0x84);*/
 
         //Serial.println("sent packet: #" + String(mSendCnt));
         //dumpBuf(mSendBuf, size);
@@ -150,6 +150,47 @@ void app::loop(void) {
     if(mMqttEvt) {
         mMqttEvt = false;
         mMqtt.isConnected(true);
+        char topic[20], val[10];
+        for(uint8_t i = 0; i < 4; i++) {
+            for(uint8_t j = 0; j < 5; j++) {
+                switch(j) {
+                    default:
+                        sprintf(topic, "ch%d/%s", i, "voltage");
+                        sprintf(val, "%.3f", mDecoder->mData.ch_dc[i/2].u);
+                        break;
+                    case 1:
+                        sprintf(topic, "ch%d/%s", i, "current");
+                        sprintf(val, "%.3f", mDecoder->mData.ch_dc[i].i);
+                        break;
+                    case 2:
+                        sprintf(topic, "ch%d/%s", i, "power");
+                        sprintf(val, "%.3f", mDecoder->mData.ch_dc[i].p);
+                        break;
+                    case 3:
+                        sprintf(topic, "ch%d/%s", i, "yield_day");
+                        sprintf(val, "%.3f", (double)mDecoder->mData.ch_dc[i].y_d);
+                        break;
+                    case 4:
+                        sprintf(topic, "ch%d/%s", i, "yield");
+                        sprintf(val, "%.3f", mDecoder->mData.ch_dc[i].y_t);
+                        break;
+                }
+                if(0 != strncmp("0.000", val, 5)) {
+                    mMqtt.sendMsg(topic, val);
+                    delay(10);
+                }
+            }
+        }
+
+        sprintf(val, "%.3f", mDecoder->mData.ch_ac.u);
+        mMqtt.sendMsg("ac/voltage", val);
+        delay(10);
+        sprintf(val, "%.3f", mDecoder->mData.ch_ac.i);
+        mMqtt.sendMsg("ac/current", val);
+        delay(10);
+        sprintf(val, "%.3f", mDecoder->mData.temp);
+        mMqtt.sendMsg("temperature", val);
+        delay(10);
     }
 }
 
@@ -223,10 +264,10 @@ void app::sendPacket(uint8_t buf[], uint8_t len) {
     mRadio->stopListening();
 
 #ifdef CHANNEL_HOP
-    if(mSendCnt % 6 == 0)
+    //if(mSendCnt % 6 == 0)
         mSendChannel = mHoymiles->getNxtChannel();
-    else
-        mSendChannel = mHoymiles->getLastChannel();
+    //else
+    //    mSendChannel = mHoymiles->getLastChannel();
 #else
     mSendChannel = mHoymiles->getDefaultChannel();
 #endif
diff --git a/tools/esp8266/defines.h b/tools/esp8266/defines.h
index 41b729ab..b965cccb 100644
--- a/tools/esp8266/defines.h
+++ b/tools/esp8266/defines.h
@@ -15,7 +15,7 @@
 //-------------------------------------
 #define VERSION_MAJOR       0
 #define VERSION_MINOR       1
-#define VERSION_PATCH       11
+#define VERSION_PATCH       12
 
 
 //-------------------------------------
diff --git a/tools/esp8266/mqtt.h b/tools/esp8266/mqtt.h
index 84bee525..fdc32303 100644
--- a/tools/esp8266/mqtt.h
+++ b/tools/esp8266/mqtt.h
@@ -31,9 +31,8 @@ class mqtt {
 
         void sendMsg(const char *topic, const char *msg) {
             if(mAddressSet) {
-                uint8_t len = MQTT_TOPIC_LEN + strlen(msg);
-                char top[len];
-                snprintf(top, len, "%s/%s", mTopic, topic);
+                char top[64];
+                snprintf(top, 64, "%s/%s", mTopic, topic);
 
                 if(!mClient->connected())
                     reconnect();
@@ -69,12 +68,10 @@ class mqtt {
         void reconnect(void) {
             if(!mClient->connected()) {
                 String mqttId = "ESP-" + String(random(0xffff), HEX);
-                if((strlen(mUser) > 0) && (strlen(mPwd) > 0)) {
+                if((strlen(mUser) > 0) && (strlen(mPwd) > 0))
                     mClient->connect(mqttId.c_str(), mUser, mPwd);
-                }
-                else {
+                else
                     mClient->connect(mqttId.c_str());
-                }
             }
         }