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

Revert "api: split MeterEnergy into MeterImport and MeterExport (#29788)"

Browse source 
This reverts commit 7a5b1e7560.
This commit is contained in:
andig 2026-05-10 09:07:13 +02:00
parent 7d4da17e4a
commit d5e6253d35
128 changed files with 435 additions and 570 deletions
Download patch file Download diff file Expand all files Collapse all files

10
plugin/meter.go
View file

@ -55,7 +55,7 @@ func (o *meterPlugin) FloatGetter() (func() (float64, error), error) {
switch o.method {
case Energy:
if !api.HasCap[api.MeterImport](o.meter) && !api.HasCap[api.MeterExport](o.meter) {
if !api.HasCap[api.MeterEnergy](o.meter) {
return nil, err
}
case Soc:
@ -67,12 +67,8 @@ func (o *meterPlugin) FloatGetter() (func() (float64, error), error) {
return func() (float64, error) {
switch o.method {
case Energy:
if m, ok := api.Cap[api.MeterImport](o.meter); ok {
f, err := m.ImportEnergy()
return f * o.scale, err
}
m, _ := api.Cap[api.MeterExport](o.meter)
f, err := m.ExportEnergy()
m, _ := api.Cap[api.MeterEnergy](o.meter)
f, err := m.TotalEnergy()
return f * o.scale, err
case Soc:
m, _ := api.Cap[api.Battery](o.meter)