chore: simplify templates and filter usage-bounded parameters (evcc-i…

…o#7145)
techsd · Apr 1, 2023 · 33b780b · 33b780b
1 parent 943640d
commit 33b780b
Show file tree

Hide file tree

Showing 47 changed files with 98 additions and 191 deletions.
diff --git a/cmd/configure/configure.tpl b/cmd/configure/configure.tpl
@@ -12,53 +12,53 @@ levels:
 plant: {{ .Plant }}
 
 interval: 10s # control cycle interval
-{{- if ne (len .SponsorToken) 0 }}
+{{- if .SponsorToken }}
 
 sponsortoken: {{ .SponsorToken }}
 
 # sponsors can set telemetry: true to enable anonymous data aggregation
 # see https://github.com/evcc-io/evcc/discussions/4554
 telemetry: {{ .Telemetry }}
 {{- end}}
-{{- if ne (len .Meters) 0 }}
+{{- if .Meters }}
 
 meters:
-{{-   range .Meters }}
+{{- range .Meters }}
 - {{ .Yaml | indent 2 | trim }}
-{{-   end }}
 {{- end }}
-{{- if ne (len .Chargers) 0 }}
+{{- end }}
+{{- if .Chargers }}
 
 chargers:
-{{-   range .Chargers }}
+{{- range .Chargers }}
 - {{ .Yaml | indent 2 | trim }}
-{{-   end }}
 {{- end }}
-{{- if ne (len .Vehicles) 0 }}
+{{- end }}
+{{- if .Vehicles }}
 
 vehicles:
-{{-   range .Vehicles }}
+{{- range .Vehicles }}
 - {{ .Yaml | indent 2 | trim }}
-{{-   end }}
 {{- end }}
-{{- if ne (len .Chargers) 0 }}
+{{- end }}
+{{- if .Chargers }}
 
 loadpoints:
-{{-   range .Loadpoints }}
+{{- range .Loadpoints }}
 - title: {{ .Title }}
   charger: {{ .Charger }}
-{{-     if .ChargeMeter }}
+{{- if .ChargeMeter }}
   meter: {{ .ChargeMeter }}
-{{-     end }}
-{{-     if .Vehicle }}
+{{- end }}
+{{- if .Vehicle }}
   vehicle: {{ .Vehicle }}
-{{-     end }}
+{{- end }}
   mode: {{ .Mode }}
   phases: {{ .Phases }}
   mincurrent: {{ .MinCurrent }}
   maxcurrent: {{ .MaxCurrent }}
   resetOnDisconnect: {{ .ResetOnDisconnect }}
-{{-   end }}
+{{- end }}
 {{- end }}
 
 site:
@@ -67,24 +67,24 @@ site:
 {{- if .Site.Grid }}
     grid: {{ .Site.Grid }}
 {{- end }}
-{{- if len .Site.PVs }}
+{{- if .Site.PVs }}
     pv:
-{{-   range .Site.PVs }}
+    {{- range .Site.PVs }}
     - {{ . }}
-{{-   end }}
+    {{- end }}
 {{- end }}
-{{- if len .Site.Batteries }}
+{{- if .Site.Batteries }}
     battery:
-{{-   range .Site.Batteries }}
+    {{- range .Site.Batteries }}
     - {{ . }}
-{{-   end }}
+    {{- end }}
 {{- end }}
-{{- if ne (len .Hems) 0 }}
+{{- if .Hems }}
 
 hems:
 {{ .Hems | indent 2 }}
 {{- end }}
-{{- if ne (len .EEBUS) 0 }}
+{{- if .EEBUS }}
 
 eebus:
 {{ .EEBUS | indent 2 }}

diff --git a/templates/docs/meter/alpha-ess-smile_0.yaml b/templates/docs/meter/alpha-ess-smile_0.yaml
@@ -49,7 +49,6 @@ render:
       id: 85
       host: 192.0.2.2 # Hostname
       port: 502 # Port
-      capacity: 50 # Akkukapazität in kWh # Optional
   - usage: pv
     default: |
       type: template
@@ -97,7 +96,6 @@ render:
       id: 85
       host: 192.0.2.2 # Hostname
       port: 502 # Port
-      capacity: 50 # Akkukapazität in kWh # Optional
   - usage: battery
     default: |
       type: template

diff --git a/templates/docs/meter/e3dc_0.yaml b/templates/docs/meter/e3dc_0.yaml
@@ -14,7 +14,6 @@ render:
       usage: grid
       host: 192.0.2.2 # IP-Adresse oder Hostname
       port: 502 # Port # Optional
-      capacity: 50 # Akkukapazität in kWh # Optional
   - usage: pv
     default: |
       type: template
@@ -28,7 +27,6 @@ render:
       usage: pv
       host: 192.0.2.2 # IP-Adresse oder Hostname
       port: 502 # Port # Optional
-      capacity: 50 # Akkukapazität in kWh # Optional
   - usage: battery
     default: |
       type: template

diff --git a/templates/docs/meter/fronius-gen24_0.yaml b/templates/docs/meter/fronius-gen24_0.yaml
@@ -15,7 +15,6 @@ render:
       usage: grid
       host: 192.0.2.2 # IP-Adresse oder Hostname
       port: 502 # Port # Optional
-      capacity: 50 # Akkukapazität in kWh # Optional
   - usage: pv
     default: |
       type: template
@@ -29,7 +28,6 @@ render:
       usage: pv
       host: 192.0.2.2 # IP-Adresse oder Hostname
       port: 502 # Port # Optional
-      capacity: 50 # Akkukapazität in kWh # Optional
   - usage: battery
     default: |
       type: template

diff --git a/templates/docs/meter/fronius-gen24_1.yaml b/templates/docs/meter/fronius-gen24_1.yaml
@@ -15,7 +15,6 @@ render:
       usage: grid
       host: 192.0.2.2 # IP-Adresse oder Hostname
       port: 502 # Port # Optional
-      capacity: 50 # Akkukapazität in kWh # Optional
   - usage: pv
     default: |
       type: template
@@ -29,7 +28,6 @@ render:
       usage: pv
       host: 192.0.2.2 # IP-Adresse oder Hostname
       port: 502 # Port # Optional
-      capacity: 50 # Akkukapazität in kWh # Optional
   - usage: battery
     default: |
       type: template

diff --git a/templates/docs/meter/fronius-solarapi-v1_0.yaml b/templates/docs/meter/fronius-solarapi-v1_0.yaml
@@ -13,7 +13,6 @@ render:
       template: fronius-solarapi-v1
       usage: grid
       host: 192.0.2.2 # IP-Adresse oder Hostname
-      capacity: 50 # Akkukapazität in kWh # Optional
   - usage: pv
     default: |
       type: template
@@ -25,7 +24,6 @@ render:
       template: fronius-solarapi-v1
       usage: pv
       host: 192.0.2.2 # IP-Adresse oder Hostname
-      capacity: 50 # Akkukapazität in kWh # Optional
   - usage: battery
     default: |
       type: template

diff --git a/templates/docs/meter/goodwe-hybrid_0.yaml b/templates/docs/meter/goodwe-hybrid_0.yaml
@@ -49,7 +49,6 @@ render:
       id: 247
       host: 192.0.2.2 # Hostname
       port: 502 # Port
-      capacity: 50 # Akkukapazität in kWh # Optional
   - usage: pv
     default: |
       type: template
@@ -97,7 +96,6 @@ render:
       id: 247
       host: 192.0.2.2 # Hostname
       port: 502 # Port
-      capacity: 50 # Akkukapazität in kWh # Optional
   - usage: battery
     default: |
       type: template

diff --git a/templates/docs/meter/growatt-hybrid-tlxh_0.yaml b/templates/docs/meter/growatt-hybrid-tlxh_0.yaml
@@ -49,7 +49,6 @@ render:
       id: 1
       host: 192.0.2.2 # Hostname
       port: 502 # Port
-      capacity: 50 # Akkukapazität in kWh # Optional
   - usage: pv
     default: |
       type: template
@@ -97,7 +96,6 @@ render:
       id: 1
       host: 192.0.2.2 # Hostname
       port: 502 # Port
-      capacity: 50 # Akkukapazität in kWh # Optional
   - usage: battery
     default: |
       type: template

diff --git a/templates/docs/meter/growatt-hybrid_0.yaml b/templates/docs/meter/growatt-hybrid_0.yaml
@@ -49,7 +49,6 @@ render:
       id: 1
       host: 192.0.2.2 # Hostname
       port: 502 # Port
-      capacity: 50 # Akkukapazität in kWh # Optional
   - usage: pv
     default: |
       type: template
@@ -97,7 +96,6 @@ render:
       id: 1
       host: 192.0.2.2 # Hostname
       port: 502 # Port
-      capacity: 50 # Akkukapazität in kWh # Optional
   - usage: battery
     default: |
       type: template

diff --git a/templates/docs/meter/huawei-dongle-powersensor_0.yaml b/templates/docs/meter/huawei-dongle-powersensor_0.yaml
@@ -25,7 +25,6 @@ render:
       host: 192.0.2.2 # Hostname
       port: 502 # Port
       timeout: 15s # Optional
-      capacity: 50 # Akkukapazität in kWh # Optional
   - usage: pv
     default: |
       type: template
@@ -49,7 +48,6 @@ render:
       host: 192.0.2.2 # Hostname
       port: 502 # Port
       timeout: 15s # Optional
-      capacity: 50 # Akkukapazität in kWh # Optional
   - usage: battery
     default: |
       type: template

diff --git a/templates/docs/meter/huawei-sun2000-rs485_0.yaml b/templates/docs/meter/huawei-sun2000-rs485_0.yaml
@@ -50,7 +50,6 @@ render:
       host: 192.0.2.2 # Hostname
       port: 502 # Port
       storageunit: 1 # Optional
-      capacity: 50 # Akkukapazität in kWh # Optional
   - usage: pv
     default: |
       type: template
@@ -99,7 +98,6 @@ render:
       host: 192.0.2.2 # Hostname
       port: 502 # Port
       storageunit: 1 # Optional
-      capacity: 50 # Akkukapazität in kWh # Optional
   - usage: battery
     default: |
       type: template

diff --git a/templates/docs/meter/kostal-piko_0.yaml b/templates/docs/meter/kostal-piko_0.yaml
@@ -13,7 +13,6 @@ render:
       template: kostal-piko
       usage: grid
       host: 192.0.2.2 # IP-Adresse oder Hostname
-      capacity: 50 # Akkukapazität in kWh # Optional
   - usage: pv
     default: |
       type: template
@@ -25,7 +24,6 @@ render:
       template: kostal-piko
       usage: pv
       host: 192.0.2.2 # IP-Adresse oder Hostname
-      capacity: 50 # Akkukapazität in kWh # Optional
   - usage: battery
     default: |
       type: template

diff --git a/templates/docs/meter/kostal-plenticore_0.yaml b/templates/docs/meter/kostal-plenticore_0.yaml
@@ -23,7 +23,6 @@ render:
       id: 71
       host: 192.0.2.2 # Hostname
       port: 1502 # Port
-      capacity: 50 # Akkukapazität in kWh # Optional
   - usage: battery
     default: |
       type: template

diff --git a/templates/docs/meter/lg-ess-home-8-10_0.yaml b/templates/docs/meter/lg-ess-home-8-10_0.yaml
@@ -15,7 +15,6 @@ render:
       usage: grid
       host: 192.0.2.2 # IP-Adresse oder Hostname
       registration: DE200... # Registriernummer des LG ESS HOME Wechselrichters.
-      capacity: 50 # Akkukapazität in kWh # Optional
   - usage: pv
     default: |
       type: template
@@ -29,7 +28,6 @@ render:
       usage: pv
       host: 192.0.2.2 # IP-Adresse oder Hostname
       registration: DE200... # Registriernummer des LG ESS HOME Wechselrichters.
-      capacity: 50 # Akkukapazität in kWh # Optional
   - usage: battery
     default: |
       type: template

diff --git a/templates/docs/meter/openems_0.yaml b/templates/docs/meter/openems_0.yaml
@@ -13,7 +13,6 @@ render:
       usage: grid
       host: 192.0.2.2 # IP-Adresse oder Hostname
       password: user # Passwort des Benutzerkontos (bei führenden Nullen bitte in einfache Hochkommata setzen) # Optional
-      capacity: 50 # Akkukapazität in kWh # Optional
   - usage: pv
     default: |
       type: template
@@ -26,7 +25,6 @@ render:
       usage: pv
       host: 192.0.2.2 # IP-Adresse oder Hostname
       password: user # Passwort des Benutzerkontos (bei führenden Nullen bitte in einfache Hochkommata setzen) # Optional
-      capacity: 50 # Akkukapazität in kWh # Optional
   - usage: battery
     default: |
       type: template

diff --git a/templates/docs/meter/openems_1.yaml b/templates/docs/meter/openems_1.yaml
@@ -13,7 +13,6 @@ render:
       usage: grid
       host: 192.0.2.2 # IP-Adresse oder Hostname
       password: user # Passwort des Benutzerkontos (bei führenden Nullen bitte in einfache Hochkommata setzen) # Optional
-      capacity: 50 # Akkukapazität in kWh # Optional
   - usage: pv
     default: |
       type: template
@@ -26,7 +25,6 @@ render:
       usage: pv
       host: 192.0.2.2 # IP-Adresse oder Hostname
       password: user # Passwort des Benutzerkontos (bei führenden Nullen bitte in einfache Hochkommata setzen) # Optional
-      capacity: 50 # Akkukapazität in kWh # Optional
   - usage: battery
     default: |
       type: template

diff --git a/templates/docs/meter/rct-power_0.yaml b/templates/docs/meter/rct-power_0.yaml
@@ -13,7 +13,6 @@ render:
       template: rct-power
       usage: grid
       host: 192.0.2.2 # IP-Adresse oder Hostname
-      capacity: 50 # Akkukapazität in kWh # Optional
   - usage: pv
     default: |
       type: template
@@ -25,7 +24,6 @@ render:
       template: rct-power
       usage: pv
       host: 192.0.2.2 # IP-Adresse oder Hostname
-      capacity: 50 # Akkukapazität in kWh # Optional
   - usage: battery
     default: |
       type: template

diff --git a/templates/docs/meter/senec-home_0.yaml b/templates/docs/meter/senec-home_0.yaml
@@ -13,7 +13,6 @@ render:
       template: senec-home
       usage: grid
       host: 192.0.2.2 # IP-Adresse oder Hostname
-      capacity: 50 # Akkukapazität in kWh # Optional
   - usage: pv
     default: |
       type: template
@@ -25,7 +24,6 @@ render:
       template: senec-home
       usage: pv
       host: 192.0.2.2 # IP-Adresse oder Hostname
-      capacity: 50 # Akkukapazität in kWh # Optional
   - usage: battery
     default: |
       type: template

diff --git a/templates/docs/meter/sma-data-manager_0.yaml b/templates/docs/meter/sma-data-manager_0.yaml
@@ -17,7 +17,6 @@ render:
       usage: grid
       host: 192.0.2.2 # IP-Adresse oder Hostname
       port: 502 # Port # Optional
-      capacity: 50 # Akkukapazität in kWh # Optional
   - usage: pv
     default: |
       type: template
@@ -31,7 +30,6 @@ render:
       usage: pv
       host: 192.0.2.2 # IP-Adresse oder Hostname
       port: 502 # Port # Optional
-      capacity: 50 # Akkukapazität in kWh # Optional
   - usage: battery
     default: |
       type: template

diff --git a/templates/docs/meter/sma-hybrid_0.yaml b/templates/docs/meter/sma-hybrid_0.yaml
@@ -23,7 +23,6 @@ render:
       id: 3
       host: 192.0.2.2 # Hostname
       port: 502 # Port
-      capacity: 50 # Akkukapazität in kWh # Optional
   - usage: battery
     default: |
       type: template

diff --git a/templates/docs/meter/sma-inverter_0.yaml b/templates/docs/meter/sma-inverter_0.yaml
@@ -15,7 +15,6 @@ render:
       usage: pv
       host: 192.0.2.2 # IP-Adresse oder Hostname
       password: # Passwort für Benutzergruppe Benutzer # Optional
-      capacity: 50 # Akkukapazität in kWh # Optional
   - usage: battery
     default: |
       type: template