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

little changes

Browse source
This commit is contained in:
DanielR92 2024-03-30 18:25:00 +01:00
parent 73b3542c16
commit 692dd6628c
2 changed files with 5 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/config/settings.h
View file

@ -188,7 +188,7 @@ typedef struct {
// Plugin ZeroExport // Plugin ZeroExport
#if defined(PLUGIN_ZEROEXPORT) #if defined(PLUGIN_ZEROEXPORT)
#define ZEROEXPORT_DEV_POWERMETER //#define ZEROEXPORT_DEV_POWERMETER
#define ZEROEXPORT_MAX_GROUPS 6 #define ZEROEXPORT_MAX_GROUPS 6
#define ZEROEXPORT_GROUP_MAX_LEN_NAME 25 #define ZEROEXPORT_GROUP_MAX_LEN_NAME 25
#define ZEROEXPORT_GROUP_MAX_LEN_PM_URL 100 #define ZEROEXPORT_GROUP_MAX_LEN_PM_URL 100

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

@ -433,6 +433,7 @@ class powermeter {
bool result = false; bool result = false;
if(millis() - previousMillis <= 3000) return false; // skip when it is to fast if(millis() - previousMillis <= 3000) return false; // skip when it is to fast
logObj["mod"] = "getPowermeterWattsTibber";
mCfg->groups[group].pmPower = 0; mCfg->groups[group].pmPower = 0;
mCfg->groups[group].pmPowerL1 = 0; mCfg->groups[group].pmPowerL1 = 0;
@ -455,11 +456,9 @@ class powermeter {
if (http.GET() == HTTP_CODE_OK && http.getSize() > 0) { if (http.GET() == HTTP_CODE_OK && http.getSize() > 0) {
String myString = http.getString(); String myString = http.getString();
char floatBuffer[20];
double readVal = 0; double readVal = 0;
unsigned char c; unsigned char c;
for (int i = 0; i < http.getSize(); ++i) { for (int i = 0; i < http.getSize(); ++i) {
c = myString[i]; c = myString[i];
sml_states_t smlCurrentState = smlState(c); sml_states_t smlCurrentState = smlState(c);
@ -472,11 +471,8 @@ class powermeter {
mCfg->groups[group].pmPowerL2 = _powerMeter2Power; mCfg->groups[group].pmPowerL2 = _powerMeter2Power;
mCfg->groups[group].pmPowerL3 = _powerMeter3Power; mCfg->groups[group].pmPowerL3 = _powerMeter3Power;
if(! (_powerMeter1Power && _powerMeter2Power && _powerMeter3Power)) if(! (_powerMeter1Power && _powerMeter2Power && _powerMeter3Power)) {
{ mCfg->groups[group].pmPowerL1 = mCfg->groups[group].pmPowerL2 = mCfg->groups[group].pmPowerL3 = _powerMeterTotal / 3;
mCfg->groups[group].pmPowerL1 = _powerMeterTotal / 3;
mCfg->groups[group].pmPowerL2 = _powerMeterTotal / 3;
mCfg->groups[group].pmPowerL3 = _powerMeterTotal / 3;
} }
result = true; result = true;