Mbmd: support non-Sunspec meters using ModbusTCP (#3354)

templates/definition/meter/cg-em24.yaml

@@ -7,10 +7,11 @@ params:
   - name: usage
     choice: ["grid", "pv", "battery", "charge"]
   - name: modbus
-    choice: ["tcpip"]
+    choice: ["rs485", "tcpip"]
 render: |
   type: modbus
   model: cgem24
+  {{- include "modbus" . }}
   {{- if eq .usage "charge" }}
   energy: Import # only required for charge meter usage
   {{- end }}
@@ -20,4 +21,3 @@ render: |
     - CurrentL2
     - CurrentL3
   {{- end }}
-  {{- include "modbus" . }}

templates/definition/meter/siemens-pac2200.yaml

@@ -7,12 +7,13 @@ params:
   - name: usage
     choice: ["grid", "pv", "battery", "charge"]
   - name: modbus
-    choice: ["rs485"]
+    choice: ["rs485", "tcpip"]
 render: |
   type: modbus
   model: pac2200
+  {{- include "modbus" . }}
   {{- if eq .usage "charge" }}
-  energy: Sum # only required for charge meter usage
+  energy: Import # only required for charge meter usage
   {{- end }}
   {{- if or (eq .usage "charge") (eq .usage "grid") }}
   currents:
@@ -20,4 +21,3 @@ render: |
     - CurrentL2
     - CurrentL3
   {{- end }}
-  {{- include "modbus" . }}

templates/docs/meter/cg-em24_0.yaml

@@ -8,6 +8,19 @@ render:
       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
+
       # Modbus TCP
       modbus: tcpip
       id: 1
@@ -19,6 +32,19 @@ render:
       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
@@ -30,6 +56,19 @@ render:
       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
@@ -41,6 +80,19 @@ render:
       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
+
       # Modbus TCP
       modbus: tcpip
       id: 1

templates/docs/meter/siemens-pac2200_0.yaml

@@ -20,6 +20,12 @@ render:
       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: pv
     default: |
       type: template
@@ -38,6 +44,12 @@ render:
       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
@@ -56,6 +68,12 @@ render:
       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
@@ -74,3 +92,9 @@ render:
       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

util/templates/modbus.tpl

@@ -14,5 +14,6 @@ rtu: true
 {{- if or (eq .modbus "tcpip") .tcpip }}
 # Modbus TCP
 uri: {{ .host }}:{{ .port }}
+rtu: false
 {{- end }}
 {{- end}}