From 1aafe910d2bdf432608fa9fd96f17fdb72fc4067 Mon Sep 17 00:00:00 2001
From: DanielR92 <DanielR92@users.noreply.github.com>
Date: Sun, 24 Sep 2023 20:41:25 +0200
Subject: [PATCH] First dry run

---
 src/plugins/zeroExport/zeroExport.h | 23 ++++++++++++++++++++---
 src/web/html/setup.html             |  2 +-
 2 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/src/plugins/zeroExport/zeroExport.h b/src/plugins/zeroExport/zeroExport.h
index 5056bc80..35e3dd6d 100644
--- a/src/plugins/zeroExport/zeroExport.h
+++ b/src/plugins/zeroExport/zeroExport.h
@@ -80,22 +80,39 @@ class ZeroExport {
             {
                 DynamicJsonDocument json(2048);
                 DeserializationError err = deserializeJson(json, http.getString());
-                mCfg->total_power = (double)json[F("total_power")];
 
                 // Parse succeeded?
                 if (err) {
                     DPRINTLN(DBG_INFO, (F("Shelly() returned: ")));
                     DPRINTLN(DBG_INFO, String(err.f_str()));
-                    return 0;
+                    return 2;
                 }
 
+                mCfg->total_power = (double)json[F("total_power")];
                 return 1;
             }
-            return 0;
+            return 2;
         }
 
         int Hichi()
         {
+            http.begin(String(mCfg->monitor_ip), 80, "/cm?cmnd=status%208");
+            int httpResponseCode = http.GET();
+            if (httpResponseCode > 0)
+            {
+                DynamicJsonDocument json(2048);
+                DeserializationError err = deserializeJson(json, http.getString());
+
+                // Parse succeeded?
+                if (err) {
+                    DPRINTLN(DBG_INFO, (F("Hichi() returned: ")));
+                    DPRINTLN(DBG_INFO, String(err.f_str()));
+                    return 0;
+                }
+
+                mCfg->total_power = (double)json["StatusSNS"]["ENERGY"]["Power"];
+                return 2;
+            }
             return 0;
         }
 
diff --git a/src/web/html/setup.html b/src/web/html/setup.html
index 824a67cc..d8ed35a7 100644
--- a/src/web/html/setup.html
+++ b/src/web/html/setup.html
@@ -965,7 +965,7 @@
                     if(null != obj[i[1]])
                         document.getElementsByName(i[0])[0].value = obj[i[1]];
 
-                document.getElementsByName("total_power")[0].innerHTML = obj["total_power"].toFixed(2) + "W";
+                document.getElementsByName("total_power")[0].innerHTML = "Total: " + obj["total_power"].toFixed(2) + "W";
                 document.getElementById("Inv_ID").selectedIndex = obj["Iv"];
             }