diff --git a/src/config/settings.h b/src/config/settings.h index b1d58f08..8d151030 100644 --- a/src/config/settings.h +++ b/src/config/settings.h @@ -143,9 +143,6 @@ typedef struct { float pf; float current; float voltage; - bool is_valid; - uint16_t total; - uint16_t total_returned; } cfgShellyEM3_t; typedef struct { char monitor_ip[ZEXPORT_ADDR_LEN]; @@ -673,9 +670,6 @@ class settings { obj[str][F("pf")] = mCfg.plugin.zexport.PHASE[i].pf; obj[str][F("current")] = mCfg.plugin.zexport.PHASE[i].current; obj[str][F("voltage")] = mCfg.plugin.zexport.PHASE[i].voltage; - obj[str][F("is_valid")] = mCfg.plugin.zexport.PHASE[i].is_valid; - obj[str][F("total")] = mCfg.plugin.zexport.PHASE[i].total; - obj[str][F("total_returned")] = mCfg.plugin.zexport.PHASE[i].total_returned; } } else diff --git a/src/plugins/zeroExport/zeroExport.h b/src/plugins/zeroExport/zeroExport.h index 0f45da38..cb7d4683 100644 --- a/src/plugins/zeroExport/zeroExport.h +++ b/src/plugins/zeroExport/zeroExport.h @@ -74,9 +74,6 @@ class ZeroExport { mCfg->PHASE[index].pf = (float)json[F("pf")]; mCfg->PHASE[index].current = (float)json[F("current")]; mCfg->PHASE[index].voltage = (float)json[F("voltage")]; - mCfg->PHASE[index].is_valid = (bool)json[F("is_valid")]; - mCfg->PHASE[index].total = (int)json[F("total")]; - mCfg->PHASE[index].total_returned = (int)json[F("total_returned")]; } else { diff --git a/src/web/RestApi.h b/src/web/RestApi.h index 7791a825..a2498db9 100644 --- a/src/web/RestApi.h +++ b/src/web/RestApi.h @@ -497,9 +497,6 @@ class RestApi { phases[F("pf")] = mConfig->plugin.zexport.PHASE[i].pf; phases[F("current")] = mConfig->plugin.zexport.PHASE[i].current; phases[F("voltage")] = mConfig->plugin.zexport.PHASE[i].voltage; - phases[F("is_valid")] = mConfig->plugin.zexport.PHASE[i].is_valid; - phases[F("total")] = mConfig->plugin.zexport.PHASE[i].total; - phases[F("total_returned")] = mConfig->plugin.zexport.PHASE[i].total_returned; } } #endif diff --git a/src/web/html/setup.html b/src/web/html/setup.html index 9ee07f00..08007317 100644 --- a/src/web/html/setup.html +++ b/src/web/html/setup.html @@ -960,6 +960,7 @@ return; } + document.getElementsByName("en_zeroexport")[0].checked = obj["en_zeroexport"]; getAjax("/api/inverter/list", parseZeroIv); for(var i of [["monitor_ipAddr", "monitor_ipAddr"], ["power_avg", "power_avg"], ["count_avg", "count_avg"]])