diff --git a/templates/definition/meter/fronius-gen24.yaml b/templates/definition/meter/fronius-gen24.yaml index 1bec978f0..9410b0610 100644 --- a/templates/definition/meter/fronius-gen24.yaml +++ b/templates/definition/meter/fronius-gen24.yaml @@ -57,6 +57,16 @@ render: | - 203:TotWhImp - 213:TotWhImp scale: 0.001 + returnenergy: + source: sunspec + uri: {{ joinHostPort .host .port }} + id: {{ .id }} + value: + - 201:TotWhExp + - 211:TotWhExp + - 203:TotWhExp + - 213:TotWhExp + scale: 0.001 currents: - source: sunspec uri: {{ joinHostPort .host .port }} @@ -179,6 +189,12 @@ render: | id: 1 value: 160:4:DCWH # mppt 4 (discharge) scale: 0.001 + returnenergy: + source: sunspec + uri: {{ joinHostPort .host .port }} + id: 1 + value: 160:3:DCWH # mppt 3 (charge) + scale: 0.001 soc: source: sunspec uri: {{ joinHostPort .host .port }} diff --git a/templates/definition/meter/fronius-vertoplus.yaml b/templates/definition/meter/fronius-vertoplus.yaml index b85653940..54e5f601e 100644 --- a/templates/definition/meter/fronius-vertoplus.yaml +++ b/templates/definition/meter/fronius-vertoplus.yaml @@ -44,6 +44,16 @@ render: | - 203:TotWhImp - 213:TotWhImp scale: 0.001 + returnenergy: + source: sunspec + uri: {{ joinHostPort .host .port }} + id: {{ .id }} + value: + - 201:TotWhExp + - 211:TotWhExp + - 203:TotWhExp + - 213:TotWhExp + scale: 0.001 currents: - source: sunspec uri: {{ joinHostPort .host .port }} @@ -175,6 +185,12 @@ render: | id: 1 value: 160:5:DCWH # mppt 5 (discharge) scale: 0.001 + returnenergy: + source: sunspec + uri: {{ joinHostPort .host .port }} + id: 1 + value: 160:4:DCWH # mppt 4 (charge) + scale: 0.001 soc: source: sunspec uri: {{ joinHostPort .host .port }} diff --git a/templates/definition/meter/keba-kecontact.yaml b/templates/definition/meter/keba-kecontact.yaml index 25c7bc01d..86faba871 100644 --- a/templates/definition/meter/keba-kecontact.yaml +++ b/templates/definition/meter/keba-kecontact.yaml @@ -26,6 +26,13 @@ render: | - 203:TotWhImp - 213:TotWhImp scale: 0.001 + returnenergy: + source: sunspec + {{- include "modbus" . | indent 2 }} + value: + - 203:TotWhExp + - 213:TotWhExp + scale: 0.001 currents: - source: sunspec {{- include "modbus" . | indent 4 }} diff --git a/templates/definition/meter/kostal-ksem.yaml b/templates/definition/meter/kostal-ksem.yaml index a6fe5a328..1d2ab785f 100644 --- a/templates/definition/meter/kostal-ksem.yaml +++ b/templates/definition/meter/kostal-ksem.yaml @@ -25,6 +25,13 @@ render: | - 203:TotWhImp - 213:TotWhImp scale: 0.001 + returnenergy: + source: sunspec + {{- include "modbus" . | indent 2 }} + value: + - 203:TotWhExp + - 213:TotWhExp + scale: 0.001 currents: - source: sunspec {{- include "modbus" . | indent 4 }} diff --git a/templates/definition/meter/solaredge-hybrid.yaml b/templates/definition/meter/solaredge-hybrid.yaml index ec1a79169..874430cf6 100644 --- a/templates/definition/meter/solaredge-hybrid.yaml +++ b/templates/definition/meter/solaredge-hybrid.yaml @@ -44,6 +44,12 @@ render: | subdevice: 1 # Metering device value: 203:TotWhImp scale: 0.001 + returnenergy: + source: sunspec + {{- include "modbus" . | indent 2 }} + subdevice: 1 # Metering device + value: 203:TotWhExp + scale: 0.001 currents: - source: sunspec {{- include "modbus" . | indent 4 }} diff --git a/templates/definition/meter/solaredge-inverter.yaml b/templates/definition/meter/solaredge-inverter.yaml index 80ca77480..725c58d5e 100644 --- a/templates/definition/meter/solaredge-inverter.yaml +++ b/templates/definition/meter/solaredge-inverter.yaml @@ -33,6 +33,13 @@ render: | subdevice: 1 # Metering device value: 203:TotWhImp scale: 0.001 + returnenergy: + source: sunspec + {{- include "modbus" . | indent 2 }} + timeout: {{ .timeout }} + subdevice: 1 # Metering device + value: 203:TotWhExp + scale: 0.001 currents: - source: sunspec {{- include "modbus" . | indent 4 }} diff --git a/templates/definition/meter/sunspec-hybrid.yaml b/templates/definition/meter/sunspec-hybrid.yaml index 316654d0e..f16e02805 100644 --- a/templates/definition/meter/sunspec-hybrid.yaml +++ b/templates/definition/meter/sunspec-hybrid.yaml @@ -29,6 +29,13 @@ render: | - 203:TotWhImp - 213:TotWhImp scale: 0.001 + returnenergy: + source: sunspec + {{- include "modbus" . | indent 2 }} + value: + - 203:TotWhExp + - 213:TotWhExp + scale: 0.001 currents: - source: sunspec {{- include "modbus" . | indent 4 }} @@ -117,6 +124,11 @@ render: | {{- include "modbus" . | indent 2 }} value: 160:4:DCWH # mppt 4 (discharge) scale: 0.001 + returnenergy: + source: sunspec + {{- include "modbus" . | indent 2 }} + value: 160:3:DCWH # mppt 3 (charge) + scale: 0.001 soc: source: sunspec {{- include "modbus" . | indent 2 }} diff --git a/templates/definition/meter/sunspec-inverter.yaml b/templates/definition/meter/sunspec-inverter.yaml index 1f0bed786..d3088c229 100644 --- a/templates/definition/meter/sunspec-inverter.yaml +++ b/templates/definition/meter/sunspec-inverter.yaml @@ -35,6 +35,17 @@ render: | - 203:TotWhImp - 213:TotWhImp scale: 0.001 + returnenergy: + source: sunspec + {{- include "modbus" . | indent 2 }} + value: + - 201:TotWhExp + - 211:TotWhExp + - 202:TotWhExp + - 212:TotWhExp + - 203:TotWhExp + - 213:TotWhExp + scale: 0.001 currents: - source: sunspec {{- include "modbus" . | indent 4 }} diff --git a/templates/definition/meter/sunspec-meter.yaml b/templates/definition/meter/sunspec-meter.yaml index f3af86bb5..c153dc768 100644 --- a/templates/definition/meter/sunspec-meter.yaml +++ b/templates/definition/meter/sunspec-meter.yaml @@ -39,6 +39,18 @@ render: | - 203:TotWhImp - 213:TotWhImp scale: 0.001 + returnenergy: + source: sunspec + uri: {{ joinHostPort .host .port }} + id: {{ .id }} + value: + - 201:TotWhExp + - 211:TotWhExp + - 202:TotWhExp + - 212:TotWhExp + - 203:TotWhExp + - 213:TotWhExp + scale: 0.001 currents: - source: sunspec uri: {{ joinHostPort .host .port }} @@ -157,4 +169,16 @@ render: | - 203:TotWhExp - 213:TotWhExp scale: 0.001 + returnenergy: + source: sunspec + uri: {{ joinHostPort .host .port }} + id: {{ .id }} + value: + - 201:TotWhImp + - 211:TotWhImp + - 202:TotWhImp + - 212:TotWhImp + - 203:TotWhImp + - 213:TotWhImp + scale: 0.001 {{- end }}