From 06d69a834bb050a812d2a7ceaa30e17e03e430bd Mon Sep 17 00:00:00 2001
From: premultiply <4681172+premultiply@users.noreply.github.com>
Date: Mon, 24 Jul 2023 21:41:23 +0200
Subject: [PATCH] M-Tec: fix id default and grid power scale (#9084)

---
 templates/definition/meter/mtec-eb-gen2.yaml |  2 ++
 templates/definition/meter/mtec-eb-gen3.yaml |  2 ++
 templates/docs/meter/mtec-eb-gen2_0.yaml     | 12 ++++++------
 templates/docs/meter/mtec-eb-gen3_0.yaml     | 12 ++++++------
 4 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/templates/definition/meter/mtec-eb-gen2.yaml b/templates/definition/meter/mtec-eb-gen2.yaml
index a465f14d0..647ed0552 100644
--- a/templates/definition/meter/mtec-eb-gen2.yaml
+++ b/templates/definition/meter/mtec-eb-gen2.yaml
@@ -8,6 +8,7 @@ params:
     choice: ["grid", "pv", "battery"]
   - name: modbus
     choice: ["rs485"]
+    id: 247
 render: |
   type: custom
   {{- if eq .usage "grid" }}
@@ -18,6 +19,7 @@ render: |
       address: 11000 # Zähler (NVP) Leistung
       type: holding
       decode: int32
+    scale: -1
   {{- end }}
   {{- if eq .usage "pv" }}
   power:
diff --git a/templates/definition/meter/mtec-eb-gen3.yaml b/templates/definition/meter/mtec-eb-gen3.yaml
index 34adb214c..ca07ed939 100644
--- a/templates/definition/meter/mtec-eb-gen3.yaml
+++ b/templates/definition/meter/mtec-eb-gen3.yaml
@@ -8,6 +8,7 @@ params:
     choice: ["grid", "pv", "battery"]
   - name: modbus
     choice: ["rs485"]
+    id: 247
 render: |
   type: custom
   {{- if eq .usage "grid" }}
@@ -18,6 +19,7 @@ render: |
       address: 11000 # Zähler (NVP) Leistung
       type: holding
       decode: int32
+    scale: -1
   {{- end }}
   {{- if eq .usage "pv" }}
   power:
diff --git a/templates/docs/meter/mtec-eb-gen2_0.yaml b/templates/docs/meter/mtec-eb-gen2_0.yaml
index 5f76fb894..de33af612 100644
--- a/templates/docs/meter/mtec-eb-gen2_0.yaml
+++ b/templates/docs/meter/mtec-eb-gen2_0.yaml
@@ -10,14 +10,14 @@ render:
 
       # RS485 via adapter (Modbus RTU)
       modbus: rs485serial
-      id: 1
+      id: 247
       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
+      id: 247
       host: 192.0.2.2 # Hostname
       port: 502 # Port
   - usage: pv
@@ -28,14 +28,14 @@ render:
 
       # RS485 via adapter (Modbus RTU)
       modbus: rs485serial
-      id: 1
+      id: 247
       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
+      id: 247
       host: 192.0.2.2 # Hostname
       port: 502 # Port
   - usage: battery
@@ -46,13 +46,13 @@ render:
 
       # RS485 via adapter (Modbus RTU)
       modbus: rs485serial
-      id: 1
+      id: 247
       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
+      id: 247
       host: 192.0.2.2 # Hostname
       port: 502 # Port
diff --git a/templates/docs/meter/mtec-eb-gen3_0.yaml b/templates/docs/meter/mtec-eb-gen3_0.yaml
index 850d6ee23..05740fae5 100644
--- a/templates/docs/meter/mtec-eb-gen3_0.yaml
+++ b/templates/docs/meter/mtec-eb-gen3_0.yaml
@@ -10,14 +10,14 @@ render:
 
       # RS485 via adapter (Modbus RTU)
       modbus: rs485serial
-      id: 1
+      id: 247
       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
+      id: 247
       host: 192.0.2.2 # Hostname
       port: 502 # Port
   - usage: pv
@@ -28,14 +28,14 @@ render:
 
       # RS485 via adapter (Modbus RTU)
       modbus: rs485serial
-      id: 1
+      id: 247
       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
+      id: 247
       host: 192.0.2.2 # Hostname
       port: 502 # Port
   - usage: battery
@@ -46,13 +46,13 @@ render:
 
       # RS485 via adapter (Modbus RTU)
       modbus: rs485serial
-      id: 1
+      id: 247
       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
+      id: 247
       host: 192.0.2.2 # Hostname
       port: 502 # Port