3pp-mirror/ahoy
1
0
Fork 0
mirror of https://github.com/lumapu/ahoy.git synced 2025-07-26 12:47:18 +02:00
Code Issues Projects Releases Packages Wiki Activity

first steps MQTT

Browse source
This commit is contained in:
DanielR92 2024-03-30 10:54:51 +01:00
parent 8049eb16c4
commit 6ab3c6fb5e
5 changed files with 70 additions and 76 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/plugins/zeroExport/powermeter.h
View file

@ -417,6 +417,8 @@ class powermeter {
07 01 00 02 08 02 ff #objName: OBIS-Kennzahl für Wirkenergie Einspeisung Tarif2
*/
unsigned long previousMillis = 0;
const std::list<OBISHandler> smlHandlerList{
{{0x01, 0x00, 0x10, 0x07, 0x00, 0xff}, &smlOBISW, &_powerMeterTotal}, // total - OBIS-Kennzahl für momentane Gesamtwirkleistung
@ -430,6 +432,8 @@ class powermeter {
bool getPowermeterWattsTibber(JsonObject logObj, uint8_t group) {
bool result = false;
if(millis() - previousMillis <= 3000) return false; // skip when it is to fast
mCfg->groups[group].pmPower = 0;
mCfg->groups[group].pmPowerL1 = 0;
mCfg->groups[group].pmPowerL2 = 0;
@ -449,7 +453,7 @@ class powermeter {
http.begin(url);
http.addHeader("Authorization", "Basic " + auth);
if (http.GET() == HTTP_CODE_OK && http.getSize() != 0) {
if (http.GET() == HTTP_CODE_OK && http.getSize() > 0) {
String myString = http.getString();
char floatBuffer[20];
@ -486,18 +490,9 @@ class powermeter {
}
}
break;
default:
logObj["SML_DEFAULT"] = String(smlCurrentState);
break;
}
}
}
else
{
logObj["result"] = String(result);
logObj["http_size"] = String(http.getSize());
}
http.end();
@ -506,6 +501,7 @@ class powermeter {
logObj["P2"] = mCfg->groups[group].pmPowerL2;
logObj["P3"] = mCfg->groups[group].pmPowerL3;
previousMillis = millis();
return result;
}