Add more modbus meters (#6418)

2023-02-26 13:40:32 +01:00 · 2023-02-26 13:40:32 +01:00 · c5966d4637
commit c5966d4637
parent 06a68d8c40
42 changed files with 806 additions and 344 deletions
--- a/templates/definition/meter/abb-ab.yaml
+++ b/templates/definition/meter/abb-ab.yaml
@ -0,0 +1,32 @@
+template: abb-ab
+products:
+  - brand: ABB
+    description:
+      generic: A43, A44, B23, B24
+params:
+  - name: usage
+    choice: ["grid", "charge"]
+  - name: modbus
+    choice: ["rs485"]
+render: |
+  type: modbus
+  model: abb
+  {{- include "modbus" . }}
+  power: Power
+  energy: Import
+  currents:
+    - CurrentL1
+    - CurrentL2
+    - CurrentL3
+  {{- if eq .usage "grid" }}
+  powers:
+    - PowerL1
+    - PowerL2
+    - PowerL3
+  {{- end }}
+  {{- if eq .usage "charge" }}
+  voltages:
+    - VoltageL1
+    - VoltageL2
+    - VoltageL3
+  {{- end }}
--- a/templates/definition/meter/be-mpm3pm.yaml
+++ b/templates/definition/meter/be-mpm3pm.yaml
@ -0,0 +1,32 @@
+template: mpm3pm
+products:
+  - brand: Bernecker Engineering
+    description:
+      generic: MPM3PM
+params:
+  - name: usage
+    choice: ["grid", "charge"]
+  - name: modbus
+    choice: ["rs485"]
+render: |
+  type: modbus
+  {{- include "modbus" . }}
+  model: MPM
+  power: Power
+  energy: Import
+  currents:
+    - CurrentL1
+    - CurrentL2
+    - CurrentL3
+  {{- if eq .usage "grid" }}
+  powers:
+    - PowerL1
+    - PowerL2
+    - PowerL3
+  {{- end }}
+  {{- if eq .usage "charge" }}
+  voltages:
+    - VoltageL1
+    - VoltageL2
+    - VoltageL3
+  {{- end }}
--- a/templates/definition/meter/cg-em24.yaml
+++ b/templates/definition/meter/cg-em24.yaml
@ -5,19 +5,28 @@ products:
      generic: EM24
 params:
  - name: usage
-    choice: ["grid", "pv", "battery", "charge"]
+    choice: ["grid", "charge"]
  - name: modbus
    choice: ["rs485", "tcpip"]
 render: |
  type: modbus
-  model: cgem24
  {{- include "modbus" . }}
-  {{- if eq .usage "charge" }}
-  energy: Import # only required for charge meter usage
-  {{- end }}
-  {{- if or (eq .usage "charge") (eq .usage "grid") }}
+  model: cgem24
+  power: Power
+  energy: Import
  currents:
    - CurrentL1
    - CurrentL2
    - CurrentL3
+  {{- if eq .usage "grid" }}
+  powers:
+    - PowerL1
+    - PowerL2
+    - PowerL3
+  {{- end }}
+  {{- if eq .usage "charge" }}
+  voltages:
+    - VoltageL1
+    - VoltageL2
+    - VoltageL3
  {{- end }}
--- a/templates/definition/meter/cg-emt3xx.yaml
+++ b/templates/definition/meter/cg-emt3xx.yaml
@ -5,19 +5,28 @@ products:
      generic: EM/ET 330/340
 params:
  - name: usage
-    choice: ["grid", "pv", "battery", "charge"]
+    choice: ["grid", "charge"]
  - name: modbus
    choice: ["rs485", "tcpip"]
 render: |
  type: modbus
-  model: cgex3x0
  {{- include "modbus" . }}
-  {{- if eq .usage "charge" }}
-  energy: Import # only required for charge meter usage
-  {{- end }}
-  {{- if or (eq .usage "charge") (eq .usage "grid") }}
+  model: cgex3x0
+  power: Power
+  energy: Import
  currents:
    - CurrentL1
    - CurrentL2
    - CurrentL3
+  {{- if eq .usage "grid" }}
+  powers:
+    - PowerL1
+    - PowerL2
+    - PowerL3
+  {{- end }}
+  {{- if eq .usage "charge" }}
+  voltages:
+    - VoltageL1
+    - VoltageL2
+    - VoltageL3
  {{- end }}
--- a/templates/definition/meter/discovergy.yaml
+++ b/templates/definition/meter/discovergy.yaml
@ -20,4 +20,4 @@ render: |
  meter: {{ .meter }}
  {{- if eq .usage "pv" }}
  scale: -1
-  {{- end}}
+  {{- end }}
--- a/templates/definition/meter/dzg.yaml
+++ b/templates/definition/meter/dzg.yaml
@ -0,0 +1,24 @@
+template: dzg
+products:
+  - brand: DZG
+    description:
+      generic: DVH4013
+params:
+  - name: usage
+    choice: ["charge"]
+  - name: modbus
+    choice: ["rs485"]
+render: |
+  type: modbus
+  model: dzg
+  {{- include "modbus" . }}
+  power: ImportPower
+  energy: Import
+  currents:
+    - CurrentL1
+    - CurrentL2
+    - CurrentL3
+  voltages:
+    - VoltageL1
+    - VoltageL2
+    - VoltageL3
--- a/templates/definition/meter/e3dc.yaml
+++ b/templates/definition/meter/e3dc.yaml
@ -1,6 +1,6 @@
 template: e3dc
 products:
-  - brand: E3DC
+  - brand: E3/DC
 params:
  - name: usage
    choice: ["grid", "pv", "battery"]
@ -20,7 +20,7 @@ render: |
      type: holding
      decode: int32s
      address: 40073 # Hausverbrauchsleistung in Watt
-  {{- end}}
+  {{- end }}
  {{- if eq .usage "pv" }}
  power:
    source: calc
@ -38,7 +38,7 @@ render: |
        decode: int32s
        address: 40075 # Leistung zusätzlicher Einspeiser in Watt
      scale: -1 # reverse sign
-  {{- end}}
+  {{- end }}
  {{- if eq .usage "battery" }}
  power:
    source: modbus
@ -58,4 +58,4 @@ render: |
  {{- if ne .capacity "" }}
  capacity: {{ .capacity }} # kWh
  {{- end }}
-  {{- end}}
+  {{- end }}
--- a/templates/definition/meter/eastron-sdm120.yaml
+++ b/templates/definition/meter/eastron-sdm120.yaml
@ -0,0 +1,16 @@
+template: eastron-sdm120
+products:
+  - brand: Eastron
+    description:
+      generic: SDM120-Modbus
+params:
+  - name: usage
+    choice: ["grid", "charge"]
+  - name: modbus
+    choice: ["rs485"]
+render: |
+  type: modbus
+  {{- include "modbus" . }}
+  model: sdm
+  power: Power
+  energy: Import
--- a/templates/definition/meter/eastron-sdm220_230.yaml
+++ b/templates/definition/meter/eastron-sdm220_230.yaml
@ -0,0 +1,16 @@
+template: eastron-sdm220_230
+products:
+  - brand: Eastron
+    description:
+      generic: SDM220/230
+params:
+  - name: usage
+    choice: ["grid", "charge"]
+  - name: modbus
+    choice: ["rs485"]
+render: |
+  type: modbus
+  {{- include "modbus" . }}
+  model: sdm220
+  power: Power
+  energy: Import
--- a/templates/definition/meter/eastron-sdm72.yaml
+++ b/templates/definition/meter/eastron-sdm72.yaml
@ -0,0 +1,16 @@
+template: eastron-sdm72
+products:
+  - brand: Eastron
+    description:
+      generic: SDM72D-M
+params:
+  - name: usage
+    choice: ["grid", "charge"]
+  - name: modbus
+    choice: ["rs485"]
+render: |
+  type: modbus
+  {{- include "modbus" . }}
+  model: sdm72
+  power: Power
+  energy: Import
--- a/templates/definition/meter/eastron-sdm72_220_230.yaml
+++ b/templates/definition/meter/eastron-sdm72_220_230.yaml
@ -1,17 +0,0 @@
-template: eastron-sdm72_220_230
-products:
-  - brand: Eastron
-    description:
-      generic: SDM 72/220/230
-params:
-  - name: usage
-    choice: ["grid", "pv", "battery", "charge"]
-  - name: modbus
-    choice: ["rs485"]
-render: |
-  type: modbus
-  model: sdm220
-  {{- if eq .usage "charge" }}
-  energy: Sum # only required for charge meter usage
-  {{- end }}
-  {{- include "modbus" . }}
--- a/templates/definition/meter/eastron-sdm72v2_630.yaml
+++ b/templates/definition/meter/eastron-sdm72v2_630.yaml
@ -2,11 +2,13 @@ template: eastron
 products:
  - brand: Eastron
    description:
-      generic: SDM 630
+      generic: SDM630-Modbus
  - brand: Eastron
    description:
-      generic: SDM 72v2
+      generic: SDM72DM-V2
 params:
+  - name: usage
+    choice: ["grid", "charge"]
  - name: modbus
    choice: ["rs485"]
 render: |
@ -14,16 +16,20 @@ render: |
  {{- include "modbus" . }}
  model: sdm
  power: Power
-  energy: Sum
+  energy: Import
  currents:
    - CurrentL1
    - CurrentL2
    - CurrentL3
-  voltages:
-    - VoltageL1
-    - VoltageL2
-    - VoltageL3
+  {{- if eq .usage "grid" }}
  powers:
    - PowerL1
    - PowerL2
    - PowerL3
+  {{- end }}
+  {{- if eq .usage "charge" }}
+  voltages:
+    - VoltageL1
+    - VoltageL2
+    - VoltageL3
+  {{- end }}
--- a/templates/definition/meter/inepro.yaml
+++ b/templates/definition/meter/inepro.yaml
@ -0,0 +1,32 @@
+template: inepro
+products:
+  - brand: inepro
+    description:
+      generic: PRO380-MOD
+params:
+  - name: usage
+    choice: ["grid", "charge"]
+  - name: modbus
+    choice: ["rs485"]
+render: |
+  type: modbus
+  {{- include "modbus" . }}
+  model: inepro
+  power: Power
+  energy: Import
+  currents:
+    - CurrentL1
+    - CurrentL2
+    - CurrentL3
+  {{- if eq .usage "grid" }}
+  powers:
+    - PowerL1
+    - PowerL2
+    - PowerL3
+  {{- end }}
+  {{- if eq .usage "charge" }}
+  voltages:
+    - VoltageL1
+    - VoltageL2
+    - VoltageL3
+  {{- end }}
--- a/templates/definition/meter/janitza-b23.yaml
+++ b/templates/definition/meter/janitza-b23.yaml
@ -4,23 +4,28 @@ products:
    description:
      generic: B23
 params:
+  - name: usage
+    choice: ["grid", "charge"]
  - name: modbus
    choice: ["rs485", "tcpip"]
 render: |
  type: modbus
  {{- include "modbus" . }}
-  model: janitza
  power: Power
  energy: Import
  currents:
    - CurrentL1
    - CurrentL2
    - CurrentL3
-  voltages:
-    - VoltageL1
-    - VoltageL2
-    - VoltageL3
+  {{- if eq .usage "grid" }}
  powers:
    - PowerL1
    - PowerL2
    - PowerL3
+  {{- end }}
+  {{- if eq .usage "charge" }}
+  voltages:
+    - VoltageL1
+    - VoltageL2
+    - VoltageL3
+  {{- end }}
--- a/templates/definition/meter/kostal-ksem.yaml
+++ b/templates/definition/meter/kostal-ksem.yaml
@ -19,10 +19,6 @@ render: |
    - CurrentL1
    - CurrentL2
    - CurrentL3
-  voltages:
-    - VoltageL1
-    - VoltageL2
-    - VoltageL3
  powers:
    - PowerL1
    - PowerL2
--- a/templates/definition/meter/orno.yaml
+++ b/templates/definition/meter/orno.yaml
@ -0,0 +1,32 @@
+template: orno
+products:
+  - brand: Orno
+    description:
+      generic: OR-WE-516, OR-WE-517
+params:
+  - name: usage
+    choice: ["grid", "charge"]
+  - name: modbus
+    choice: ["rs485"]
+render: |
+  type: modbus
+  {{- include "modbus" . }}
+  model: orno3p
+  power: Power
+  energy: Import
+  currents:
+    - CurrentL1
+    - CurrentL2
+    - CurrentL3
+  {{- if eq .usage "grid" }}
+  powers:
+    - PowerL1
+    - PowerL2
+    - PowerL3
+  {{- end }}
+  {{- if eq .usage "charge" }}
+  voltages:
+    - VoltageL1
+    - VoltageL2
+    - VoltageL3
+  {{- end }}
--- a/templates/definition/meter/sbc-axx3.yaml
+++ b/templates/definition/meter/sbc-axx3.yaml
@ -0,0 +1,32 @@
+template: sbc-axx3
+products:
+  - brand: Saia-Burgess Controls
+    description:
+      generic: ALE3, AWD3
+params:
+  - name: usage
+    choice: ["grid", "charge"]
+  - name: modbus
+    choice: ["rs485"]
+render: |
+  type: modbus
+  {{- include "modbus" . }}
+  model: sbc
+  power: Power
+  energy: Import
+  currents:
+    - CurrentL1
+    - CurrentL2
+    - CurrentL3
+  {{- if eq .usage "grid" }}
+  powers:
+    - PowerL1
+    - PowerL2
+    - PowerL3
+  {{- end }}
+  {{- if eq .usage "charge" }}
+  voltages:
+    - VoltageL1
+    - VoltageL2
+    - VoltageL3
+  {{- end }}
--- a/templates/definition/meter/schneider-iem3000.yaml
+++ b/templates/definition/meter/schneider-iem3000.yaml
@ -0,0 +1,32 @@
+template: schneider-iem3000
+products:
+  - brand: Schneider Electric
+    description:
+      generic: iEM3xxx Modbus
+params:
+  - name: usage
+    choice: ["grid", "charge"]
+  - name: modbus
+    choice: ["rs485"]
+render: |
+  type: modbus
+  {{- include "modbus" . }}
+  model: iem3000
+  power: Power
+  energy: Import
+  currents:
+    - CurrentL1
+    - CurrentL2
+    - CurrentL3
+  {{- if eq .usage "grid" }}
+  powers:
+    - PowerL1
+    - PowerL2
+    - PowerL3
+  {{- end }}
+  {{- if eq .usage "charge" }}
+  voltages:
+    - VoltageL1
+    - VoltageL2
+    - VoltageL3
+  {{- end }}
--- a/templates/definition/meter/siemens-7kt1665.yaml
+++ b/templates/definition/meter/siemens-7kt1665.yaml
@ -5,7 +5,7 @@ products:
      generic: 7KT1665
 params:
  - name: usage
-    choice: ["grid", "pv", "battery", "charge"]
+    choice: ["grid", "charge"]
  - name: modbus
    choice: ["rs485", "tcpip"]
 render: |
@ -19,7 +19,6 @@ render: |
      decode: uint32
    scale: 0.01
    timeout: 5s
-  {{- if or (eq .usage "charge") (eq .usage "grid") }}
  energy:
    source: modbus
    {{- include "modbus" . | indent 2 }}
@ -29,8 +28,6 @@ render: |
      decode: uint32
    scale: 0.001
    timeout: 5s
-  {{ end -}}
-  {{- if or (eq .usage "charge") (eq .usage "grid") }}
  currents:
  - source: modbus
    {{- include "modbus" . | indent 2 }}
@ -56,4 +53,3 @@ render: |
      decode: uint32
    scale: 0.0001
    timeout: 5s
-  {{ end -}}
--- a/templates/definition/meter/siemens-pac2200.yaml
+++ b/templates/definition/meter/siemens-pac2200.yaml
@ -5,19 +5,28 @@ products:
      generic: PAC 2200
 params:
  - name: usage
-    choice: ["grid", "pv", "battery", "charge"]
+    choice: ["grid", "charge"]
  - name: modbus
    choice: ["rs485", "tcpip"]
 render: |
  type: modbus
  model: pac2200
  {{- include "modbus" . }}
-  {{- if eq .usage "charge" }}
-  energy: Import # only required for charge meter usage
-  {{- end }}
-  {{- if or (eq .usage "charge") (eq .usage "grid") }}
+  power: Power
+  energy: Import
  currents:
    - CurrentL1
    - CurrentL2
    - CurrentL3
+  {{- if eq .usage "grid" }}
+  powers:
+    - PowerL1
+    - PowerL2
+    - PowerL3
+  {{- end }}
+  {{- if eq .usage "charge" }}
+  voltages:
+    - VoltageL1
+    - VoltageL2
+    - VoltageL3
  {{- end }}
--- a/templates/definition/meter/solarlog.yaml
+++ b/templates/definition/meter/solarlog.yaml
@ -47,4 +47,4 @@ render: |
      address: 3502 # Pac
      type: input
      decode: uint32s
-  {{- end}}
+  {{- end }}
--- a/templates/definition/meter/solax-hybrid-cloud.yaml
+++ b/templates/definition/meter/solax-hybrid-cloud.yaml
@ -44,7 +44,7 @@ render: |
    jq: .result.feedinpower
    cache: 2m30s
    scale: -1
-  {{- end}}
+  {{- end }}
  {{- if eq .usage "pv" }}
    source: calc
    add:
--- a/templates/docs/meter/abb-ab_0.yaml
+++ b/templates/docs/meter/abb-ab_0.yaml
@ -0,0 +1,40 @@
+product:
+  brand: ABB
+  description: A43, A44, B23, B24
+render:
+  - usage: grid
+    default: |
+      type: template
+      template: abb-ab
+      usage: grid      
+
+      # RS485 via adapter (Modbus RTU)
+      modbus: rs485serial
+      id: 1
+      device: /dev/ttyUSB0 # USB-RS485 Adapter Adresse
+      baudrate: 9600 # Prüfe die Geräteeinstellungen, typische Werte sind 9600, 19200, 38400, 57600, 115200
+      comset: "8N1" # Kommunikationsparameter für den Adapter
+
+      # RS485 via TCP/IP (Modbus RTU)
+      modbus: rs485tcpip
+      id: 1
+      host: 192.0.2.2 # Hostname
+      port: 502 # Port
+  - usage: charge
+    default: |
+      type: template
+      template: abb-ab
+      usage: charge      
+
+      # RS485 via adapter (Modbus RTU)
+      modbus: rs485serial
+      id: 1
+      device: /dev/ttyUSB0 # USB-RS485 Adapter Adresse
+      baudrate: 9600 # Prüfe die Geräteeinstellungen, typische Werte sind 9600, 19200, 38400, 57600, 115200
+      comset: "8N1" # Kommunikationsparameter für den Adapter
+
+      # RS485 via TCP/IP (Modbus RTU)
+      modbus: rs485tcpip
+      id: 1
+      host: 192.0.2.2 # Hostname
+      port: 502 # Port
--- a/templates/docs/meter/cg-em24_0.yaml
+++ b/templates/docs/meter/cg-em24_0.yaml
@ -21,54 +21,6 @@ render:
      host: 192.0.2.2 # Hostname
      port: 502 # Port

-      # Modbus TCP
-      modbus: tcpip
-      id: 1
-      host: 192.0.2.2 # Hostname
-      port: 502 # Port
-  - usage: pv
-    default: |
-      type: template
-      template: cg-em24
-      usage: pv      
-
-      # RS485 via adapter (Modbus RTU)
-      modbus: rs485serial
-      id: 1
-      device: /dev/ttyUSB0 # USB-RS485 Adapter Adresse
-      baudrate: 9600 # Prüfe die Geräteeinstellungen, typische Werte sind 9600, 19200, 38400, 57600, 115200
-      comset: "8N1" # Kommunikationsparameter für den Adapter
-
-      # RS485 via TCP/IP (Modbus RTU)
-      modbus: rs485tcpip
-      id: 1
-      host: 192.0.2.2 # Hostname
-      port: 502 # Port
-
-      # Modbus TCP
-      modbus: tcpip
-      id: 1
-      host: 192.0.2.2 # Hostname
-      port: 502 # Port
-  - usage: battery
-    default: |
-      type: template
-      template: cg-em24
-      usage: battery      
-
-      # RS485 via adapter (Modbus RTU)
-      modbus: rs485serial
-      id: 1
-      device: /dev/ttyUSB0 # USB-RS485 Adapter Adresse
-      baudrate: 9600 # Prüfe die Geräteeinstellungen, typische Werte sind 9600, 19200, 38400, 57600, 115200
-      comset: "8N1" # Kommunikationsparameter für den Adapter
-
-      # RS485 via TCP/IP (Modbus RTU)
-      modbus: rs485tcpip
-      id: 1
-      host: 192.0.2.2 # Hostname
-      port: 502 # Port
-
      # Modbus TCP
      modbus: tcpip
      id: 1
--- a/templates/docs/meter/cg-emt3xx_0.yaml
+++ b/templates/docs/meter/cg-emt3xx_0.yaml
@ -21,54 +21,6 @@ render:
      host: 192.0.2.2 # Hostname
      port: 502 # Port

-      # Modbus TCP
-      modbus: tcpip
-      id: 1
-      host: 192.0.2.2 # Hostname
-      port: 502 # Port
-  - usage: pv
-    default: |
-      type: template
-      template: cg-emt3xx
-      usage: pv      
-
-      # RS485 via adapter (Modbus RTU)
-      modbus: rs485serial
-      id: 1
-      device: /dev/ttyUSB0 # USB-RS485 Adapter Adresse
-      baudrate: 9600 # Prüfe die Geräteeinstellungen, typische Werte sind 9600, 19200, 38400, 57600, 115200
-      comset: "8N1" # Kommunikationsparameter für den Adapter
-
-      # RS485 via TCP/IP (Modbus RTU)
-      modbus: rs485tcpip
-      id: 1
-      host: 192.0.2.2 # Hostname
-      port: 502 # Port
-
-      # Modbus TCP
-      modbus: tcpip
-      id: 1
-      host: 192.0.2.2 # Hostname
-      port: 502 # Port
-  - usage: battery
-    default: |
-      type: template
-      template: cg-emt3xx
-      usage: battery      
-
-      # RS485 via adapter (Modbus RTU)
-      modbus: rs485serial
-      id: 1
-      device: /dev/ttyUSB0 # USB-RS485 Adapter Adresse
-      baudrate: 9600 # Prüfe die Geräteeinstellungen, typische Werte sind 9600, 19200, 38400, 57600, 115200
-      comset: "8N1" # Kommunikationsparameter für den Adapter
-
-      # RS485 via TCP/IP (Modbus RTU)
-      modbus: rs485tcpip
-      id: 1
-      host: 192.0.2.2 # Hostname
-      port: 502 # Port
-
      # Modbus TCP
      modbus: tcpip
      id: 1
--- a/templates/docs/meter/dzg_0.yaml
+++ b/templates/docs/meter/dzg_0.yaml
@ -0,0 +1,22 @@
+product:
+  brand: DZG
+  description: DVH4013
+render:
+  - usage: charge
+    default: |
+      type: template
+      template: dzg
+      usage: charge      
+
+      # RS485 via adapter (Modbus RTU)
+      modbus: rs485serial
+      id: 1
+      device: /dev/ttyUSB0 # USB-RS485 Adapter Adresse
+      baudrate: 9600 # Prüfe die Geräteeinstellungen, typische Werte sind 9600, 19200, 38400, 57600, 115200
+      comset: "8N1" # Kommunikationsparameter für den Adapter
+
+      # RS485 via TCP/IP (Modbus RTU)
+      modbus: rs485tcpip
+      id: 1
+      host: 192.0.2.2 # Hostname
+      port: 502 # Port
--- a/templates/docs/meter/e3dc_0.yaml
+++ b/templates/docs/meter/e3dc_0.yaml
@ -1,5 +1,5 @@
 product:
-  brand: E3DC
+  brand: E3/DC
 render:
  - usage: grid
    default: |
--- a/templates/docs/meter/eastron-sdm120_0.yaml
+++ b/templates/docs/meter/eastron-sdm120_0.yaml
@ -0,0 +1,40 @@
+product:
+  brand: Eastron
+  description: SDM120-Modbus
+render:
+  - usage: grid
+    default: |
+      type: template
+      template: eastron-sdm120
+      usage: grid      
+
+      # RS485 via adapter (Modbus RTU)
+      modbus: rs485serial
+      id: 1
+      device: /dev/ttyUSB0 # USB-RS485 Adapter Adresse
+      baudrate: 9600 # Prüfe die Geräteeinstellungen, typische Werte sind 9600, 19200, 38400, 57600, 115200
+      comset: "8N1" # Kommunikationsparameter für den Adapter
+
+      # RS485 via TCP/IP (Modbus RTU)
+      modbus: rs485tcpip
+      id: 1
+      host: 192.0.2.2 # Hostname
+      port: 502 # Port
+  - usage: charge
+    default: |
+      type: template
+      template: eastron-sdm120
+      usage: charge      
+
+      # RS485 via adapter (Modbus RTU)
+      modbus: rs485serial
+      id: 1
+      device: /dev/ttyUSB0 # USB-RS485 Adapter Adresse
+      baudrate: 9600 # Prüfe die Geräteeinstellungen, typische Werte sind 9600, 19200, 38400, 57600, 115200
+      comset: "8N1" # Kommunikationsparameter für den Adapter
+
+      # RS485 via TCP/IP (Modbus RTU)
+      modbus: rs485tcpip
+      id: 1
+      host: 192.0.2.2 # Hostname
+      port: 502 # Port
--- a/templates/docs/meter/eastron-sdm220_230_0.yaml
+++ b/templates/docs/meter/eastron-sdm220_230_0.yaml
@ -0,0 +1,40 @@
+product:
+  brand: Eastron
+  description: SDM220/230
+render:
+  - usage: grid
+    default: |
+      type: template
+      template: eastron-sdm220_230
+      usage: grid      
+
+      # RS485 via adapter (Modbus RTU)
+      modbus: rs485serial
+      id: 1
+      device: /dev/ttyUSB0 # USB-RS485 Adapter Adresse
+      baudrate: 9600 # Prüfe die Geräteeinstellungen, typische Werte sind 9600, 19200, 38400, 57600, 115200
+      comset: "8N1" # Kommunikationsparameter für den Adapter
+
+      # RS485 via TCP/IP (Modbus RTU)
+      modbus: rs485tcpip
+      id: 1
+      host: 192.0.2.2 # Hostname
+      port: 502 # Port
+  - usage: charge
+    default: |
+      type: template
+      template: eastron-sdm220_230
+      usage: charge      
+
+      # RS485 via adapter (Modbus RTU)
+      modbus: rs485serial
+      id: 1
+      device: /dev/ttyUSB0 # USB-RS485 Adapter Adresse
+      baudrate: 9600 # Prüfe die Geräteeinstellungen, typische Werte sind 9600, 19200, 38400, 57600, 115200
+      comset: "8N1" # Kommunikationsparameter für den Adapter
+
+      # RS485 via TCP/IP (Modbus RTU)
+      modbus: rs485tcpip
+      id: 1
+      host: 192.0.2.2 # Hostname
+      port: 502 # Port
--- a/templates/docs/meter/eastron-sdm72_0.yaml
+++ b/templates/docs/meter/eastron-sdm72_0.yaml
@ -0,0 +1,40 @@
+product:
+  brand: Eastron
+  description: SDM72D-M
+render:
+  - usage: grid
+    default: |
+      type: template
+      template: eastron-sdm72
+      usage: grid      
+
+      # RS485 via adapter (Modbus RTU)
+      modbus: rs485serial
+      id: 1
+      device: /dev/ttyUSB0 # USB-RS485 Adapter Adresse
+      baudrate: 9600 # Prüfe die Geräteeinstellungen, typische Werte sind 9600, 19200, 38400, 57600, 115200
+      comset: "8N1" # Kommunikationsparameter für den Adapter
+
+      # RS485 via TCP/IP (Modbus RTU)
+      modbus: rs485tcpip
+      id: 1
+      host: 192.0.2.2 # Hostname
+      port: 502 # Port
+  - usage: charge
+    default: |
+      type: template
+      template: eastron-sdm72
+      usage: charge      
+
+      # RS485 via adapter (Modbus RTU)
+      modbus: rs485serial
+      id: 1
+      device: /dev/ttyUSB0 # USB-RS485 Adapter Adresse
+      baudrate: 9600 # Prüfe die Geräteeinstellungen, typische Werte sind 9600, 19200, 38400, 57600, 115200
+      comset: "8N1" # Kommunikationsparameter für den Adapter
+
+      # RS485 via TCP/IP (Modbus RTU)
+      modbus: rs485tcpip
+      id: 1
+      host: 192.0.2.2 # Hostname
+      port: 502 # Port
--- a/templates/docs/meter/eastron-sdm72_220_230_0.yaml
+++ b/templates/docs/meter/eastron-sdm72_220_230_0.yaml
@ -1,76 +0,0 @@
-product:
-  brand: Eastron
-  description: SDM 72/220/230
-render:
-  - usage: grid
-    default: |
-      type: template
-      template: eastron-sdm72_220_230
-      usage: grid      
-
-      # RS485 via adapter (Modbus RTU)
-      modbus: rs485serial
-      id: 1
-      device: /dev/ttyUSB0 # USB-RS485 Adapter Adresse
-      baudrate: 9600 # Prüfe die Geräteeinstellungen, typische Werte sind 9600, 19200, 38400, 57600, 115200
-      comset: "8N1" # Kommunikationsparameter für den Adapter
-
-      # RS485 via TCP/IP (Modbus RTU)
-      modbus: rs485tcpip
-      id: 1
-      host: 192.0.2.2 # Hostname
-      port: 502 # Port
-  - usage: pv
-    default: |
-      type: template
-      template: eastron-sdm72_220_230
-      usage: pv      
-
-      # RS485 via adapter (Modbus RTU)
-      modbus: rs485serial
-      id: 1
-      device: /dev/ttyUSB0 # USB-RS485 Adapter Adresse
-      baudrate: 9600 # Prüfe die Geräteeinstellungen, typische Werte sind 9600, 19200, 38400, 57600, 115200
-      comset: "8N1" # Kommunikationsparameter für den Adapter
-
-      # RS485 via TCP/IP (Modbus RTU)
-      modbus: rs485tcpip
-      id: 1
-      host: 192.0.2.2 # Hostname
-      port: 502 # Port
-  - usage: battery
-    default: |
-      type: template
-      template: eastron-sdm72_220_230
-      usage: battery      
-
-      # RS485 via adapter (Modbus RTU)
-      modbus: rs485serial
-      id: 1
-      device: /dev/ttyUSB0 # USB-RS485 Adapter Adresse
-      baudrate: 9600 # Prüfe die Geräteeinstellungen, typische Werte sind 9600, 19200, 38400, 57600, 115200
-      comset: "8N1" # Kommunikationsparameter für den Adapter
-
-      # RS485 via TCP/IP (Modbus RTU)
-      modbus: rs485tcpip
-      id: 1
-      host: 192.0.2.2 # Hostname
-      port: 502 # Port
-  - usage: charge
-    default: |
-      type: template
-      template: eastron-sdm72_220_230
-      usage: charge      
-
-      # RS485 via adapter (Modbus RTU)
-      modbus: rs485serial
-      id: 1
-      device: /dev/ttyUSB0 # USB-RS485 Adapter Adresse
-      baudrate: 9600 # Prüfe die Geräteeinstellungen, typische Werte sind 9600, 19200, 38400, 57600, 115200
-      comset: "8N1" # Kommunikationsparameter für den Adapter
-
-      # RS485 via TCP/IP (Modbus RTU)
-      modbus: rs485tcpip
-      id: 1
-      host: 192.0.2.2 # Hostname
-      port: 502 # Port
--- a/templates/docs/meter/eastron_0.yaml
+++ b/templates/docs/meter/eastron_0.yaml
@ -1,10 +1,30 @@
 product:
  brand: Eastron
-  description: SDM 630
+  description: SDM630-Modbus
 render:
-  - default: |
+  - usage: grid
+    default: |
      type: template
-      template: eastron      
+      template: eastron
+      usage: grid      
+
+      # RS485 via adapter (Modbus RTU)
+      modbus: rs485serial
+      id: 1
+      device: /dev/ttyUSB0 # USB-RS485 Adapter Adresse
+      baudrate: 9600 # Prüfe die Geräteeinstellungen, typische Werte sind 9600, 19200, 38400, 57600, 115200
+      comset: "8N1" # Kommunikationsparameter für den Adapter
+
+      # RS485 via TCP/IP (Modbus RTU)
+      modbus: rs485tcpip
+      id: 1
+      host: 192.0.2.2 # Hostname
+      port: 502 # Port
+  - usage: charge
+    default: |
+      type: template
+      template: eastron
+      usage: charge      

      # RS485 via adapter (Modbus RTU)
      modbus: rs485serial
--- a/templates/docs/meter/eastron_1.yaml
+++ b/templates/docs/meter/eastron_1.yaml
@ -1,10 +1,30 @@
 product:
  brand: Eastron
-  description: SDM 72v2
+  description: SDM72DM-V2
 render:
-  - default: |
+  - usage: grid
+    default: |
      type: template
-      template: eastron      
+      template: eastron
+      usage: grid      
+
+      # RS485 via adapter (Modbus RTU)
+      modbus: rs485serial
+      id: 1
+      device: /dev/ttyUSB0 # USB-RS485 Adapter Adresse
+      baudrate: 9600 # Prüfe die Geräteeinstellungen, typische Werte sind 9600, 19200, 38400, 57600, 115200
+      comset: "8N1" # Kommunikationsparameter für den Adapter
+
+      # RS485 via TCP/IP (Modbus RTU)
+      modbus: rs485tcpip
+      id: 1
+      host: 192.0.2.2 # Hostname
+      port: 502 # Port
+  - usage: charge
+    default: |
+      type: template
+      template: eastron
+      usage: charge      

      # RS485 via adapter (Modbus RTU)
      modbus: rs485serial
--- a/templates/docs/meter/inepro_0.yaml
+++ b/templates/docs/meter/inepro_0.yaml
@ -0,0 +1,40 @@
+product:
+  brand: inepro
+  description: PRO380-MOD
+render:
+  - usage: grid
+    default: |
+      type: template
+      template: inepro
+      usage: grid      
+
+      # RS485 via adapter (Modbus RTU)
+      modbus: rs485serial
+      id: 1
+      device: /dev/ttyUSB0 # USB-RS485 Adapter Adresse
+      baudrate: 9600 # Prüfe die Geräteeinstellungen, typische Werte sind 9600, 19200, 38400, 57600, 115200
+      comset: "8N1" # Kommunikationsparameter für den Adapter
+
+      # RS485 via TCP/IP (Modbus RTU)
+      modbus: rs485tcpip
+      id: 1
+      host: 192.0.2.2 # Hostname
+      port: 502 # Port
+  - usage: charge
+    default: |
+      type: template
+      template: inepro
+      usage: charge      
+
+      # RS485 via adapter (Modbus RTU)
+      modbus: rs485serial
+      id: 1
+      device: /dev/ttyUSB0 # USB-RS485 Adapter Adresse
+      baudrate: 9600 # Prüfe die Geräteeinstellungen, typische Werte sind 9600, 19200, 38400, 57600, 115200
+      comset: "8N1" # Kommunikationsparameter für den Adapter
+
+      # RS485 via TCP/IP (Modbus RTU)
+      modbus: rs485tcpip
+      id: 1
+      host: 192.0.2.2 # Hostname
+      port: 502 # Port
--- a/templates/docs/meter/janitza-b23_0.yaml
+++ b/templates/docs/meter/janitza-b23_0.yaml
@ -2,9 +2,35 @@ product:
  brand: Janitza
  description: B23
 render:
-  - default: |
+  - usage: grid
+    default: |
      type: template
-      template: janitza-b23      
+      template: janitza-b23
+      usage: grid      
+
+      # RS485 via adapter (Modbus RTU)
+      modbus: rs485serial
+      id: 1
+      device: /dev/ttyUSB0 # USB-RS485 Adapter Adresse
+      baudrate: 9600 # Prüfe die Geräteeinstellungen, typische Werte sind 9600, 19200, 38400, 57600, 115200
+      comset: "8N1" # Kommunikationsparameter für den Adapter
+
+      # RS485 via TCP/IP (Modbus RTU)
+      modbus: rs485tcpip
+      id: 1
+      host: 192.0.2.2 # Hostname
+      port: 502 # Port
+
+      # Modbus TCP
+      modbus: tcpip
+      id: 1
+      host: 192.0.2.2 # Hostname
+      port: 502 # Port
+  - usage: charge
+    default: |
+      type: template
+      template: janitza-b23
+      usage: charge      

      # RS485 via adapter (Modbus RTU)
      modbus: rs485serial
--- a/templates/docs/meter/mpm3pm_0.yaml
+++ b/templates/docs/meter/mpm3pm_0.yaml
@ -0,0 +1,40 @@
+product:
+  brand: Bernecker Engineering
+  description: MPM3PM
+render:
+  - usage: grid
+    default: |
+      type: template
+      template: mpm3pm
+      usage: grid      
+
+      # RS485 via adapter (Modbus RTU)
+      modbus: rs485serial
+      id: 1
+      device: /dev/ttyUSB0 # USB-RS485 Adapter Adresse
+      baudrate: 9600 # Prüfe die Geräteeinstellungen, typische Werte sind 9600, 19200, 38400, 57600, 115200
+      comset: "8N1" # Kommunikationsparameter für den Adapter
+
+      # RS485 via TCP/IP (Modbus RTU)
+      modbus: rs485tcpip
+      id: 1
+      host: 192.0.2.2 # Hostname
+      port: 502 # Port
+  - usage: charge
+    default: |
+      type: template
+      template: mpm3pm
+      usage: charge      
+
+      # RS485 via adapter (Modbus RTU)
+      modbus: rs485serial
+      id: 1
+      device: /dev/ttyUSB0 # USB-RS485 Adapter Adresse
+      baudrate: 9600 # Prüfe die Geräteeinstellungen, typische Werte sind 9600, 19200, 38400, 57600, 115200
+      comset: "8N1" # Kommunikationsparameter für den Adapter
+
+      # RS485 via TCP/IP (Modbus RTU)
+      modbus: rs485tcpip
+      id: 1
+      host: 192.0.2.2 # Hostname
+      port: 502 # Port
--- a/templates/docs/meter/orno_0.yaml
+++ b/templates/docs/meter/orno_0.yaml
@ -0,0 +1,40 @@
+product:
+  brand: Orno
+  description: OR-WE-516, OR-WE-517
+render:
+  - usage: grid
+    default: |
+      type: template
+      template: orno
+      usage: grid      
+
+      # RS485 via adapter (Modbus RTU)
+      modbus: rs485serial
+      id: 1
+      device: /dev/ttyUSB0 # USB-RS485 Adapter Adresse
+      baudrate: 9600 # Prüfe die Geräteeinstellungen, typische Werte sind 9600, 19200, 38400, 57600, 115200
+      comset: "8N1" # Kommunikationsparameter für den Adapter
+
+      # RS485 via TCP/IP (Modbus RTU)
+      modbus: rs485tcpip
+      id: 1
+      host: 192.0.2.2 # Hostname
+      port: 502 # Port
+  - usage: charge
+    default: |
+      type: template
+      template: orno
+      usage: charge      
+
+      # RS485 via adapter (Modbus RTU)
+      modbus: rs485serial
+      id: 1
+      device: /dev/ttyUSB0 # USB-RS485 Adapter Adresse
+      baudrate: 9600 # Prüfe die Geräteeinstellungen, typische Werte sind 9600, 19200, 38400, 57600, 115200
+      comset: "8N1" # Kommunikationsparameter für den Adapter
+
+      # RS485 via TCP/IP (Modbus RTU)
+      modbus: rs485tcpip
+      id: 1
+      host: 192.0.2.2 # Hostname
+      port: 502 # Port
--- a/templates/docs/meter/sbc-axx3_0.yaml
+++ b/templates/docs/meter/sbc-axx3_0.yaml
@ -0,0 +1,40 @@
+product:
+  brand: Saia-Burgess Controls
+  description: ALE3, AWD3
+render:
+  - usage: grid
+    default: |
+      type: template
+      template: sbc-axx3
+      usage: grid      
+
+      # RS485 via adapter (Modbus RTU)
+      modbus: rs485serial
+      id: 1
+      device: /dev/ttyUSB0 # USB-RS485 Adapter Adresse
+      baudrate: 9600 # Prüfe die Geräteeinstellungen, typische Werte sind 9600, 19200, 38400, 57600, 115200
+      comset: "8N1" # Kommunikationsparameter für den Adapter
+
+      # RS485 via TCP/IP (Modbus RTU)
+      modbus: rs485tcpip
+      id: 1
+      host: 192.0.2.2 # Hostname
+      port: 502 # Port
+  - usage: charge
+    default: |
+      type: template
+      template: sbc-axx3
+      usage: charge      
+
+      # RS485 via adapter (Modbus RTU)
+      modbus: rs485serial
+      id: 1
+      device: /dev/ttyUSB0 # USB-RS485 Adapter Adresse
+      baudrate: 9600 # Prüfe die Geräteeinstellungen, typische Werte sind 9600, 19200, 38400, 57600, 115200
+      comset: "8N1" # Kommunikationsparameter für den Adapter
+
+      # RS485 via TCP/IP (Modbus RTU)
+      modbus: rs485tcpip
+      id: 1
+      host: 192.0.2.2 # Hostname
+      port: 502 # Port
--- a/templates/docs/meter/schneider-iem3000_0.yaml
+++ b/templates/docs/meter/schneider-iem3000_0.yaml
@ -0,0 +1,40 @@
+product:
+  brand: Schneider Electric
+  description: iEM3xxx Modbus
+render:
+  - usage: grid
+    default: |
+      type: template
+      template: schneider-iem3000
+      usage: grid      
+
+      # RS485 via adapter (Modbus RTU)
+      modbus: rs485serial
+      id: 1
+      device: /dev/ttyUSB0 # USB-RS485 Adapter Adresse
+      baudrate: 9600 # Prüfe die Geräteeinstellungen, typische Werte sind 9600, 19200, 38400, 57600, 115200
+      comset: "8N1" # Kommunikationsparameter für den Adapter
+
+      # RS485 via TCP/IP (Modbus RTU)
+      modbus: rs485tcpip
+      id: 1
+      host: 192.0.2.2 # Hostname
+      port: 502 # Port
+  - usage: charge
+    default: |
+      type: template
+      template: schneider-iem3000
+      usage: charge      
+
+      # RS485 via adapter (Modbus RTU)
+      modbus: rs485serial
+      id: 1
+      device: /dev/ttyUSB0 # USB-RS485 Adapter Adresse
+      baudrate: 9600 # Prüfe die Geräteeinstellungen, typische Werte sind 9600, 19200, 38400, 57600, 115200
+      comset: "8N1" # Kommunikationsparameter für den Adapter
+
+      # RS485 via TCP/IP (Modbus RTU)
+      modbus: rs485tcpip
+      id: 1
+      host: 192.0.2.2 # Hostname
+      port: 502 # Port
--- a/templates/docs/meter/siemens-7kt1665_0.yaml
+++ b/templates/docs/meter/siemens-7kt1665_0.yaml
@ -21,54 +21,6 @@ render:
      host: 192.0.2.2 # Hostname
      port: 502 # Port

-      # Modbus TCP
-      modbus: tcpip
-      id: 1
-      host: 192.0.2.2 # Hostname
-      port: 502 # Port
-  - usage: pv
-    default: |
-      type: template
-      template: siemens-7kt1665
-      usage: pv      
-
-      # RS485 via adapter (Modbus RTU)
-      modbus: rs485serial
-      id: 1
-      device: /dev/ttyUSB0 # USB-RS485 Adapter Adresse
-      baudrate: 9600 # Prüfe die Geräteeinstellungen, typische Werte sind 9600, 19200, 38400, 57600, 115200
-      comset: "8N1" # Kommunikationsparameter für den Adapter
-
-      # RS485 via TCP/IP (Modbus RTU)
-      modbus: rs485tcpip
-      id: 1
-      host: 192.0.2.2 # Hostname
-      port: 502 # Port
-
-      # Modbus TCP
-      modbus: tcpip
-      id: 1
-      host: 192.0.2.2 # Hostname
-      port: 502 # Port
-  - usage: battery
-    default: |
-      type: template
-      template: siemens-7kt1665
-      usage: battery      
-
-      # RS485 via adapter (Modbus RTU)
-      modbus: rs485serial
-      id: 1
-      device: /dev/ttyUSB0 # USB-RS485 Adapter Adresse
-      baudrate: 9600 # Prüfe die Geräteeinstellungen, typische Werte sind 9600, 19200, 38400, 57600, 115200
-      comset: "8N1" # Kommunikationsparameter für den Adapter
-
-      # RS485 via TCP/IP (Modbus RTU)
-      modbus: rs485tcpip
-      id: 1
-      host: 192.0.2.2 # Hostname
-      port: 502 # Port
-
      # Modbus TCP
      modbus: tcpip
      id: 1
--- a/templates/docs/meter/siemens-pac2200_0.yaml
+++ b/templates/docs/meter/siemens-pac2200_0.yaml
@ -21,54 +21,6 @@ render:
      host: 192.0.2.2 # Hostname
      port: 502 # Port

-      # Modbus TCP
-      modbus: tcpip
-      id: 1
-      host: 192.0.2.2 # Hostname
-      port: 502 # Port
-  - usage: pv
-    default: |
-      type: template
-      template: siemens-pac2200
-      usage: pv      
-
-      # RS485 via adapter (Modbus RTU)
-      modbus: rs485serial
-      id: 1
-      device: /dev/ttyUSB0 # USB-RS485 Adapter Adresse
-      baudrate: 9600 # Prüfe die Geräteeinstellungen, typische Werte sind 9600, 19200, 38400, 57600, 115200
-      comset: "8N1" # Kommunikationsparameter für den Adapter
-
-      # RS485 via TCP/IP (Modbus RTU)
-      modbus: rs485tcpip
-      id: 1
-      host: 192.0.2.2 # Hostname
-      port: 502 # Port
-
-      # Modbus TCP
-      modbus: tcpip
-      id: 1
-      host: 192.0.2.2 # Hostname
-      port: 502 # Port
-  - usage: battery
-    default: |
-      type: template
-      template: siemens-pac2200
-      usage: battery      
-
-      # RS485 via adapter (Modbus RTU)
-      modbus: rs485serial
-      id: 1
-      device: /dev/ttyUSB0 # USB-RS485 Adapter Adresse
-      baudrate: 9600 # Prüfe die Geräteeinstellungen, typische Werte sind 9600, 19200, 38400, 57600, 115200
-      comset: "8N1" # Kommunikationsparameter für den Adapter
-
-      # RS485 via TCP/IP (Modbus RTU)
-      modbus: rs485tcpip
-      id: 1
-      host: 192.0.2.2 # Hostname
-      port: 502 # Port
-
      # Modbus TCP
      modbus: tcpip
      id: 1
--- a/templates/evcc.io/brands.json
+++ b/templates/evcc.io/brands.json
@ -58,12 +58,15 @@
  "TP-Link"
 ],
 "Meters": [
+  "ABB",
  "Alpha ESS",
  "AVM",
+  "Bernecker Engineering",
  "Carlo Gavazzi",
  "cFos",
  "DSMR",
-  "E3DC",
+  "DZG",
+  "E3/DC",
  "Eastron",
  "FENECON",
  "FoxESS",
@ -72,14 +75,19 @@
  "Growatt",
  "Homematic IP",
  "Huawei",
+  "inepro",
+  "Janitza",
  "Kostal",
  "LG",
  "myStrom",
  "OpenEMS",
+  "Orno",
  "Powerfox",
  "Qcells",
  "RCT",
+  "Saia-Burgess Controls",
  "SAX",
+  "Schneider Electric",
  "SENEC",
  "Shelly",
  "Siemens",
@ -100,9 +108,7 @@
 "PVBattery": [
  "Alpha ESS",
  "AVM",
-  "Carlo Gavazzi",
-  "E3DC",
-  "Eastron",
+  "E3/DC",
  "FENECON",
  "FoxESS",
  "Fronius",
@ -121,7 +127,6 @@
  "SENEC",
  "Senergy",
  "Shelly",
-  "Siemens",
  "SMA",
  "SolarEdge",
  "SolarMax",