Browse Source

First dry run

pull/1155/head
DanielR92 2 years ago
parent
commit
1aafe910d2
  1. 23
      src/plugins/zeroExport/zeroExport.h
  2. 2
      src/web/html/setup.html

23
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;
}

2
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"];
}

Loading…
Cancel
Save