From be93681affdef71af7d4b7ff30cad67e7cd51c5c Mon Sep 17 00:00:00 2001
From: andig <cpuidle@gmx.de>
Date: Mon, 24 Oct 2022 21:28:04 +0200
Subject: [PATCH] Varta: remove battery only template (#4929)

---
 .../varta-energiespeicher-battery-only.yaml   | 42 -------------------
 ...{varta-energiespeicher.yaml => varta.yaml} |  7 ++--
 .../varta-energiespeicher-battery-only_0.yaml | 18 --------
 ...ta-energiespeicher_0.yaml => varta_0.yaml} |  8 ++--
 4 files changed, 8 insertions(+), 67 deletions(-)
 delete mode 100644 templates/definition/meter/varta-energiespeicher-battery-only.yaml
 rename templates/definition/meter/{varta-energiespeicher.yaml => varta.yaml} (79%)
 delete mode 100644 templates/docs/meter/varta-energiespeicher-battery-only_0.yaml
 rename templates/docs/meter/{varta-energiespeicher_0.yaml => varta_0.yaml} (75%)

diff --git a/templates/definition/meter/varta-energiespeicher-battery-only.yaml b/templates/definition/meter/varta-energiespeicher-battery-only.yaml
deleted file mode 100644
index 318efa403..000000000
--- a/templates/definition/meter/varta-energiespeicher-battery-only.yaml
+++ /dev/null
@@ -1,42 +0,0 @@
-template: varta-energiespeicher-battery-only
-products:
-  - brand: VARTA
-    description:
-      de: Energiespeicher (kein PV-Sensor)
-      en: Energiespeicher (without PV Sensor)
-params:
-  - name: usage
-    choice: ["grid", "battery"]
-    allinone: true
-  - name: host
-  - name: port
-    default: 502
-render: |
-  type: custom
-  power:
-    source: modbus
-    uri: {{ .host }}:{{ .port }}
-  {{- if eq .usage "grid" }}
-    id: 255
-    register:
-      address: 1078 # grid power
-      type: holding
-      decode: int16
-    scale: -1
-  {{- end }}
-  {{- if eq .usage "battery" }}
-    id: 255
-    register:
-      address: 1066 # active power
-      type: holding
-      decode: int16
-    scale: -1
-  soc:
-    source: modbus
-    uri: {{ .host }}:{{ .port }}
-    id: 255
-    register:
-      address: 1068 # SOC
-      type: holding
-      decode: int16
-  {{- end }}
diff --git a/templates/definition/meter/varta-energiespeicher.yaml b/templates/definition/meter/varta.yaml
similarity index 79%
rename from templates/definition/meter/varta-energiespeicher.yaml
rename to templates/definition/meter/varta.yaml
index 7b6339bc9..1c14819af 100644
--- a/templates/definition/meter/varta-energiespeicher.yaml
+++ b/templates/definition/meter/varta.yaml
@@ -1,9 +1,10 @@
-template: varta-energiespeicher
+template: varta
+covers: ["varta-energiespeicher", "varta-energiespeicher-battery-only"]
 products:
   - brand: VARTA
     description:
-      de: Energiespeicher (mit PV-Sensor)
-      en: Energiespeicher (with PV Sensor)
+      de: pulse/ pulse neo/ element (PV nur verfügbar mit PV-Sensor)
+      en: pulse/ pulse neo/ element (PV only available with PV sensor)
 params:
   - name: usage
     choice: ["grid", "pv", "battery"]
diff --git a/templates/docs/meter/varta-energiespeicher-battery-only_0.yaml b/templates/docs/meter/varta-energiespeicher-battery-only_0.yaml
deleted file mode 100644
index df17368d5..000000000
--- a/templates/docs/meter/varta-energiespeicher-battery-only_0.yaml
+++ /dev/null
@@ -1,18 +0,0 @@
-product:
-  brand: VARTA
-  description: Energiespeicher (kein PV-Sensor)
-render:
-  - usage: grid
-    default: |
-      type: template
-      template: varta-energiespeicher-battery-only
-      usage: grid
-      host: 192.0.2.2 # IP-Adresse oder Hostname
-      port: 502 # Port # Optional
-  - usage: battery
-    default: |
-      type: template
-      template: varta-energiespeicher-battery-only
-      usage: battery
-      host: 192.0.2.2 # IP-Adresse oder Hostname
-      port: 502 # Port # Optional
diff --git a/templates/docs/meter/varta-energiespeicher_0.yaml b/templates/docs/meter/varta_0.yaml
similarity index 75%
rename from templates/docs/meter/varta-energiespeicher_0.yaml
rename to templates/docs/meter/varta_0.yaml
index d0fe459fc..0a71beae9 100644
--- a/templates/docs/meter/varta-energiespeicher_0.yaml
+++ b/templates/docs/meter/varta_0.yaml
@@ -1,25 +1,25 @@
 product:
   brand: VARTA
-  description: Energiespeicher (mit PV-Sensor)
+  description: pulse/ pulse neo/ element (PV nur verfügbar mit PV-Sensor)
 render:
   - usage: grid
     default: |
       type: template
-      template: varta-energiespeicher
+      template: varta
       usage: grid
       host: 192.0.2.2 # IP-Adresse oder Hostname
       port: 502 # Port # Optional
   - usage: pv
     default: |
       type: template
-      template: varta-energiespeicher
+      template: varta
       usage: pv
       host: 192.0.2.2 # IP-Adresse oder Hostname
       port: 502 # Port # Optional
   - usage: battery
     default: |
       type: template
-      template: varta-energiespeicher
+      template: varta
       usage: battery
       host: 192.0.2.2 # IP-Adresse oder Hostname
       port: 502 # Port # Optional