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

Add Defines for each Powermeter

Browse source
This commit is contained in:
Patrick Amrhein 2024-04-02 17:08:45 +02:00
parent 3b65770048
commit bcbb50fe3e
2 changed files with 69 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/config/settings.h
View file

@ -214,6 +214,12 @@ typedef struct {
#define ZEROEXPORT_POWERMETER_MAX_ERRORS 5
#define ZEROEXPORT_DEF_INV_WAITINGTIME_MS 10000
#define ZEROEXPORT_GROUP_WR_LIMIT_MIN_DIFF 5
#define ZEROEXPORT_POWERMETER_SHELLY
#define ZEROEXPORT_POWERMETER_TASMOTA
#define ZEROEXPORT_POWERMETER_MQTT
#define ZEROEXPORT_POWERMETER_HICHI
//#define ZEROEXPORT_POWERMETER_TIBBER
enum class zeroExportState : uint8_t {

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

@ -7,19 +7,26 @@
#define __POWERMETER_H__
#include <AsyncJson.h>
#include <base64.h>
#include <HTTPClient.h>
#if defined(ZEROEXPORT_POWERMETER_TIBBER)
#include <base64.h>
#include <string.h>
#include <list>
#endif
#include "config/settings.h"
#if defined(ZEROEXPORT_POWERMETER_TIBBER)
#include "plugins/zeroExport/lib/sml.h"
#endif
#if defined(ZEROEXPORT_POWERMETER_TIBBER)
typedef struct {
const unsigned char OBIS[6];
void (*Fn)(double &);
float *Arg;
} OBISHandler;
#endif
typedef struct {
float P;
@ -45,32 +52,40 @@ class powermeter {
/** loop
* abfrage der gruppen um die aktuellen Werte (Zähler) zu ermitteln.
*/
void loop(void)
{
void loop(void) {
unsigned long Tsp = millis();
if (Tsp - mPreviousTsp <= 1000) return; // skip when it is to fast
mPreviousTsp = Tsp;
PowermeterBuffer_t power;
for (u_short group = 0; group < ZEROEXPORT_MAX_GROUPS; group++)
{
for (u_short group = 0; group < ZEROEXPORT_MAX_GROUPS; group++) {
switch (mCfg->groups[group].pm_type) {
#if defined(ZEROEXPORT_POWERMETER_SHELLY)
case zeroExportPowermeterType_t::Shelly:
power = getPowermeterWattsShelly(*mLog, group);
break;
#endif
#if defined(ZEROEXPORT_POWERMETER_TASMOTA)
case zeroExportPowermeterType_t::Tasmota:
power = getPowermeterWattsTasmota(*mLog, group);
break;
#endif
#if defined(ZEROEXPORT_POWERMETER_MQTT)
case zeroExportPowermeterType_t::Mqtt:
power = getPowermeterWattsMqtt(*mLog, group);
break;
#endif
#if defined(ZEROEXPORT_POWERMETER_HICHI)
case zeroExportPowermeterType_t::Hichi:
power = getPowermeterWattsHichi(*mLog, group);
break;
#endif
#if defined(ZEROEXPORT_POWERMETER_TIBBER)
case zeroExportPowermeterType_t::Tibber:
power = getPowermeterWattsTibber(*mLog, group);
break;
#endif
}
bufferWrite(power, group);
@ -86,8 +101,7 @@ class powermeter {
PowermeterBuffer_t avg;
avg.P = avg.P1 = avg.P2 = avg.P2 = avg.P3 = 0;
for (int i = 0; i < 5; i++)
{
for (int i = 0; i < 5; i++) {
avg.P += mPowermeterBuffer[group][i].P;
avg.P1 += mPowermeterBuffer[group][i].P1;
avg.P2 += mPowermeterBuffer[group][i].P2;
@ -102,6 +116,7 @@ class powermeter {
}
private:
#if defined(ZEROEXPORT_POWERMETER_SHELLY)
/** getPowermeterWattsShelly
* ...
* @param logObj
@ -210,7 +225,9 @@ class powermeter {
http.end();
return result;
}
#endif
#if defined(ZEROEXPORT_POWERMETER_TASMOTA)
/** getPowermeterWattsTasmota
* ...
* @param logObj
@ -325,7 +342,9 @@ class powermeter {
*/
return result;
}
#endif
#if defined(ZEROEXPORT_POWERMETER_MQTT)
/** getPowermeterWattsMqtt
* ...
* @param logObj
@ -346,7 +365,9 @@ class powermeter {
return result;
}
#endif
#if defined(ZEROEXPORT_POWERMETER_HICHI)
/** getPowermeterWattsHichi
* ...
* @param logObj
@ -367,7 +388,9 @@ class powermeter {
return result;
}
#endif
#if defined(ZEROEXPORT_POWERMETER_TIBBER)
/** getPowermeterWattsTibber
* ...
* @param logObj
@ -379,7 +402,6 @@ class powermeter {
sml_states_t currentState;
float _powerMeterTotal = 0.0;
float _powerMeter1Power = 0.0;
@ -389,7 +411,6 @@ class powermeter {
float _powerMeterImport = 0.0;
float _powerMeterExport = 0.0;
/*
07 81 81 c7 82 03 ff #objName: OBIS Kennzahl für den Hersteller
07 01 00 01 08 00 ff #objName: OBIS Kennzahl für Wirkenergie Bezug gesamt tariflos
@ -468,9 +489,9 @@ class powermeter {
http.end();
return result;
}
#endif
void bufferWrite(PowermeterBuffer_t raw, short group)
{
void bufferWrite(PowermeterBuffer_t raw, short group) {
mPowermeterBuffer[group][mPowermeterBufferPos[group]] = raw;
mPowermeterBufferPos[group]++;
if (mPowermeterBufferPos[group] >= 5) mPowermeterBufferPos[group] = 0;