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

MBMD: add returnEnergy support (#30514)

Browse source
This commit is contained in:
premultiply 2026-06-04 23:32:02 +02:00 • committed by GitHub
parent 380416e3e1
commit aaed8c24a3
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
24 changed files with 56 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

10
meter/mbmd.go
View file

@ -35,6 +35,7 @@ func NewMbmdFromConfig(ctx context.Context, other map[string]any) (api.Meter, er
batterySocLimits `mapstructure:",squash"`
modbus.Settings `mapstructure:",squash"`
Power, Energy, Soc string
ReturnEnergy string
Currents []string
Voltages []string
Powers []string
@ -103,6 +104,15 @@ func NewMbmdFromConfig(ctx context.Context, other map[string]any) (api.Meter, er
implement.Has(m, implement.MeterEnergy(totalEnergy))
}
// decorate return energy
if cc.ReturnEnergy != "" {
returnEnergy, err := mbmd.deviceOp(ops, cc.ReturnEnergy)
if err != nil {
return nil, fmt.Errorf("invalid measurement for returnenergy: %s", cc.ReturnEnergy)
}
implement.Has(m, implement.MeterReturnEnergy(returnEnergy))
}
// decorate soc
if cc.Soc != "" {
soc, err := mbmd.deviceOp(ops, cc.Soc)

2
templates/definition/meter/abb-ab.yaml
View file

@ -24,6 +24,7 @@ render: |
{{- if ne .usage "pv" }}
power: Power
energy: Import
returnenergy: Export
currents:
- CurrentL1
- CurrentL2
@ -35,6 +36,7 @@ render: |
{{- else }}
power: -Power
energy: Export
returnenergy: Import
currents:
- -CurrentL1
- -CurrentL2

2
templates/definition/meter/be-mpm3pm.yaml
View file

@ -15,6 +15,7 @@ render: |
{{- if ne .usage "pv" }}
power: Power
energy: Import
returnenergy: Export
currents:
- CurrentL1
- CurrentL2
@ -26,6 +27,7 @@ render: |
{{- else }}
power: -Power
energy: Export
returnenergy: Import
currents:
- -CurrentL1
- -CurrentL2

2
templates/definition/meter/cg-em24.yaml
View file

@ -24,6 +24,7 @@ render: |
{{- if ne .usage "pv" }}
power: Power
energy: Import
returnenergy: Export
currents:
- CurrentL1
- CurrentL2
@ -35,6 +36,7 @@ render: |
{{- else }}
power: -Power
energy: Export
returnenergy: Import
currents:
- -CurrentL1
- -CurrentL2

2
templates/definition/meter/cg-em24_e1.yaml
View file

@ -26,6 +26,7 @@ render: |
{{- if ne .usage "pv" }}
power: Power
energy: Import
returnenergy: Export
currents:
- CurrentL1
- CurrentL2
@ -37,6 +38,7 @@ render: |
{{- else }}
power: -Power
energy: Export
returnenergy: Import
currents:
- -CurrentL1
- -CurrentL2

2
templates/definition/meter/cg-emt3xx.yaml
View file

@ -30,6 +30,7 @@ render: |
{{- if ne .usage "pv" }}
power: Power
energy: Import
returnenergy: Export
currents:
- CurrentL1
- CurrentL2
@ -41,6 +42,7 @@ render: |
{{- else }}
power: -Power
energy: Export
returnenergy: Import
currents:
- -CurrentL1
- -CurrentL2

2
templates/definition/meter/dzg.yaml
View file

@ -15,6 +15,7 @@ render: |
{{- if ne .usage "pv" }}
power: ImportPower
energy: Import
returnenergy: Export
currents:
- CurrentL1
- CurrentL2
@ -22,6 +23,7 @@ render: |
{{- else }}
power: -ExportPower
energy: Export
returnenergy: Import
currents:
- -CurrentL1
- -CurrentL2

2
templates/definition/meter/eastron-sdm220_230.yaml
View file

@ -21,7 +21,9 @@ render: |
{{- if ne .usage "pv" }}
power: Power
energy: Import
returnenergy: Export
{{- else }}
power: -Power
energy: Export
returnenergy: Import
{{- end }}

2
templates/definition/meter/eastron-sdm54.yaml
View file

@ -15,6 +15,7 @@ render: |
{{- if ne .usage "pv" }}
power: Power
energy: Import
returnenergy: Export
currents:
- CurrentL1
- CurrentL2
@ -26,6 +27,7 @@ render: |
{{- else }}
power: -Power
energy: Export
returnenergy: Import
currents:
- -CurrentL1
- -CurrentL2

2
templates/definition/meter/eastron-sdm72.yaml
View file

@ -15,7 +15,9 @@ render: |
{{- if ne .usage "pv" }}
power: Power
energy: Import
returnenergy: Export
{{- else }}
power: -Power
energy: Export
returnenergy: Import
{{- end }}

2
templates/definition/meter/eastron-sdm72v2_630.yaml
View file

@ -27,6 +27,7 @@ render: |
{{- if ne .usage "pv" }}
power: Power
energy: Import
returnenergy: Export
currents:
- CurrentL1
- CurrentL2
@ -38,6 +39,7 @@ render: |
{{- else }}
power: -Power
energy: Export
returnenergy: Import
currents:
- -CurrentL1
- -CurrentL2

2
templates/definition/meter/eastron-smart-x96-1a.yaml
View file

@ -15,6 +15,7 @@ render: |
{{- if ne .usage "pv" }}
power: Power
energy: Import
returnenergy: Export
currents:
- CurrentL1
- CurrentL2
@ -26,6 +27,7 @@ render: |
{{- else }}
power: -Power
energy: Export
returnenergy: Import
currents:
- -CurrentL1
- -CurrentL2

2
templates/definition/meter/finder-7m24.yaml
View file

@ -15,7 +15,9 @@ render: |
{{- if ne .usage "pv" }}
power: Power
energy: Import
returnenergy: Export
{{- else }}
power: -Power
energy: Export
returnenergy: Import
{{- end }}

2
templates/definition/meter/finder-7m38.yaml
View file

@ -15,6 +15,7 @@ render: |
{{- if ne .usage "pv" }}
power: Power
energy: Import
returnenergy: Export
currents:
- CurrentL1
- CurrentL2
@ -26,6 +27,7 @@ render: |
{{- else }}
power: -Power
energy: Export
returnenergy: Import
currents:
- -CurrentL1
- -CurrentL2

2
templates/definition/meter/inepro.yaml
View file

@ -15,6 +15,7 @@ render: |
{{- if ne .usage "pv" }}
power: Power
energy: Import
returnenergy: Export
currents:
- CurrentL1
- CurrentL2
@ -26,6 +27,7 @@ render: |
{{- else }}
power: -Power
energy: Export
returnenergy: Import
currents:
- -CurrentL1
- -CurrentL2

2
templates/definition/meter/janitza.yaml
View file

@ -18,6 +18,7 @@ render: |
{{- if ne .usage "pv" }}
power: Power
energy: Import
returnenergy: Export
currents:
- CurrentL1
- CurrentL2
@ -29,6 +30,7 @@ render: |
{{- else }}
power: -Power
energy: Export
returnenergy: Import
currents:
- -CurrentL1
- -CurrentL2

2
templates/definition/meter/lovato-dmg610.yaml
View file

@ -15,6 +15,7 @@ render: |
{{- if ne .usage "pv" }}
power: Power
energy: Import
returnenergy: Export
currents:
- CurrentL1
- CurrentL2
@ -26,6 +27,7 @@ render: |
{{- else }}
power: -Power
energy: Export
returnenergy: Import
currents:
- -CurrentL1
- -CurrentL2

2
templates/definition/meter/orno-we525_526.yaml
View file

@ -18,7 +18,9 @@ render: |
{{- if ne .usage "pv" }}
power: Power
energy: Import
returnenergy: Export
{{- else }}
power: -Power
energy: Export
returnenergy: Import
{{- end }}

2
templates/definition/meter/orno.yaml
View file

@ -19,6 +19,7 @@ render: |
{{- if ne .usage "pv" }}
power: Power
energy: Import
returnenergy: Export
currents:
- CurrentL1
- CurrentL2
@ -30,6 +31,7 @@ render: |
{{- else }}
power: -Power
energy: Export
returnenergy: Import
currents:
- -CurrentL1
- -CurrentL2

2
templates/definition/meter/sbc-axx3.yaml
View file

@ -18,6 +18,7 @@ render: |
{{- if ne .usage "pv" }}
power: Power
energy: Import
returnenergy: Export
currents:
- CurrentL1
- CurrentL2
@ -29,6 +30,7 @@ render: |
{{- else }}
power: -Power
energy: Export
returnenergy: Import
currents:
- -CurrentL1
- -CurrentL2

2
templates/definition/meter/schneider-iem3000.yaml
View file

@ -15,6 +15,7 @@ render: |
{{- if ne .usage "pv" }}
power: Power
energy: Import
returnenergy: Export
currents:
- CurrentL1
- CurrentL2
@ -26,6 +27,7 @@ render: |
{{- else }}
power: -Power
energy: Export
returnenergy: Import
currents:
- -CurrentL1
- -CurrentL2

2
templates/definition/meter/siemens-pac2200.yaml
View file

@ -15,6 +15,7 @@ render: |
{{- if ne .usage "pv" }}
power: Power
energy: Import
returnenergy: Export
currents:
- CurrentL1
- CurrentL2
@ -26,6 +27,7 @@ render: |
{{- else }}
power: -Power
energy: Export
returnenergy: Import
currents:
- -CurrentL1
- -CurrentL2

2
templates/definition/meter/solaredge-se-mtr-3y.yaml
View file

@ -15,6 +15,7 @@ render: |
{{- if ne .usage "pv" }}
power: Power
energy: Import
returnenergy: Export
currents:
- CurrentL1
- CurrentL2
@ -26,6 +27,7 @@ render: |
{{- else }}
power: -Power
energy: Export
returnenergy: Import
currents:
- -CurrentL1
- -CurrentL2

2
templates/definition/meter/wago-879-30xx.yaml
View file

@ -15,6 +15,7 @@ render: |
{{- if ne .usage "pv" }}
power: Power
energy: Import
returnenergy: Export
currents:
- CurrentL1
- CurrentL2
@ -26,6 +27,7 @@ render: |
{{- else }}
power: -Power
energy: Export
returnenergy: Import
currents:
- -CurrentL1
- -CurrentL2