Update the Growatt API and modbus
This commit is contained in:
parent
d067c5a57d
commit
8e029a1afd
|
|
@ -15,10 +15,10 @@ public partial class WITGrowatRecord
|
|||
//public BatteriesRecord? BatteriesRecords => BatteriesRecord.FromBatteries(Batteries);
|
||||
|
||||
|
||||
public ActivePower ConsumptionPower => MeterPower + InverterActivePower ;
|
||||
public ActivePower InverterActivePower => _ActivePower;
|
||||
public ReactivePower InverterReactivePower => _ReactivePower;
|
||||
public Frequency Frequency => _Frequency;
|
||||
public ActivePower ConsumptionPower => GridPower + InverterActivePower ;
|
||||
public ActivePower InverterActivePower => _activePower;
|
||||
public ReactivePower InverterReactivePower => _reactivePower;
|
||||
public Frequency Frequency => _frequency;
|
||||
|
||||
public VoltageRms GridAbLineVoltage => _GridAbLineVoltage;
|
||||
public VoltageRms GridBcLineVoltage => _GridBcLineVoltage;
|
||||
|
|
@ -27,7 +27,7 @@ public partial class WITGrowatRecord
|
|||
public CurrentRms PhaseBCurrent => _PhaseBCurrent;
|
||||
public CurrentRms PhaseCCurrent => _PhaseCCurrent;
|
||||
|
||||
public ActivePower MeterPower => _importedPowerFromGrid - _exportedPowerToGrid;
|
||||
public ActivePower GridPower => _importedPowerFromGrid - _exportedPowerToGrid;
|
||||
public ActivePower ExportedPowerToGridMeter => _exportedPowerToGrid;
|
||||
public ActivePower ImportedPowerFromGrid => _importedPowerFromGrid;
|
||||
|
||||
|
|
@ -38,34 +38,33 @@ public partial class WITGrowatRecord
|
|||
public Energy EnergyToGrid => _EnergyToGrid;
|
||||
public Energy TotalEnergyToGrid => _TotalEnergyToGrid;
|
||||
|
||||
public GrowattSystemStatus SystemOperatingMode => (GrowattSystemStatus)_SystemOperatingMode;
|
||||
public BatteryoperatinStatus BatteryOperatingMode => (BatteryoperatinStatus) _BatteryOperatingMode;
|
||||
public OperatingPriority OperatingPriority => (OperatingPriority)_OperatingPriority;
|
||||
public GrowattSystemStatus SystemOperatingMode => (GrowattSystemStatus)_systemOperatingMode;
|
||||
public BatteryoperatinStatus BatteryOperatingMode => (BatteryoperatinStatus) _batteryOperatingMode;
|
||||
public OperatingPriority OperatingMode => (OperatingPriority)_operatingPriority;
|
||||
|
||||
public UInt16 FaultMainCode => _FaultMainCode; // need to pre proceesed
|
||||
public UInt16 FaultSubCode => _FaultSubCode; // need to pre proceesed
|
||||
public UInt16 WarningMainCode => _WarningMainCode; // need to pre proceesed
|
||||
public UInt16 WarningSubCode => _WarningSubCode; // need to pre proceesed
|
||||
public UInt16 FaultMainCode => _faultMainCode; // need to pre proceesed
|
||||
public UInt16 FaultSubCode => _faultSubCode; // need to pre proceesed
|
||||
public UInt16 WarningMainCode => _warningMainCode; // need to pre proceesed
|
||||
public UInt16 WarningSubCode => _warningSubCode; // need to pre proceesed
|
||||
|
||||
public Voltage Pv1Voltage => _Pv1Voltage;
|
||||
public Current Pv1Current => _Pv1Current;
|
||||
public Voltage Pv2Voltage => _Pv2Voltage;
|
||||
public Current Pv2Current => _Pv2Current;
|
||||
public Voltage Pv3Voltage => _Pv3Voltage;
|
||||
public Current Pv3Current => _Pv3Current;
|
||||
public Voltage Pv4Voltage => _Pv4Voltage;
|
||||
public Current Pv4Current => _Pv4Current;
|
||||
public Voltage Pv5Voltage => _Pv5Voltage;
|
||||
public Current Pv5Current => _Pv5Current;
|
||||
public Voltage Pv6Voltage => _Pv6Voltage;
|
||||
public Current Pv6Current => _Pv6Current;
|
||||
public Voltage Pv1Voltage => _pv1Voltage;
|
||||
public Current Pv1Current => _pv1Current;
|
||||
public Voltage Pv2Voltage => _pv2Voltage;
|
||||
public Current Pv2Current => _pv2Current;
|
||||
public Voltage Pv3Voltage => _pv3Voltage;
|
||||
public Current Pv3Current => _pv3Current;
|
||||
public Voltage Pv4Voltage => _pv4Voltage;
|
||||
public Current Pv4Current => _pv4Current;
|
||||
public Voltage Pv5Voltage => _pv5Voltage;
|
||||
public Current Pv5Current => _pv5Current;
|
||||
public Voltage Pv6Voltage => _pv6Voltage;
|
||||
public Current Pv6Current => _pv6Current;
|
||||
|
||||
|
||||
public DcPower Pv1InpuPower => _Pv1InpuPower;
|
||||
public DcPower Pv1InpuPower => _pv1InpuPower;
|
||||
|
||||
|
||||
|
||||
public DcPower TotalPvPower => (Pv1Voltage * Pv1Current) + (Pv2Voltage * Pv2Current) +
|
||||
public DcPower PvPower => (Pv1Voltage * Pv1Current) + (Pv2Voltage * Pv2Current) +
|
||||
(Pv3Voltage * Pv3Current) + (Pv4Voltage * Pv4Current) +
|
||||
(Pv5Voltage * Pv5Current) + (Pv6Voltage * Pv6Current);
|
||||
// ********************************** Holding Registers (Control) *************************************************************
|
||||
|
|
@ -173,16 +172,16 @@ public partial class WITGrowatRecord
|
|||
set => _BatteryMaxDischargePower = value;
|
||||
}
|
||||
|
||||
public Percent ChargeCutoffSoc
|
||||
public Percent ChargeCutoffSocVoltage
|
||||
{
|
||||
get => _ChargeCutoffSoc;
|
||||
set => _ChargeCutoffSoc = (UInt16)value;
|
||||
get => _BatteryChargeCutoffVoltage;
|
||||
set => _BatteryChargeCutoffVoltage = (UInt16)value;
|
||||
}
|
||||
|
||||
public Percent DischargeCutoffSoc
|
||||
public Percent DischargeCutoffVoltage
|
||||
{
|
||||
get => _DischargeCutoffSoc;
|
||||
set => _DischargeCutoffSoc = (UInt16)value;
|
||||
get => _BatteryDischargeCutoffVoltage;
|
||||
set => _BatteryDischargeCutoffVoltage = (UInt16)value;
|
||||
}
|
||||
|
||||
public Percent LoadPriorityDischargeCutoffSoc
|
||||
|
|
@ -226,98 +225,61 @@ public partial class WITGrowatRecord
|
|||
set => _OffGridDischargeCutoffSoc = (UInt16)(value);
|
||||
}
|
||||
|
||||
public UInt16 BatteryChargeCutoffVoltage
|
||||
public UInt16 MaxSoc
|
||||
{
|
||||
get => _BatteryChargeCutoffVoltage;
|
||||
set => _BatteryChargeCutoffVoltage = value;
|
||||
get => _maxSoc;
|
||||
set => _maxSoc = value;
|
||||
}
|
||||
|
||||
public UInt16 BatteryDischargeCutoffVoltage
|
||||
public UInt16 MinSoc
|
||||
{
|
||||
get => _BatteryDischargeCutoffVoltage;
|
||||
set => _BatteryDischargeCutoffVoltage = value;
|
||||
get => _minSoc;
|
||||
set => _minSoc = value;
|
||||
}
|
||||
|
||||
public Double BatteryMaxChargeCurrent
|
||||
public Double BatteryMaxChargingCurrent
|
||||
{
|
||||
get => _BatteryMaxChargeCurrent;
|
||||
set => _BatteryMaxChargeCurrent = (UInt16)value;
|
||||
get => _batteryMaxChargingCurrent;
|
||||
set => _batteryMaxChargingCurrent = (UInt16)value;
|
||||
}
|
||||
|
||||
public Double BatteryMaxdischargeCurrent
|
||||
public Double BatteryMaxDischargingCurrent
|
||||
{
|
||||
get => _BatteryMaxdischargeCurrent;
|
||||
set => _BatteryMaxdischargeCurrent = (UInt16) value;
|
||||
get => _batteryMaxDischargingCurrent;
|
||||
set => _batteryMaxDischargingCurrent = (UInt16) value;
|
||||
}
|
||||
|
||||
public Double Battery1MaxDischargingCurrent => _batteryMaxDischargingCurrent;
|
||||
|
||||
public Double Battery1MaxChargingCurrent => _batteryMaxChargingCurrent;
|
||||
|
||||
public Percent Battery1Soc => _BatterySoc1;
|
||||
public Percent Battery1Soh => _BatterySoh1;
|
||||
public Current Battery1Current => _BatteryCurrent1;
|
||||
public Voltage Battery1Voltage => _BatteryVoltage1;
|
||||
public ActivePower Battery1Power => _BatteryPower1;
|
||||
public ActivePower Battery1MaxAllowableChargePower => _BatteryMaxAllowableChargePower1;
|
||||
public ActivePower Battery1MaxAllowableDischargePower => _BatteryMaxAllowableDischargePower1;
|
||||
public Energy Battery1DailyChargeEnergy => _DailyChargeEnergy1;
|
||||
public Energy Battery1DailyDischargeEnergy => _DailyDischargeEnergy1;
|
||||
public Energy Battery1AccumulatedChargeEnergy => _AccumulatedChargeEnergy1;
|
||||
public Energy Battery1AccumulatedDischargeEnergy => _AccumulatedDishargeEnergy1;
|
||||
public Temperature Battery1AmbientTemperature => _BatteryAmbientTemperature1;
|
||||
|
||||
public IReadOnlyList<BatteryRecord> Batteries => new List<BatteryRecord>
|
||||
{
|
||||
new BatteryRecord
|
||||
{
|
||||
Soc = _BatterySoc1,
|
||||
Soh = _BatterySoh1,
|
||||
//ClusterTotalNumber = _ClusterTotalNumber1,
|
||||
Current = _BatteryCurrent1,
|
||||
Voltage = _BatteryVoltage1,
|
||||
Power = _BatteryPower1,
|
||||
MaxAllowableChargePower = _BatteryMaxAllowableChargePower1,
|
||||
MaxAllowableDischargePower = _BatteryMaxAllowableDischargePower1,
|
||||
DailyChargeEnergy = _DailyChargeEnergy1,
|
||||
DailyDischargeEnergy = _DailyDischargeEnergy1,
|
||||
AccumulatedChargeEnergy = _AccumulatedChargeEnergy1,
|
||||
AccumulatedDischargeEnergy = _AccumulatedDishargeEnergy1,
|
||||
BatteryAmbientTemperature = _BatteryAmbientTemperature1
|
||||
public Percent Battery2Soc => _BatterySoc2;
|
||||
public Percent Battery2Soh => _BatterySoh2;
|
||||
public Current Battery2Current => _BatteryCurrent2;
|
||||
public Voltage Battery2Voltage => _BatteryVoltage2;
|
||||
public ActivePower Battery2Power => _batteryPower2;
|
||||
public ActivePower Battery2MaxAllowableChargePower => _BatteryMaxAllowableChargePower2;
|
||||
public ActivePower Battery2MaxAllowableDischargePower => _BatteryMaxAllowableDischargePower2;
|
||||
public Energy Battery2DailyChargeEnergy => _DailyChargeEnergy2;
|
||||
public Energy Battery2DailyDischargeEnergy => _DailyDischargeEnergy2;
|
||||
public Energy Battery2AccumulatedChargeEnergy => _AccumulatedChargeEnergy2;
|
||||
public Energy Battery2AccumulatedDischargeEnergy => _AccumulatedDischargeEnergy2;
|
||||
public Temperature Battery2AmbientTemperature => _BatteryAmbientTemperature2;
|
||||
|
||||
}
|
||||
/*
|
||||
new BatteryRecord
|
||||
{
|
||||
Soc = _BatterySoc2,
|
||||
Soh = _BatterySoh2,
|
||||
// ClusterTotalNumber = _ClusterTotalNumber2,
|
||||
Current = _BatteryCurrent2,
|
||||
Voltage = _BatteryVoltage2,
|
||||
Power = _BatteryPower2,
|
||||
MaxAllowableChargePower = _BatteryMaxAllowableChargePower2,
|
||||
MaxAllowableDischargePower = _BatteryMaxAllowableDischargePower2,
|
||||
DailyChargeEnergy = _DailyChargeEnergy2,
|
||||
DailyDischargeEnergy = _DailyDischargeEnergy2,
|
||||
AccumulatedChargeEnergy = _AccumulatedChargeEnergy2,
|
||||
AccumulatedDischargeEnergy = _AccumulatedDischargeEnergy2,
|
||||
BatteryAmbientTemperature = _BatteryAmbientTemperature2
|
||||
public Energy BatteryDailyChargeEnergy => _DailyChargeEnergy1 + _DailyChargeEnergy2;
|
||||
public Energy BatteryDailyDischargeEnergy => _DailyDischargeEnergy1 + _DailyDischargeEnergy2;
|
||||
|
||||
},*/
|
||||
/*
|
||||
new BatteryRecord
|
||||
{
|
||||
Soc = _BatterySoc3,
|
||||
Soh = _BatterySoh3,
|
||||
ClusterTotalNumber = _ClusterTotalNumber3,
|
||||
Current = _BatteryCurrent3,
|
||||
Voltage = _BatteryVoltage3,
|
||||
Power = _BatteryPower3,
|
||||
MaxAllowableChargePower = _BatteryMaxAllowableChargePower3,
|
||||
MaxAllowableDischargePower = _BatteryMaxAllowableDischargePower3,
|
||||
DailyChargeEnergy = _DailyChargeEnergy3,
|
||||
DailyDischargeEnergy = _DailyDischargeEnergy3
|
||||
},
|
||||
|
||||
new BatteryRecord
|
||||
{
|
||||
Soc = _BatterySoc4,
|
||||
Soh = _BatterySoh4,
|
||||
ClusterTotalNumber = _ClusterTotalNumber4,
|
||||
Current = _BatteryCurrent4,
|
||||
Voltage = _BatteryVoltage4,
|
||||
Power = _BatteryPower4,
|
||||
MaxAllowableChargePower = _BatteryMaxAllowableChargePower4,
|
||||
MaxAllowableDischargePower = _BatteryMaxAllowableDischargePower4,
|
||||
DailyChargeEnergy = _DailyChargeEnergy4,
|
||||
DailyDischargeEnergy = _DailyDischargeEnergy4
|
||||
}*/
|
||||
};
|
||||
public BatteriesRecord? BatteriesRecords => BatteriesRecord.FromBatteries(Batteries);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -14,36 +14,36 @@ public partial class WITGrowatRecord
|
|||
[InputRegister<Int32>(8083, Scale = 0.1)] private Int32 _exportedPowerToGrid;
|
||||
|
||||
// 31000–31009 — Operating Status Info
|
||||
[InputRegister(31000)] private UInt16 _SystemOperatingMode;
|
||||
[InputRegister(31001)] private UInt16 _BatteryOperatingMode;
|
||||
[InputRegister(31002)] private UInt16 _OperatingPriority;
|
||||
[InputRegister(31003)] private UInt16 _Reserved1;
|
||||
[InputRegister(31004)] private UInt16 _Reserved2;
|
||||
[InputRegister(31005)] private UInt16 _FaultMainCode;// Can we change this to warning?
|
||||
[InputRegister(31006)] private UInt16 _FaultSubCode; // Can we change this to warning?
|
||||
[InputRegister(31007)] private UInt16 _WarningMainCode;
|
||||
[InputRegister(31008)] private UInt16 _WarningSubCode;
|
||||
[InputRegister(31009)] private UInt16 _Reserved3;
|
||||
[InputRegister(31000)] private UInt16 _systemOperatingMode;
|
||||
[InputRegister(31001)] private UInt16 _batteryOperatingMode;
|
||||
[InputRegister(31002)] private UInt16 _operatingPriority;
|
||||
[InputRegister(31003)] private UInt16 _reserved1;
|
||||
[InputRegister(31004)] private UInt16 _reserved2;
|
||||
[InputRegister(31005)] private UInt16 _faultMainCode;// Can we change this to warning?
|
||||
[InputRegister(31006)] private UInt16 _faultSubCode; // Can we change this to warning?
|
||||
[InputRegister(31007)] private UInt16 _warningMainCode;
|
||||
[InputRegister(31008)] private UInt16 _warningSubCode;
|
||||
[InputRegister(31009)] private UInt16 _reserved3;
|
||||
// 31010–31099 — PV Parameters
|
||||
[InputRegister(31010,Scale = 0.1)] private Int16 _Pv1Voltage;
|
||||
[InputRegister(31011,Scale = 0.1)] private Int16 _Pv1Current;
|
||||
[InputRegister(31012,Scale = 0.1)] private Int16 _Pv2Voltage;
|
||||
[InputRegister(31013,Scale = 0.1)] private Int16 _Pv2Current;
|
||||
[InputRegister(31014,Scale = 0.1)] private Int16 _Pv3Voltage;
|
||||
[InputRegister(31015,Scale = 0.1)] private Int16 _Pv3Current;
|
||||
[InputRegister(31016,Scale = 0.1)] private Int16 _Pv4Voltage;
|
||||
[InputRegister(31017,Scale = 0.1)] private Int16 _Pv4Current;
|
||||
[InputRegister(31018,Scale = 0.1)] private Int16 _Pv5Voltage;
|
||||
[InputRegister(31019,Scale = 0.1)] private Int16 _Pv5Current;
|
||||
[InputRegister(31020,Scale = 0.1)] private Int16 _Pv6Voltage;
|
||||
[InputRegister(31021,Scale = 0.1)] private Int16 _Pv6Current;
|
||||
[InputRegister(31058)] private Int16 _Pv1InpuPower;
|
||||
[InputRegister(31010,Scale = 0.1)] private Int16 _pv1Voltage;
|
||||
[InputRegister(31011,Scale = 0.1)] private Int16 _pv1Current;
|
||||
[InputRegister(31012,Scale = 0.1)] private Int16 _pv2Voltage;
|
||||
[InputRegister(31013,Scale = 0.1)] private Int16 _pv2Current;
|
||||
[InputRegister(31014,Scale = 0.1)] private Int16 _pv3Voltage;
|
||||
[InputRegister(31015,Scale = 0.1)] private Int16 _pv3Current;
|
||||
[InputRegister(31016,Scale = 0.1)] private Int16 _pv4Voltage;
|
||||
[InputRegister(31017,Scale = 0.1)] private Int16 _pv4Current;
|
||||
[InputRegister(31018,Scale = 0.1)] private Int16 _pv5Voltage;
|
||||
[InputRegister(31019,Scale = 0.1)] private Int16 _pv5Current;
|
||||
[InputRegister(31020,Scale = 0.1)] private Int16 _pv6Voltage;
|
||||
[InputRegister(31021,Scale = 0.1)] private Int16 _pv6Current;
|
||||
[InputRegister(31058)] private Int16 _pv1InpuPower;
|
||||
|
||||
//— AC Side 31100 - 31199
|
||||
[InputRegister<Int32>(31100, Scale = 0.1)] private Int32 _ActivePower; // Positive: feed to grid, Negative: draw from the grid
|
||||
[InputRegister<Int32>(31102, Scale = 0.1)] private Int32 _ReactivePower; // Positive: capacitive, Negative: Inductive
|
||||
[InputRegister(31104, Scale = 0.1)] private Int16 _Reserved4;
|
||||
[InputRegister(31105, Scale = 0.01)] private UInt16 _Frequency;
|
||||
[InputRegister<Int32>(31100, Scale = 0.1)] private Int32 _activePower; // Positive: feed to grid, Negative: draw from the grid
|
||||
[InputRegister<Int32>(31102, Scale = 0.1)] private Int32 _reactivePower; // Positive: capacitive, Negative: Inductive
|
||||
[InputRegister(31104, Scale = 0.1)] private Int16 _reserved4;
|
||||
[InputRegister(31105, Scale = 0.01)] private UInt16 _frequency;
|
||||
|
||||
[InputRegister(31106, Scale = 0.1)] private UInt16 _GridAbLineVoltage;
|
||||
[InputRegister(31107, Scale = 0.1)] private UInt16 _GridBcLineVoltage;
|
||||
|
|
@ -88,7 +88,7 @@ public partial class WITGrowatRecord
|
|||
|
||||
|
||||
// 31300–31399 — Second Battery Cluster Info (incl. BDC and BMS)
|
||||
/* [InputRegister<Int32>(31300)] private Int32 _BatteryPower2; // positive Charge, Negative Discharge
|
||||
[InputRegister<Int32>(31300)] private Int32 _batteryPower2; // positive Charge, Negative Discharge
|
||||
[InputRegister<UInt32>(31302)] private UInt32 _DailyChargeEnergy2;
|
||||
[InputRegister<UInt32>(31304)] private UInt32 _AccumulatedChargeEnergy2;
|
||||
[InputRegister<UInt32>(31206)] private UInt32 _DailyDischargeEnergy2; //0.1kw
|
||||
|
|
@ -171,8 +171,8 @@ public partial class WITGrowatRecord
|
|||
|
||||
[HoldingRegister<UInt32>(30400 , writable: true)] private UInt32 _BatteryMaxChargePower; //
|
||||
[HoldingRegister<UInt32>(30402 , writable: true)] private UInt32 _BatteryMaxDischargePower; //
|
||||
[HoldingRegister(30404, writable: true)] private UInt16 _ChargeCutoffSoc; //
|
||||
[HoldingRegister(30405, writable: true)] private UInt16 _DischargeCutoffSoc; //
|
||||
[HoldingRegister(30404, writable: true)] private UInt16 _maxSoc; //
|
||||
[HoldingRegister(30405, writable: true)] private UInt16 _minSoc; //
|
||||
[HoldingRegister(30406, writable: true)] private UInt16 _LoadPriorityDischargeCutoffSoc; //
|
||||
[HoldingRegister(30407, writable: true)] private Boolean _RemotePowerControl; //
|
||||
[HoldingRegister(30408, writable: true)] private UInt16 _RemotePowerControlChargeDuration; //
|
||||
|
|
@ -184,6 +184,6 @@ public partial class WITGrowatRecord
|
|||
|
||||
[HoldingRegister(30496, writable: true, Scale = 0.1)] private UInt16 _BatteryChargeCutoffVoltage; //
|
||||
[HoldingRegister(30497, writable: true, Scale = 0.1)] private UInt16 _BatteryDischargeCutoffVoltage; //
|
||||
[HoldingRegister(30498, writable: true, Scale = 0.1)] private UInt16 _BatteryMaxChargeCurrent; //
|
||||
[HoldingRegister(30499, writable: true, Scale = 0.1)] private UInt16 _BatteryMaxdischargeCurrent; //*/
|
||||
[HoldingRegister(30498, writable: true, Scale = 0.1)] private UInt16 _batteryMaxChargingCurrent; //
|
||||
[HoldingRegister(30499, writable: true, Scale = 0.1)] private UInt16 _batteryMaxDischargingCurrent; //*/
|
||||
}
|
||||
Loading…
Reference in New Issue