topaLE
/
ahoy
mirror of https://github.com/lumapu/ahoy.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

0.8.850032-zero

pull/1474/head
Patrick Amrhein 1 year ago
parent
2f17080ff3
commit
fa94909d05
5 changed files with 259 additions and 107 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 9
      src/app.cpp
  2. 18
      src/config/settings.h
  3. 2
      src/defines.h
  4. 247
      src/plugins/zeroExport/zeroExport.h
  5. 86
      src/web/html/setup.html

9
src/app.cpp
View File

@ -172,6 +172,15 @@ void app::loop(void) {
if (mMqttEnabled && mNetworkConnected) if (mMqttEnabled && mNetworkConnected)
mMqtt.loop(); mMqtt.loop();
#endif #endif
// Plugin ZeroExport
#if defined(PLUGIN_ZEROEXPORT)
if(mConfig->nrf.enabled || mConfig->cmt.enabled) {
mZeroExport.loop();
}
#endif
// Plugin ZeroExport - Ende
yield(); yield();
} }

18
src/config/settings.h
View File

@ -198,6 +198,10 @@ typedef struct {
#define ZEROEXPORT_DEF_INV_WAITINGTIME_MS 10000 #define ZEROEXPORT_DEF_INV_WAITINGTIME_MS 10000
#if defined(PLUGIN_ZEROEXPORT) #if defined(PLUGIN_ZEROEXPORT)
enum class zeroExportState : uint8_t {
RESET, GETPOWERMETER, GETINVERTERPOWER, FINISH
};
typedef enum { typedef enum {
None = 0, None = 0,
Shelly = 1, Shelly = 1,
@ -268,7 +272,12 @@ typedef struct {
uint16_t powerMax; uint16_t powerMax;
uint16_t startTimestamp; zeroExportState state;
unsigned long lastRun;
float pmPower;
float pmPowerL1;
float pmPowerL2;
float pmPowerL3;
// uint16_t power; // Aktueller Verbrauch // uint16_t power; // Aktueller Verbrauch
// uint16_t powerLimitAkt; // Aktuelles Limit // uint16_t powerLimitAkt; // Aktuelles Limit
// uint16_t powerHyst; // Hysterese // uint16_t powerHyst; // Hysterese
@ -629,6 +638,13 @@ class settings {
mCfg.plugin.zeroExport.groups[group].refresh = 10; mCfg.plugin.zeroExport.groups[group].refresh = 10;
mCfg.plugin.zeroExport.groups[group].powerTolerance = 10; mCfg.plugin.zeroExport.groups[group].powerTolerance = 10;
mCfg.plugin.zeroExport.groups[group].powerMax = 600; mCfg.plugin.zeroExport.groups[group].powerMax = 600;
//
mCfg.plugin.zeroExport.groups[group].state = zeroExportState::RESET;
mCfg.plugin.zeroExport.groups[group].lastRun = 0;
mCfg.plugin.zeroExport.groups[group].pmPower = 0;
mCfg.plugin.zeroExport.groups[group].pmPowerL1 = 0;
mCfg.plugin.zeroExport.groups[group].pmPowerL2 = 0;
mCfg.plugin.zeroExport.groups[group].pmPowerL3 = 0;
} }
#warning("Defaultsettings") #warning("Defaultsettings")

2
src/defines.h
View File

@ -13,7 +13,7 @@
//------------------------------------- //-------------------------------------
#define VERSION_MAJOR 0 #define VERSION_MAJOR 0
#define VERSION_MINOR 8 #define VERSION_MINOR 8
#define VERSION_PATCH 850023 #define VERSION_PATCH 850032
//------------------------------------- //-------------------------------------
typedef struct { typedef struct {

247
src/plugins/zeroExport/zeroExport.h
View File

@ -57,19 +57,71 @@ class ZeroExport {
continue; continue;
} }
// if (millis() - mCfg->groups[group].startTimestamp < mCfg->groups[group].refresh) { switch (mCfg->groups[group].state) {
// mCfg->groups[group].startTimestamp = mCfg->groups[group].startTimestamp + mCfg->groups[group].refresh; case zeroExportState::RESET:
/* //DBGPRINT(F("State::RESET: "));
//DBGPRINTLN(String(group));
mCfg->groups[group].lastRun = millis();
// Weiter zum nächsten State
mCfg->groups[group].state = zeroExportState::GETPOWERMETER;
break;
case zeroExportState::GETPOWERMETER:
if ((millis() - mCfg->groups[group].lastRun) > (mCfg->groups[group].refresh * 1000UL)) {
//DBGPRINT(F("State::GETPOWERMETER:"));
//DBGPRINTLN(String(group));
if (getPowermeterWatts(group)) { if (getPowermeterWatts(group)) {
mCfg->groups[group].powermeter.nextRun = millis() + mCfg->groups[group].powermeter.interval; // Weiter zum nächsten State
mCfg->groups[group].powermeter.error = 0; mCfg->groups[group].state = zeroExportState::GETINVERTERPOWER;
DBGPRINTLN(String("Powermeter: ") + String(mCfg->groups[group].powermeter.power) + String(" W"));
} else { } else {
mCfg->groups[group].powermeter.error++; // Wartezeit wenn Keine Daten vom Powermeter
continue; mCfg->groups[group].lastRun = (millis() - (mCfg->groups[group].refresh * 100UL));
}
}
break;
case zeroExportState::GETINVERTERPOWER:
if ((millis() - mCfg->groups[group].lastRun) > (mCfg->groups[group].refresh * 1000UL)) {
//DBGPRINT(F("State::GETINVERTERPOWER:"));
//DBGPRINTLN(String(group));
if (getInverterPowerWatts(group)) {
// Weiter zum nächsten State
mCfg->groups[group].state = zeroExportState::FINISH;
} else {
// Wartezeit wenn Keine Daten vom Powermeter
mCfg->groups[group].lastRun = (millis() - (mCfg->groups[group].refresh * 100UL));
} }
}
break;
/*
case 4:
//
mCfg->groups[group].state = zeroExportState::RESET;
break;
case 5:
//
mCfg->groups[group].state = zeroExportState::RESET;
break;
*/ */
// } default:
//
//DBGPRINT(F("State::?: "));
//DBGPRINTLN(String(group));
mCfg->groups[group].state = zeroExportState::RESET;
break;
}
/* /*
if (!mCfg->groups[group].powermeter.error) { if (!mCfg->groups[group].powermeter.error) {
DBGPRINTLN(String("ok verarbeiten.")); DBGPRINTLN(String("ok verarbeiten."));
@ -270,65 +322,149 @@ DBGPRINTLN(String("nok Notmodus."));
bool getPowermeterWatts(uint8_t group) { bool getPowermeterWatts(uint8_t group) {
bool ret = false; bool ret = false;
// switch (mCfg->groups[group].powermeter.type) { DBGPRINT(String("getPowermeterWatts: "));
// case 1: DBGPRINTLN(String(group));
// ret = getPowermeterWattsTibber(); switch (mCfg->groups[group].pm_type) {
// break; case 1:
ret = getPowermeterWattsShelly(group);
break;
// case 2: // case 2:
// ret = getPowermeterWattsShelly(); // ret = getPowermeterWattsTasmota(group);
// break; // break;
// case 3: // case 3:
// ret = getPowermeterWattsTasmota(); // ret = getPowermeterWattsMqtt(group);
// break; // break;
// case 4: // case 4:
// ret = getPowermeterWattsMqtt(); // ret = getPowermeterWattsHichi(group);
// break;
// case 5:
// ret = getPowermeterWattsTibber(group);
// break; // break;
/// default: /// default:
/// ret = false; /// ret = false;
/// break; /// break;
// }
return ret;
} }
return ret;
int getPowermeterWattsTibber(void) {
// TODO:
return 0;
} }
int getPowermeterWattsShelly(void) { int getPowermeterWattsShelly(uint8_t group) {
/* bool ret = false;
HTTPClient http; HTTPClient http;
char url[100] = "http://"; // httpClient.setFollowRedirects(HTTPC_STRICT_FOLLOW_REDIRECTS);
strcat(url, mCfg->monitor_url); httpClient.setUserAgent("Ahoy-Agent");
strcat(url, "/status"); // TODO: Ahoy-0.8.850024-zero
http.begin(url); // httpClient.setConnectTimeout(1000);
// httpClient.setTimeout(1000);
if (http.GET() == 200) // httpClient.addHeader("Content-Type", "application/json");
// httpClient.addHeader("Accept", "application/json");
http.begin(mCfg->groups[group].pm_url);
if (http.GET() == HTTP_CODE_OK)
{ {
// Parsing // Parsing
DynamicJsonDocument doc(2048); DynamicJsonDocument doc(2048);
DeserializationError error = deserializeJson(doc, http.getString()); DeserializationError error = deserializeJson(doc, http.getString());
if (error) if (error)
{ {
Serial.print("deserializeJson() failed: "); DBGPRINT(String("deserializeJson() failed: "));
Serial.println(error.c_str()); DBGPRINTLN(String(error.c_str()));
return 0; return ret;
} }
float total_power = doc["total_power"]; // Shelly 3EM
int Shelly_Power = (int)(total_power + .5); if (doc.containsKey(F("total_power"))) {
return Shelly_Power; mCfg->groups[group].pmPower = doc["total_power"];
*/ ret = true;
/* // Shelly pro 3EM
String url = "http://" + String(SHELLY_IP) + "/status"; } else if (doc.containsKey(F("em:0"))) {
ParsedData = http.get(url).json(); mCfg->groups[group].pmPower = doc["em:0"]["total_act_power"];
int Watts = ParsedData['total_power'].toInt(); ret = true;
return Watts; // Keine Daten
*/ } else {
// } mCfg->groups[group].pmPower = 0;
// http.end(); }
// Shelly 3EM
if (doc.containsKey(F("emeters"))) {
mCfg->groups[group].pmPowerL1 = doc["emeters"][0]["power"];
ret = true;
// Shelly pro 3EM
} else if (doc.containsKey(F("em:0"))) {
mCfg->groups[group].pmPowerL1 = doc["em:0"]["a_act_power"];
ret = true;
// Shelly plus1pm plus2pm
} else if (doc.containsKey(F("switch:0"))) {
mCfg->groups[group].pmPowerL1 = doc["switch:0"]["apower"];
mCfg->groups[group].pmPower += mCfg->groups[group].pmPowerL1;
ret = true;
// Shelly Alternative
} else if (doc.containsKey(F("apower"))) {
mCfg->groups[group].pmPowerL1 = doc["apower"];
mCfg->groups[group].pmPower += mCfg->groups[group].pmPowerL1;
ret = true;
// Keine Daten
} else {
mCfg->groups[group].pmPowerL1 = 0;
}
DBGPRINT(String("pmPowerL1: "));
DBGPRINTLN(String(mCfg->groups[group].pmPowerL1));
// Shelly 3EM
if (doc.containsKey(F("emeters"))) {
mCfg->groups[group].pmPowerL2 = doc["emeters"][1]["power"];
ret = true;
// Shelly pro 3EM
} else if (doc.containsKey(F("em:0"))) {
mCfg->groups[group].pmPowerL2 = doc["em:0"]["b_act_power"];
ret = true;
// Shelly plus1pm plus2pm
} else if (doc.containsKey(F("switch:1"))) {
mCfg->groups[group].pmPowerL2 = doc["switch.1"]["apower"];
mCfg->groups[group].pmPower += mCfg->groups[group].pmPowerL2;
ret = true;
// // Shelly Alternative
// } else if (doc.containsKey(F("apower"))) {
// mCfg->groups[group].pmPowerL2 = doc["apower"];
// mCfg->groups[group].pmPower += mCfg->groups[group].pmPowerL2;
// ret = true;
// Keine Daten
} else {
mCfg->groups[group].pmPowerL2 = 0;
}
DBGPRINT(String("pmPowerL2: "));
DBGPRINTLN(String(mCfg->groups[group].pmPowerL2));
// Shelly 3EM
if (doc.containsKey(F("emeters"))) {
mCfg->groups[group].pmPowerL3 = doc["emeters"][2]["power"];
ret = true;
// Shelly pro 3EM
} else if (doc.containsKey(F("em:0"))) {
mCfg->groups[group].pmPowerL3 = doc["em:0"]["c_act_power"];
ret = true;
// Shelly plus1pm plus2pm
} else if (doc.containsKey(F("switch:2"))) {
mCfg->groups[group].pmPowerL3 = doc["switch:2"]["apower"];
mCfg->groups[group].pmPower += mCfg->groups[group].pmPowerL3;
ret = true;
// // Shelly Alternative
// } else if (doc.containsKey(F("apower"))) {
// mCfg->groups[group].pmPowerL3 = doc["apower"];
// mCfg->groups[group].pmPower += mCfg->groups[group].pmPowerL3;
// ret = true;
// Keine Daten
} else {
mCfg->groups[group].pmPowerL3 = 0;
}
DBGPRINT(String("pmPowerL3: "));
DBGPRINTLN(String(mCfg->groups[group].pmPowerL3));
return 0; DBGPRINT(String("pmPower: "));
DBGPRINTLN(String(mCfg->groups[group].pmPower));
}
http.end();
return ret;
} }
int getPowermeterWattsTasmota(void) { int getPowermeterWattsTasmota(void) {
@ -369,11 +505,30 @@ DBGPRINTLN(String("nok Notmodus."));
return 0; return 0;
} }
int getPowermeterWattsHichi(void) {
// TODO:
return 0;
}
int getPowermeterWattsTibber(void) {
// TODO:
return 0;
}
bool getInverterPowerWatts(uint8_t group) {
bool ret = false;
DBGPRINT(String("getInverterPowerWatts: "));
DBGPRINTLN(String(group));
// switch (mCfg->groups[group].pm_type) {
return ret;
}

