Docs: add more mbmd meter templates (#3285)

2022-05-01 12:32:18 +02:00 · 2022-05-01 12:32:18 +02:00 · aeb5d12b1f
commit aeb5d12b1f
parent 0d5adcbcd2
21 changed files with 395 additions and 30 deletions
--- a/templates/definition/meter/cg-em24.yaml
+++ b/templates/definition/meter/cg-em24.yaml
@ -0,0 +1,23 @@
+template: cg-em24
+products:
+  - brand: Carlo Gavazzi
+    description:
+      generic: EM 24
+params:
+  - name: usage
+    choice: ["grid", "pv", "battery", "charge"]
+  - name: modbus
+    choice: ["rs485"]
+render: |
+  type: modbus
+  model: cgem24
+  {{- if eq .usage "charge" }}
+  energy: Import # only required for charge meter usage
+  {{- end }}
+  {{- if or (eq .usage "charge") (eq .usage "grid") }}
+  currents:
+    - CurrentL1
+    - CurrentL2
+    - CurrentL3
+  {{- end }}
+  {{- include "modbus" . }}
--- a/templates/definition/meter/discovergy.yaml
+++ b/templates/definition/meter/discovergy.yaml
@ -1,7 +1,7 @@
 template: discovergy
 products:
  - description:
-      generic: Discovergy (Cloud)
+      generic: Discovergy
 params:
  - name: usage
    choice: ["grid", "pv"]
--- a/templates/definition/meter/eastron-sdm630.yaml
+++ b/templates/definition/meter/eastron-sdm630.yaml
@ -0,0 +1,26 @@
+template: eastron
+products:
+  - brand: Eastron
+    description:
+      generic: SDM 630
+  - brand: Eastron
+    description:
+      generic: SDM 72v2
+params:
+  - name: usage
+    choice: ["grid", "pv", "battery", "charge"]
+  - name: modbus
+    choice: ["rs485"]
+render: |
+  type: modbus
+  model: sdm
+  {{- if eq .usage "charge" }}
+  energy: Sum # only required for charge meter usage
+  {{- end }}
+  {{- if or (eq .usage "charge") (eq .usage "grid") }}
+  currents:
+    - CurrentL1
+    - CurrentL2
+    - CurrentL3
+  {{- end }}
+  {{- include "modbus" . }}
--- a/templates/definition/meter/eastron-sdm72_220_230.yaml
+++ b/templates/definition/meter/eastron-sdm72_220_230.yaml
@ -1,8 +1,8 @@
-template: eastron
+template: eastron-sdm72_220_230
 products:
  - brand: Eastron
    description:
-      generic: SDM Modbus
+      generic: SDM 72/220/230
 params:
  - name: usage
    choice: ["grid", "pv", "battery", "charge"]
@ -10,7 +10,7 @@ params:
    choice: ["rs485"]
 render: |
  type: modbus
-  model: sdm # specific non-sunspec meter
+  model: sdm220
  {{- if eq .usage "charge" }}
  energy: Sum # only required for charge meter usage
  {{- end }}
--- a/templates/definition/meter/powerfox-poweropti.yaml
+++ b/templates/definition/meter/powerfox-poweropti.yaml
@ -2,7 +2,7 @@ template: powerfox-poweropti
 products:
  - brand: Powerfox
    description:
-      generic: Poweropti (Cloud)
+      generic: Poweropti
 params:
  - name: usage
    choice: ["grid"]
--- a/templates/definition/meter/siemens-pac2200.yaml
+++ b/templates/definition/meter/siemens-pac2200.yaml
@ -0,0 +1,23 @@
+template: siemens-pac2200
+products:
+  - brand: Siemens
+    description:
+      generic: PAC 2200
+params:
+  - name: usage
+    choice: ["grid", "pv", "battery", "charge"]
+  - name: modbus
+    choice: ["rs485"]
+render: |
+  type: modbus
+  model: pac2200
+  {{- if eq .usage "charge" }}
+  energy: Sum # only required for charge meter usage
+  {{- end }}
+  {{- if or (eq .usage "charge") (eq .usage "grid") }}
+  currents:
+    - CurrentL1
+    - CurrentL2
+    - CurrentL3
+  {{- end }}
+  {{- include "modbus" . }}
--- a/templates/definition/meter/solax-hybrid-cloud.yaml
+++ b/templates/definition/meter/solax-hybrid-cloud.yaml
@ -2,7 +2,7 @@ template: solax-hybrid-cloud
 products:
  - brand: Solax
    description:
-      generic: Hybrid (Cloud)
+      generic: Hybrid
 requirements:
  description:
    de: |
--- a/templates/definition/meter/solax-inverter-cloud.yaml
+++ b/templates/definition/meter/solax-inverter-cloud.yaml
@ -2,8 +2,8 @@ template: solax-inverter-cloud
 products:
  - brand: Solax
    description:
-      de: Wechselrichter (Cloud)
-      en: Inverter (Cloud)
+      de: Wechselrichter
+      en: Inverter
 requirements:
  description:
    de: |
--- a/templates/definition/meter/tq-em.yaml
+++ b/templates/definition/meter/tq-em.yaml
@ -2,10 +2,7 @@ template: tq-em
 products:
  - brand: TQ
    description:
-      generic: Energy Manager EM2xx
-  - brand: TQ
-    description:
-      generic: Energy Manager EM3xx
+      generic: Energy Manager EM2xx/EM3xx
 params:
  - name: usage
    choice: ["grid"]
--- a/templates/docs/meter/cg-em24_0.yaml
+++ b/templates/docs/meter/cg-em24_0.yaml
@ -0,0 +1,76 @@
+product:
+  brand: Carlo Gavazzi
+  description: EM 24
+render:
+  - usage: grid
+    default: |
+      type: template
+      template: cg-em24
+      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: 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
+  - 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
+  - usage: charge
+    default: |
+      type: template
+      template: cg-em24
+      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/discovergy_0.yaml
+++ b/templates/docs/meter/discovergy_0.yaml
@ -1,5 +1,5 @@
 product:
-  description: Discovergy (Cloud)
+  description: Discovergy
 render:
  - usage: grid
    default: |
--- a/templates/docs/meter/eastron-sdm72_220_230_0.yaml
+++ b/templates/docs/meter/eastron-sdm72_220_230_0.yaml
@ -0,0 +1,76 @@
+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,6 +1,6 @@
 product:
  brand: Eastron
-  description: SDM Modbus
+  description: SDM 630
 render:
  - usage: grid
    default: |
--- a/templates/docs/meter/eastron_1.yaml
+++ b/templates/docs/meter/eastron_1.yaml
@ -0,0 +1,76 @@
+product:
+  brand: Eastron
+  description: SDM 72v2
+render:
+  - usage: grid
+    default: |
+      type: template
+      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: pv
+    default: |
+      type: template
+      template: eastron
+      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
+      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
+      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/powerfox-poweropti_0.yaml
+++ b/templates/docs/meter/powerfox-poweropti_0.yaml
@ -1,6 +1,6 @@
 product:
  brand: Powerfox
-  description: Poweropti (Cloud)
+  description: Poweropti
 render:
  - usage: grid
    default: |
--- a/templates/docs/meter/siemens-pac2200_0.yaml
+++ b/templates/docs/meter/siemens-pac2200_0.yaml
@ -0,0 +1,76 @@
+product:
+  brand: Siemens
+  description: PAC 2200
+render:
+  - usage: grid
+    default: |
+      type: template
+      template: siemens-pac2200
+      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: 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
+  - 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
+  - usage: charge
+    default: |
+      type: template
+      template: siemens-pac2200
+      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/solax-hybrid-cloud_0.yaml
+++ b/templates/docs/meter/solax-hybrid-cloud_0.yaml
@ -1,6 +1,6 @@
 product:
  brand: Solax
-  description: Hybrid (Cloud)
+  description: Hybrid
 description: |
  Der Solax Inverter muss in der SolaxCloud angemeldet sein.

--- a/templates/docs/meter/solax-inverter-cloud_0.yaml
+++ b/templates/docs/meter/solax-inverter-cloud_0.yaml
@ -1,6 +1,6 @@
 product:
  brand: Solax
-  description: Wechselrichter (Cloud)
+  description: Wechselrichter
 description: |
  Der Solax Inverter muss in der SolaxCloud angemeldet sein.

--- a/templates/docs/meter/tq-em_0.yaml
+++ b/templates/docs/meter/tq-em_0.yaml
@ -1,6 +1,6 @@
 product:
  brand: TQ
-  description: Energy Manager EM2xx
+  description: Energy Manager EM2xx/EM3xx
 render:
  - usage: grid
    default: |
--- a/templates/docs/meter/tq-em_1.yaml
+++ b/templates/docs/meter/tq-em_1.yaml
@ -1,12 +0,0 @@
-product:
-  brand: TQ
-  description: Energy Manager EM3xx
-render:
-  - usage: grid
-    default: |
-      type: template
-      template: tq-em
-      usage: grid
-      host: 192.0.2.2 # IP-Adresse oder Hostname
-      port: 80 # Port # Optional
-      password: # Passwort des Benutzerkontos (bei führenden Nullen bitte in einfache Hochkommata setzen) # Optional
--- a/templates/evcc.io/brands.json
+++ b/templates/evcc.io/brands.json
@ -43,6 +43,7 @@
 ],
 "Meters": [
  "AVM",
+  "Carlo Gavazzi",
  "cFos",
  "Eastron",
  "FENECON",
@ -55,6 +56,7 @@
  "RCT",
  "SENEC",
  "Shelly",
+  "Siemens",
  "SMA",
  "SolarEdge",
  "Solarwatt",
@ -69,6 +71,7 @@
 ],
 "PVBattery": [
  "AVM",
+  "Carlo Gavazzi",
  "Eastron",
  "FENECON",
  "Fronius",
@ -79,6 +82,7 @@
  "RCT",
  "SENEC",
  "Shelly",
+  "Siemens",
  "SMA",
  "SolarEdge",
  "Solarwatt",