3pp-mirror/ahoy
1
0
Fork 0
mirror of https://github.com/lumapu/ahoy.git synced 2025-07-29 22:27:13 +02:00
Code Issues Projects Releases Packages Wiki Activity

0.8.910012-zero

Browse source
This commit is contained in:
Patrick Amrhein 2024-03-15 12:19:54 +01:00
parent 40ad725bab
commit 93164e9ef1
2 changed files with 88 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

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 910011 #define VERSION_PATCH 910012
//------------------------------------- //-------------------------------------
typedef struct { typedef struct {

134
src/plugins/zeroExport/zeroExport.h
View file

@ -66,10 +66,6 @@ class ZeroExport {
switch (mCfg->groups[group].state) { switch (mCfg->groups[group].state) {
case zeroExportState::INIT: case zeroExportState::INIT:
if (groupInit(group)) sendLog(); if (groupInit(group)) sendLog();
//#if defined(ZEROEXPORT_DEV_POWERMETER)
//mCfg->groups[group].state = zeroExportState::WAITREFRESH;
//mCfg->groups[group].stateNext = zeroExportState::WAITREFRESH;
//#endif
break; break;
case zeroExportState::WAIT: case zeroExportState::WAIT:
if (groupWait(group)) sendLog(); if (groupWait(group)) sendLog();
@ -288,7 +284,7 @@ mCfg->groups[group].lastRefresh = millis();;
mLog["B"] = bTsp; mLog["B"] = bTsp;
// Wait 60s // Wait 60s
if (mCfg->groups[group].lastRun >= (bTsp - 60000UL)) { if (bTsp <= (mCfg->groups[group].lastRun + 60000UL)) {
return result; return result;
} }
@ -327,7 +323,7 @@ mCfg->groups[group].lastRefresh = millis();;
mLog["B"] = bTsp; mLog["B"] = bTsp;
// Wait Refreshtime // Wait Refreshtime
if (mCfg->groups[group].lastRefresh + (mCfg->groups[group].refresh * 1000UL) >= bTsp) { if (bTsp <= (mCfg->groups[group].lastRefresh + (mCfg->groups[group].refresh * 1000UL))) {
return result; return result;
} }
@ -336,14 +332,15 @@ mCfg->groups[group].lastRefresh = millis();;
result = true; result = true;
// Next // Next
#if defined(ZEROEXPORT_DEV_POWERMETER) #if defined(ZEROEXPORT_DEV_POWERMETER)
mCfg->groups[group].state = zeroExportState::GETPOWERMETER; mCfg->groups[group].state = zeroExportState::GETPOWERMETER;
mCfg->groups[group].stateNext = zeroExportState::GETPOWERMETER; mCfg->groups[group].stateNext = zeroExportState::GETPOWERMETER;
#else mLog["next"] = "WAITREFRESH";
#else
mCfg->groups[group].state = zeroExportState::GETINVERTERACKS; mCfg->groups[group].state = zeroExportState::GETINVERTERACKS;
mCfg->groups[group].stateNext = zeroExportState::GETINVERTERACKS; mCfg->groups[group].stateNext = zeroExportState::GETINVERTERACKS;
mLog["next"] = "GETINVERTERACKS"; mLog["next"] = "GETINVERTERACKS";
#endif #endif
unsigned long eTsp = millis(); unsigned long eTsp = millis();
mLog["E"] = eTsp; mLog["E"] = eTsp;
@ -364,9 +361,9 @@ mCfg->groups[group].stateNext = zeroExportState::GETPOWERMETER;
mLog["type"] = "groupGetInverterAcks"; mLog["type"] = "groupGetInverterAcks";
mLog["B"] = bTsp; mLog["B"] = bTsp;
// Wait 100ms // Wait 250ms
if (mCfg->groups[group].stateLast == zeroExportState::GETINVERTERACKS) { if (mCfg->groups[group].stateLast == zeroExportState::GETINVERTERACKS) {
if (mCfg->groups[group].lastRun >= (bTsp - 100UL)) { if (bTsp <= (mCfg->groups[group].lastRun + 250UL)) {
return doLog; return doLog;
} }
} }
@ -1347,13 +1344,13 @@ result = true;
bool getPowermeterWattsShelly(JsonObject logObj, uint8_t group) { bool getPowermeterWattsShelly(JsonObject logObj, uint8_t group) {
bool result = false; bool result = false;
logObj["mod"] = "getPowermeterWattsShelly";
mCfg->groups[group].pmPower = 0; mCfg->groups[group].pmPower = 0;
mCfg->groups[group].pmPowerL1 = 0; mCfg->groups[group].pmPowerL1 = 0;
mCfg->groups[group].pmPowerL2 = 0; mCfg->groups[group].pmPowerL2 = 0;
mCfg->groups[group].pmPowerL3 = 0; mCfg->groups[group].pmPowerL3 = 0;
long int bTsp = millis();
HTTPClient http; HTTPClient http;
http.setFollowRedirects(HTTPC_STRICT_FOLLOW_REDIRECTS); http.setFollowRedirects(HTTPC_STRICT_FOLLOW_REDIRECTS);
http.setUserAgent("Ahoy-Agent"); http.setUserAgent("Ahoy-Agent");
@ -1462,7 +1459,6 @@ result = true;
} }
http.end(); http.end();
long int eTsp = millis();
logObj["P"] = mCfg->groups[group].pmPower; logObj["P"] = mCfg->groups[group].pmPower;
logObj["P1"] = mCfg->groups[group].pmPowerL1; logObj["P1"] = mCfg->groups[group].pmPowerL1;
logObj["P2"] = mCfg->groups[group].pmPowerL2; logObj["P2"] = mCfg->groups[group].pmPowerL2;
@ -1475,8 +1471,16 @@ result = true;
* getPowermeterWattsTasmota * getPowermeterWattsTasmota
*/ */
bool getPowermeterWattsTasmota(JsonObject logObj, uint8_t group) { bool getPowermeterWattsTasmota(JsonObject logObj, uint8_t group) {
bool result = false;
logObj["mod"] = "getPowermeterWattsTasmota";
mCfg->groups[group].pmPower = 0;
mCfg->groups[group].pmPowerL1 = 0;
mCfg->groups[group].pmPowerL2 = 0;
mCfg->groups[group].pmPowerL3 = 0;
// TODO: nicht komplett // TODO: nicht komplett
bool ret = false;
HTTPClient http; HTTPClient http;
http.setFollowRedirects(HTTPC_STRICT_FOLLOW_REDIRECTS); http.setFollowRedirects(HTTPC_STRICT_FOLLOW_REDIRECTS);
@ -1497,11 +1501,11 @@ result = true;
if (error) if (error)
{ {
logObj["error"] = "deserializeJson() failed: " + String(error.c_str()); logObj["error"] = "deserializeJson() failed: " + String(error.c_str());
return ret; return result;
} }
// TODO: Sum // TODO: Sum
ret = true; result = true;
// TODO: L1 // TODO: L1
@ -1528,64 +1532,100 @@ result = true;
} }
http.end(); http.end();
return ret; return result;
} }
/** /**
* getPowermeterWattsMqtt * getPowermeterWattsMqtt
*/ */
bool getPowermeterWattsMqtt(JsonObject logObj, uint8_t group) { bool getPowermeterWattsMqtt(JsonObject logObj, uint8_t group) {
// TODO: nicht komplett bool result = false;
bool ret = false;
logObj["mod"] = "getPowermeterWattsMqtt";
mCfg->groups[group].pmPower = 0;
mCfg->groups[group].pmPowerL1 = 0;
mCfg->groups[group].pmPowerL2 = 0;
mCfg->groups[group].pmPowerL3 = 0;
// Hier neuer Code - Anfang
// TODO: Noch nicht komplett
result = true;
// logObj["P"] = mCfg->groups[group].pmPower; // Hier neuer Code - Ende
// logObj["P1"] = mCfg->groups[group].pmPowerL1;
// logObj["P2"] = mCfg->groups[group].pmPowerL2;
// logObj["P3"] = mCfg->groups[group].pmPowerL3;
// }
// http.end();
return ret; logObj["P"] = mCfg->groups[group].pmPower;
logObj["P1"] = mCfg->groups[group].pmPowerL1;
logObj["P2"] = mCfg->groups[group].pmPowerL2;
logObj["P3"] = mCfg->groups[group].pmPowerL3;
return result;
} }
/** /**
* getPowermeterWattsHichi * getPowermeterWattsHichi
*/ */
bool getPowermeterWattsHichi(JsonObject logObj, uint8_t group) { bool getPowermeterWattsHichi(JsonObject logObj, uint8_t group) {
// TODO: nicht komplett bool result = false;
bool ret = false;
logObj["mod"] = "getPowermeterWattsHichi";
mCfg->groups[group].pmPower = 0;
mCfg->groups[group].pmPowerL1 = 0;
mCfg->groups[group].pmPowerL2 = 0;
mCfg->groups[group].pmPowerL3 = 0;
// Hier neuer Code - Anfang
// TODO: Noch nicht komplett
result = true;
// logObj["P"] = mCfg->groups[group].pmPower; // Hier neuer Code - Ende
// logObj["P1"] = mCfg->groups[group].pmPowerL1;
// logObj["P2"] = mCfg->groups[group].pmPowerL2;
// logObj["P3"] = mCfg->groups[group].pmPowerL3;
// }
// http.end();
return ret; logObj["P"] = mCfg->groups[group].pmPower;
logObj["P1"] = mCfg->groups[group].pmPowerL1;
logObj["P2"] = mCfg->groups[group].pmPowerL2;
logObj["P3"] = mCfg->groups[group].pmPowerL3;
return result;
} }
/** /**
* getPowermeterWattsTibber * getPowermeterWattsTibber
*/ */
bool getPowermeterWattsTibber(JsonObject logObj, uint8_t group) { bool getPowermeterWattsTibber(JsonObject logObj, uint8_t group) {
// TODO: nicht komplett bool result = false;
bool ret = false;
logObj["mod"] = "getPowermeterWattsTibber";
mCfg->groups[group].pmPower = 0;
mCfg->groups[group].pmPowerL1 = 0;
mCfg->groups[group].pmPowerL2 = 0;
mCfg->groups[group].pmPowerL3 = 0;
// Hier neuer Code - Anfang
// TODO: Noch nicht komplett
result = true;
// logObj["P"] = mCfg->groups[group].pmPower; // Hier neuer Code - Ende
// logObj["P1"] = mCfg->groups[group].pmPowerL1;
// logObj["P2"] = mCfg->groups[group].pmPowerL2;
// logObj["P3"] = mCfg->groups[group].pmPowerL3;
// }
// http.end();
return ret; logObj["P"] = mCfg->groups[group].pmPower;
logObj["P1"] = mCfg->groups[group].pmPowerL1;
logObj["P2"] = mCfg->groups[group].pmPowerL2;
logObj["P3"] = mCfg->groups[group].pmPowerL3;
return result;
} }
/* /*