86
src/web/html/setup.html
View File

@ -1249,14 +1249,20 @@
divRow("{#ZE_GROUP_TAB_POWERMETER_TYPE}", divRow("{#ZE_GROUP_TAB_POWERMETER_TYPE}",
ml("select", {name: "pm_type", class: "text", id: "pm_type"}, null), ml("select", {name: "pm_type", class: "text", id: "pm_type"}, null),
), ),
divRow("{#ZE_GROUP_TAB_POWERMETER_URL}", divRow("{#ZE_GROUP_TAB_POWERMETER_URL}", [
ml("input", {name: "pm_url", class: "text", type: "text", value: obj.pm_url, maxlength: "100"}, null), ml("input", {name: "pm_url", class: "text", type: "text", value: obj.pm_url, maxlength: "100"}, null),
ml("p", {}, "(3em) - http://IP/status"),
ml("p", {}, "(pro3em) - http://IP/rpc/Shelly.GetStatus"),
ml("p", {}, "(plus1pm) - http://IP/rpc/Shelly.GetStatus"),
ml("p", {}, "(plus2pm) - http://IP/rpc/Shelly.GetStatus"),
ml("p", {}, "(plus1pmAlternative) - http://IP/rpc/switch.GetStatus?id=0"),
ml("p", {}, "(plus2pmAlternative) - http://IP/rpc/switch.GetStatus?id=0"),
ml("p", {}, "A JSON-Format is required to work properly.<br>HICHI: http://IP_Address/cm?cmnd=status%208"), ml("p", {}, "A JSON-Format is required to work properly.<br>HICHI: http://IP_Address/cm?cmnd=status%208"),
), ]),
divRow("{#ZE_GROUP_TAB_POWERMETER_JSONPATH}", divRow("{#ZE_GROUP_TAB_POWERMETER_JSONPATH}", [
ml("input", {name: "pm_jsonPath", class: "text", type: "text", value: obj.pm_jsonPath}, null), ml("input", {name: "pm_jsonPath", class: "text", type: "text", value: obj.pm_jsonPath}, null),
ml("p", {}, "Only for HICHI needed!"), ml("p", {}, "Only for HICHI needed!"),
), ]),
divRow("{#ZE_GROUP_TAB_POWERMETER_USER}", divRow("{#ZE_GROUP_TAB_POWERMETER_USER}",
ml("input", {name: "pm_user", class: "text", type: "text", value: obj.pm_user}, null), ml("input", {name: "pm_user", class: "text", type: "text", value: obj.pm_user}, null),
), ),
@ -1299,7 +1305,6 @@
e.appendChild(opt("3", "Mqtt")); e.appendChild(opt("3", "Mqtt"));
e.appendChild(opt("4", "Hichi")); e.appendChild(opt("4", "Hichi"));
e.appendChild(opt("5", "Tibber")); e.appendChild(opt("5", "Tibber"));
//e.selectedIndex = obj.pm_type;
for (var i = 0; i < e.options.length; i++) { for (var i = 0; i < e.options.length; i++) {
if (e.options[i].value == obj.pm_type) { if (e.options[i].value == obj.pm_type) {
e.selectedIndex = i; e.selectedIndex = i;
@ -1317,11 +1322,9 @@
var e = document.getElementById("invId"+inv); var e = document.getElementById("invId"+inv);
selDelAllOpt(e); selDelAllOpt(e);
e.appendChild(opt("-1", "---")); e.appendChild(opt("-1", "---"));
// TODO: Verhindert die Funktion des selects egal ob -1 oder "-1"
for (var i = 0; i < ivObj.inverter.length; i++) { for (var i = 0; i < ivObj.inverter.length; i++) {
e.appendChild(opt((ivObj.inverter[i].id), (ivObj.inverter[i].name))); e.appendChild(opt((ivObj.inverter[i].id), (ivObj.inverter[i].name)));
} }
//e.selectedIndex = (obj.inverters[inv].id);
for (var i = 0; i < (e.length); i++) { for (var i = 0; i < (e.length); i++) {
if (e.options[i].value == obj.inverters[inv].id) { if (e.options[i].value == obj.inverters[inv].id) {
e.selectedIndex = i; e.selectedIndex = i;
@ -1340,7 +1343,6 @@
e.appendChild(opt("4", "L1 + Sum")); e.appendChild(opt("4", "L1 + Sum"));
e.appendChild(opt("5", "L2 + Sum")); e.appendChild(opt("5", "L2 + Sum"));
e.appendChild(opt("6", "L3 + Sum")); e.appendChild(opt("6", "L3 + Sum"));
//e.selectedIndex = (obj.inverters[inv].target);
for (var i = 0; i < e.options.length; i++) { for (var i = 0; i < e.options.length; i++) {
if (e.options[i].value == obj.inverters[inv].target) { if (e.options[i].value == obj.inverters[inv].target) {
e.selectedIndex = i; e.selectedIndex = i;
@ -1380,10 +1382,8 @@
for(var inv = 0; inv < o.invMax; inv++) { for(var inv = 0; inv < o.invMax; inv++) {
var q = new Object(); var q = new Object();
q.enabled = document.getElementById("invEnabled"+inv).checked; q.enabled = document.getElementById("invEnabled"+inv).checked;
//q.id = document.getElementById("invId"+inv).selectedIndex+1;
var e = document.getElementById("invId"+inv); var e = document.getElementById("invId"+inv);
q.id = e.options[e.selectedIndex].value; q.id = e.options[e.selectedIndex].value;
//q.target = document.getElementById("invTarget"+inv).selectedIndex;
var e = document.getElementById("invTarget"+inv); var e = document.getElementById("invTarget"+inv);
q.target = e.options[e.selectedIndex].value; q.target = e.options[e.selectedIndex].value;
q.twoPercent = document.getElementById("invTwoPercent"+inv).checked; q.twoPercent = document.getElementById("invTwoPercent"+inv).checked;
@ -1422,6 +1422,7 @@
modal("{#ZE_GROUP_DELETE_MODAL}: " + obj.name, html); modal("{#ZE_GROUP_DELETE_MODAL}: " + obj.name, html);
function del() { function del() {
// TODO: Es wäre gut, wenn die Defaultwerte nicht hier sondern wie in der settings.h gesetzt würden.
var o = new Object(); var o = new Object();
o.cmd = "ze_save_group"; o.cmd = "ze_save_group";
// General // General
@ -1435,20 +1436,27 @@
o.pm_user = ""; o.pm_user = "";
o.pm_pass = ""; o.pm_pass = "";
// Inverters // Inverters
// o.ser = 0; o.invMax = obj.inverters.length;
// o.ch = []; o.inverters = [];
// for(let i = 0; i < 6; i++) { for(var inv = 0; inv < o.invMax; inv++) {
// var q = new Object(); var q = new Object();
// q.pwr = 0; q.enabled = false;
// q.name = ""; var e = document.getElementById("invId"+inv);
// q.yld = 0; q.id = -1;
// o.ch.push(q); var e = document.getElementById("invTarget"+inv);
// } q.target = -1;
q.twoPercent = false;
q.powerMax = 0;
o.inverters.push(q);
}
// Battery
o.battEnabled = false;
o.battVoltageOn = 0;
o.battVoltageOff = 0;
// Advanced // Advanced
o.refresh = 10; o.refresh = 10;
o.powerTolerance = 10; o.powerTolerance = 10;
o.powerMax = 600; o.powerMax = 600;
// TODO: Default aus Settings.h laden
// Global // Global
getAjax("/api/setup", cb, "POST", JSON.stringify(o)); getAjax("/api/setup", cb, "POST", JSON.stringify(o));
} }
@ -1510,7 +1518,7 @@
])); ]));
} }
//#warning("groups") // TODO: Das Add sollte anders / überhaupt gelöst werden
var add = new Object(); var add = new Object();
add.enabled = true; add.enabled = true;
add.id = obj.groups.length; add.id = obj.groups.length;
@ -1530,43 +1538,7 @@
// ivGlob(obj); // ivGlob(obj);
//#warning("groups")
// document.getElementsByName("en_zeroexport")[0].checked = obj["en_zeroexport"];
// document.getElementsByName("two_percent")[0].checked = obj["two_percent"];
// document.getElementsByName("query_device")[0].checked = (obj["query_device"] == 1);
// document.getElementsByName("query_device")[1].checked = (obj["query_device"] == 2);
// document.getElementsByName("query_device")[2].checked = (obj["query_device"] == 3);
// getAjax("/api/inverter/list", parseZeroExportIv);
// for(var i of [["monitor_url", "monitor_url"], ["power_avg", "power_avg"], ["count_avg", "count_avg"], ["json_path", "json_path"], ["max_power", "max_power"], ["query_device", "query_device"]])
// for(var i of [["monitor_url", "monitor_url"], ["power_avg", "power_avg"], ["count_avg", "count_avg"], ["json_path", "json_path"], ["max_power", "max_power"]])
// if(null != obj[i[1]])
// document.getElementsByName(i[0])[0].value = obj[i[1]];
// document.getElementsByName("total_power")[0].innerHTML = "Total: " + obj["total_power"].toFixed(2) + "W";
// document.getElementById("Inv_ID").selectedIndex = obj["Iv"];
}
/*
function parseZeroExportGroupInverterId(root) {
e = document.getElementById("");
selDelAllOpt(e);
for (it of root.inverter) {
e.appendChild(opt(it.id, it.name));
}
}
function parseZeroExportGroupIverterTarget(root) {
e = document.getElementById("");
selDelAllOpt(e);
for (it of root.inverter) {
e.appendChild(opt(it.id, it.name));
}
} }
*/
// Plugin ZeroExport - Ende // Plugin ZeroExport - Ende
/*ENDIF_PLUGIN_ZEROEXPORT*/ /*ENDIF_PLUGIN_ZEROEXPORT*/

Write Preview
Loading…
Cancel
Save