Stefan/evcc-io
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix session energy reset by some chargers (Go-E, Wattpilot, Bender) (#14730)

Browse source
This commit is contained in:
andig 2024-07-06 16:47:13 +02:00 • committed by GitHub
parent 5f21545d54
commit 8727252f60
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 95 additions and 1608 deletions
Download patch file Download diff file Expand all files Collapse all files

68
charger/bender.go
View file

@ -43,26 +43,28 @@ type BenderCC struct {
const (
// all holding type registers
bendRegChargePointState = 122 // Vehicle (Control Pilot) state
bendRegPhaseEnergy = 200 // Phase energy from primary meter (Wh)
bendRegCurrents = 212 // Currents from primary meter (mA)
bendRegTotalEnergy = 218 // Total Energy from primary meter (Wh)
bendRegActivePower = 220 // Active Power from primary meter (W)
bendRegVoltages = 222 // Voltages of the ocpp meter (V)
bendRegChargedEnergyLegacy = 705 // Sum of charged energy for the current session (Wh)
bendRegChargingDurationLegacy = 709 // Duration since beginning of charge (Seconds)
bendRegChargedEnergy = 716 // Sum of charged energy for the current session (Wh)
bendRegChargingDuration = 718 // Duration since beginning of charge (Seconds)
bendRegUserID = 720 // User ID (OCPP IdTag) from the current session. Bytes 0 to 19.
bendRegEVBatteryState = 730 // EV Battery State (% 0-100)
bendRegEVCCID = 741 // ASCII representation of the Hex. Values corresponding to the EVCCID. Bytes 0 to 11.
bendRegHemsCurrentLimit = 1000 // Current limit of the HEMS module (A)
bendRegChargePointState = 122 // Vehicle (Control Pilot) state
bendRegPhaseEnergy = 200 // Phase energy from primary meter (Wh)
bendRegCurrents = 212 // Currents from primary meter (mA)
bendRegTotalEnergy = 218 // Total Energy from primary meter (Wh)
bendRegActivePower = 220 // Active Power from primary meter (W)
bendRegVoltages = 222 // Voltages of the ocpp meter (V)
bendRegUserID = 720 // User ID (OCPP IdTag) from the current session. Bytes 0 to 19.
bendRegEVBatteryState = 730 // EV Battery State (% 0-100)
bendRegEVCCID = 741 // ASCII representation of the Hex. Values corresponding to the EVCCID. Bytes 0 to 11.
bendRegHemsCurrentLimit = 1000 // Current limit of the HEMS module (A)
bendRegFirmware = 100 // Application version number
bendRegOcppCpStatus = 104 // Charge Point status according to the OCPP spec. enumaration
bendRegProtocolVersion = 120 // Ebee Modbus TCP Server Protocol Version number
bendRegChargePointModel = 142 // ChargePoint Model. Bytes 0 to 19.
bendRegSmartVehicleDetected = 740 // Returns 1 if an EV currently connected is a smart vehicle, or 0 if no EV connected or it is not a smart vehicle
// unused
// bendRegChargedEnergyLegacy = 705 // Sum of charged energy for the current session (Wh)
// bendRegChargingDurationLegacy = 709 // Duration since beginning of charge (Seconds)
// bendRegChargedEnergy = 716 // Sum of charged energy for the current session (Wh)
// bendRegChargingDuration = 718 // Duration since beginning of charge (Seconds)
)
func init() {
@ -82,7 +84,7 @@ func NewBenderCCFromConfig(other map[string]interface{}) (api.Charger, error) {
return NewBenderCC(cc.URI, cc.ID)
}
//go:generate go run ../cmd/tools/decorate.go -f decorateBenderCC -b *BenderCC -r api.Charger -t "api.Meter,CurrentPower,func() (float64, error)" -t "api.PhaseCurrents,Currents,func() (float64, float64, float64, error)" -t "api.PhaseVoltages,Voltages,func() (float64, float64, float64, error)" -t "api.ChargeRater,ChargedEnergy,func() (float64, error)" -t "api.MeterEnergy,TotalEnergy,func() (float64, error)" -t "api.Battery,Soc,func() (float64, error)" -t "api.Identifier,Identify,func() (string, error)"
//go:generate go run ../cmd/tools/decorate.go -f decorateBenderCC -b *BenderCC -r api.Charger -t "api.Meter,CurrentPower,func() (float64, error)" -t "api.PhaseCurrents,Currents,func() (float64, float64, float64, error)" -t "api.PhaseVoltages,Voltages,func() (float64, float64, float64, error)" -t "api.MeterEnergy,TotalEnergy,func() (float64, error)" -t "api.Battery,Soc,func() (float64, error)" -t "api.Identifier,Identify,func() (string, error)"
// NewBenderCC creates BenderCC charger
func NewBenderCC(uri string, id uint8) (api.Charger, error) {
@ -109,13 +111,12 @@ func NewBenderCC(uri string, id uint8) (api.Charger, error) {
}
var (
currentPower func() (float64, error)
currents func() (float64, float64, float64, error)
voltages func() (float64, float64, float64, error)
chargedEnergy func() (float64, error)
totalEnergy func() (float64, error)
soc func() (float64, error)
identify func() (string, error)
currentPower func() (float64, error)
currents func() (float64, float64, float64, error)
voltages func() (float64, float64, float64, error)
totalEnergy func() (float64, error)
soc func() (float64, error)
identify func() (string, error)
)
// check presence of metering
@ -127,7 +128,6 @@ func NewBenderCC(uri string, id uint8) (api.Charger, error) {
if b, err := wb.conn.ReadHoldingRegisters(reg, 2); err == nil && binary.BigEndian.Uint32(b) != math.MaxUint32 {
currentPower = wb.currentPower
currents = wb.currents
chargedEnergy = wb.chargedEnergy
totalEnergy = wb.totalEnergy
// check presence of "ocpp meter"
@ -147,7 +147,7 @@ func NewBenderCC(uri string, id uint8) (api.Charger, error) {
identify = wb.identify
}
return decorateBenderCC(wb, currentPower, currents, voltages, chargedEnergy, totalEnergy, soc, identify), nil
return decorateBenderCC(wb, currentPower, currents, voltages, totalEnergy, soc, identify), nil
}
// Status implements the api.Charger interface
@ -226,24 +226,8 @@ func (wb *BenderCC) currentPower() (float64, error) {
return float64(binary.BigEndian.Uint32(b)), nil
}
// ChargedEnergy implements the api.ChargeRater interface
func (wb *BenderCC) chargedEnergy() (float64, error) {
if wb.legacy {
b, err := wb.conn.ReadHoldingRegisters(bendRegChargedEnergyLegacy, 1)
if err != nil {
return 0, err
}
return float64(binary.BigEndian.Uint16(b)) / 1e3, nil
}
b, err := wb.conn.ReadHoldingRegisters(bendRegChargedEnergy, 2)
if err != nil {
return 0, err
}
return float64(binary.BigEndian.Uint32(b)) / 1e3, nil
}
// removed: https://github.com/evcc-io/evcc/issues/13726
// var _ api.ChargeRater = (*BenderCC)(nil)
// TotalEnergy implements the api.MeterEnergy interface
func (wb *BenderCC) totalEnergy() (float64, error) {

1610
charger/bender_decorators.go
View file

File diff suppressed because it is too large Load diff

12
charger/fronius-wattpilot.go
View file

@ -100,16 +100,8 @@ func (c *Wattpilot) CurrentPower() (float64, error) {
return c.api.GetPower()
}
var _ api.ChargeRater = (*Wattpilot)(nil)
// ChargedEnergy implements the api.ChargeRater interface
func (c *Wattpilot) ChargedEnergy() (float64, error) {
resp, err := c.api.GetProperty("wh")
if err != nil {
return 0, err
}
return resp.(float64) / 1e3, err
}
// removed: https://github.com/evcc-io/evcc/issues/13726
// var _ api.ChargeRater = (*Wattpilot)(nil)
var _ api.PhaseCurrents = (*Wattpilot)(nil)

13
charger/go-e.go
View file

@ -149,17 +149,8 @@ func (c *GoE) CurrentPower() (float64, error) {
return resp.CurrentPower(), err
}
var _ api.ChargeRater = (*GoE)(nil)
// ChargedEnergy implements the api.ChargeRater interface
func (c *GoE) ChargedEnergy() (float64, error) {
resp, err := c.api.Status()
if err != nil {
return 0, err
}
return resp.ChargedEnergy(), err
}
// removed: https://github.com/evcc-io/evcc/issues/13726
// var _ api.ChargeRater = (*GoE)(nil)
var _ api.PhaseCurrents = (*GoE)(nil)