0.8.910004-zero

This commit is contained in:
Patrick Amrhein 2024-03-07 22:46:39 +01:00
parent bff99ded28
commit 77e5555e7a
3 changed files with 519 additions and 423 deletions

View file

@ -198,7 +198,7 @@ typedef struct {
#if defined(PLUGIN_ZEROEXPORT) #if defined(PLUGIN_ZEROEXPORT)
enum class zeroExportState : uint8_t { enum class zeroExportState : uint8_t {
RESET, GETPOWERMETER, GETINVERTERDATA, BATTERYPROTECTION, CONTROL, SETCONTROL, WAITACCEPT, FINISH RESET, GETPOWERMETER, GETINVERTERDATA, BATTERYPROTECTION, CONTROL, SETCONTROL, FINISH
}; };
typedef enum { typedef enum {
@ -247,7 +247,7 @@ typedef struct {
uint16_t limit; uint16_t limit;
uint16_t limitNew; uint16_t limitNew;
unsigned long limitTsp; unsigned long limitTsp;
bool limitAck; // bool limitAck;
float dcVoltage; float dcVoltage;
// uint16_t waitingTime; // uint16_t waitingTime;
} zeroExportGroupInverter_t; } zeroExportGroupInverter_t;
@ -276,12 +276,22 @@ typedef struct {
zeroExportState state; zeroExportState state;
zeroExportState stateNext;
unsigned long lastRun; unsigned long lastRun;
float pmPower; float pmPower;
float pmPowerL1; float pmPowerL1;
float pmPowerL2; float pmPowerL2;
float pmPowerL3; float pmPowerL3;
bool battSwitch; bool battSwitch;
float grpPower;
float grpPowerL1;
float grpPowerL2;
float grpPowerL3;
float grpLimit;
float grpLimitL1;
float grpLimitL2;
float grpLimitL3;
// 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

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 910003 #define VERSION_PATCH 910004
//------------------------------------- //-------------------------------------
typedef struct { typedef struct {
@ -108,7 +108,7 @@ enum {
#define MQTT_MAX_PACKET_SIZE 384 #define MQTT_MAX_PACKET_SIZE 384
#define PLUGIN_ZEROEXPORT //#define PLUGIN_ZEROEXPORT
typedef struct { typedef struct {
uint32_t rxFail; uint32_t rxFail;

File diff suppressed because it is too large Load diff