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

Site: publish meter returnEnergy and use in history (#30881)

Browse source
This commit is contained in:
Michael Geers 2026-06-15 20:04:32 +02:00 • committed by GitHub
parent 0f915b9698
commit 7dafb000c1
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 29 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

40
core/site.go
View file

@ -510,7 +510,7 @@ func (site *Site) collectMeters(key string, meters []config.Device[api.Meter]) [
if err == nil {
mm[i].Power = power
site.log.DEBUG.Printf("%s %d power: %.0fW", key, i+1, power)
} else {
} else if !errors.Is(err, api.ErrNotAvailable) {
if b.Len() > 0 {
site.log.ERROR.Println("\n" + b.String())
}
@ -518,13 +518,22 @@ func (site *Site) collectMeters(key string, meters []config.Device[api.Meter]) [
}
// energy (production)
if m, ok := api.Cap[api.MeterEnergy](meter); err == nil && ok {
if m, ok := api.Cap[api.MeterEnergy](meter); ok {
if f, err := m.TotalEnergy(); err == nil {
mm[i].Energy = &f
} else {
} else if !errors.Is(err, api.ErrNotAvailable) {
site.log.ERROR.Printf("%s %d energy: %v", key, i+1, err)
}
}
// return energy (export)
if m, ok := api.Cap[api.MeterReturnEnergy](meter); ok {
if f, err := m.ReturnEnergy(); err == nil {
mm[i].ReturnEnergy = &f
} else if !errors.Is(err, api.ErrNotAvailable) {
site.log.ERROR.Printf("%s %d return energy: %v", key, i+1, err)
}
}
}
var wg sync.WaitGroup
@ -592,7 +601,7 @@ func (site *Site) updatePvMeters() {
// persist per-meter PV energy slots (used for history and forecast scaling)
for i, dev := range site.pvMeters {
c := site.collectors[dev.Config().Name]
if err := c.AddEnergy(mm[i].Energy, nil, mm[i].Power); err != nil {
if err := c.AddEnergy(mm[i].Energy, mm[i].ReturnEnergy, mm[i].Power); err != nil {
site.log.ERROR.Printf("persist pv %d energy: %v", i+1, err)
}
}
@ -669,7 +678,7 @@ func (site *Site) updateBatteryMeters() {
if !ok {
continue
}
if err := c.AddEnergy(nil, mm[i].Energy, -mm[i].Power); err != nil {
if err := c.AddEnergy(mm[i].ReturnEnergy, mm[i].Energy, -mm[i].Power); err != nil {
site.log.ERROR.Printf("persist battery %d energy: %v", i+1, err)
}
}
@ -704,7 +713,7 @@ func (site *Site) addMeterEnergy(meters []config.Device[api.Meter], mm []types.M
if !ok {
continue
}
if err := c.AddEnergy(mm[i].Energy, nil, mm[i].Power); err != nil {
if err := c.AddEnergy(mm[i].Energy, mm[i].ReturnEnergy, mm[i].Power); err != nil {
site.log.ERROR.Printf("persist meter %s energy: %v", ref, err)
}
}
@ -756,7 +765,7 @@ func (site *Site) updateGridMeter() error {
mm.Power = res
site.gridPower = res
site.log.DEBUG.Printf("grid power: %.0fW", res)
} else {
} else if !errors.Is(err, api.ErrNotAvailable) {
return fmt.Errorf("grid power: %v", err)
}
@ -769,7 +778,7 @@ func (site *Site) updateGridMeter() error {
if p1, p2, p3, err = phaseMeter.Powers(); err == nil {
mm.Powers = []float64{p1, p2, p3}
site.log.DEBUG.Printf("grid powers: %.0fW", mm.Powers)
} else {
} else if !errors.Is(err, api.ErrNotAvailable) {
site.log.ERROR.Printf("grid powers: %v", err)
}
}
@ -777,7 +786,7 @@ func (site *Site) updateGridMeter() error {
if i1, i2, i3, err := phaseMeter.Currents(); err == nil {
mm.Currents = []float64{util.SignFromPower(i1, p1), util.SignFromPower(i2, p2), util.SignFromPower(i3, p3)}
site.log.DEBUG.Printf("grid currents: %.3gA", mm.Currents)
} else {
} else if !errors.Is(err, api.ErrNotAvailable) {
site.log.ERROR.Printf("grid currents: %v", err)
}
}
@ -786,12 +795,21 @@ func (site *Site) updateGridMeter() error {
if energyMeter, ok := api.Cap[api.MeterEnergy](site.gridMeter); ok {
if f, err := energyMeter.TotalEnergy(); err == nil {
mm.Energy = &f
} else {
} else if !errors.Is(err, api.ErrNotAvailable) {
site.log.ERROR.Printf("grid energy: %v", err)
}
}
site.collectors[site.Meters.GridMeterRef].AddEnergy(mm.Energy, nil, mm.Power)
// grid return energy (export); nil when the device has no MeterReturnEnergy capability or the read fails
if returnEnergyMeter, ok := api.Cap[api.MeterReturnEnergy](site.gridMeter); ok {
if f, err := returnEnergyMeter.ReturnEnergy(); err == nil {
mm.ReturnEnergy = &f
} else if !errors.Is(err, api.ErrNotAvailable) {
site.log.ERROR.Printf("grid return energy: %v", err)
}
}
site.collectors[site.Meters.GridMeterRef].AddEnergy(mm.Energy, mm.ReturnEnergy, mm.Power)
site.publish(keys.Grid, mm)