Templates: add vehicle-identify for Tronity, EVNotify (evcc-io#7831)

maku1604 · May 5, 2023 · 27f0a14 · 27f0a14
1 parent a46ac0e
commit 27f0a14
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 11 deletions.
diff --git a/templates/definition/vehicle/evnotify.yaml b/templates/definition/vehicle/evnotify.yaml
@@ -19,15 +19,16 @@ params:
   - preset: vehicle-identify
 render: |
   type: custom
-  {{- if ne .title "" }}
+  {{- if .title }}
   title: {{ .title }}
   {{- end }}
   capacity: {{ .capacity }}
-  {{- if ne .phases "" }}
+  {{- if .phases }}
   phases: {{ .phases }}
   {{- end }}
   soc:
     source: http
     uri: https://app.evnotify.de/soc?akey={{ .akey }}&token={{ .token }} # evNotify Server + AKEY
     method: GET
     jq: .soc_display
+  {{ include "vehicle-identify" . }}
diff --git a/templates/definition/vehicle/niu-e-scooter.yaml b/templates/definition/vehicle/niu-e-scooter.yaml
@@ -23,7 +23,7 @@ params:
   - preset: vehicle-identify
 render: |
   type: niu
-  {{- if ne .title "" }}
+  {{- if .title }}
   title: {{ .title }}
   {{- end }}
   {{- if ne .icon "" }}
@@ -33,3 +33,4 @@ render: |
   password: {{ .password }} # NIU app password
   serial: {{ .serial }} # NIU E-Scooter serial number like shown in app
   capacity: {{ .capacity }}
+  {{ include "vehicle-identify" . }}
diff --git a/templates/definition/vehicle/offline.yaml b/templates/definition/vehicle/offline.yaml
@@ -23,14 +23,14 @@ params:
 render: |
   type: custom
   features: ["offline"]
-  {{- if ne .title "" }}
+  {{- if .title }}
   title: {{ .title }}
   {{- end }}
   {{- if ne .icon "" }}
   icon: {{ .icon }}
   {{- end }}
   capacity: {{ .capacity }} # kWh
-  {{- if ne .phases "" }}
+  {{- if .phases }}
   phases: {{ .phases }}
   {{- end }}
   soc: # fixed - no Soc available

diff --git a/templates/definition/vehicle/ovms.yaml b/templates/definition/vehicle/ovms.yaml
@@ -26,7 +26,7 @@ params:
   - preset: vehicle-identify
 render: |
   type: ovms
-  {{- if ne .title "" }}
+  {{- if .title }}
   title: {{ .title }}
   {{- end }}
   {{- if ne .icon "" }}
@@ -36,7 +36,7 @@ render: |
   password: {{ .password }}
   vehicleid: {{ .vehicleid }} # vehicle id
   capacity: {{ .capacity }}
-  {{- if ne .phases "" }}
+  {{- if .phases }}
   phases: {{ .phases }}
   {{- end }}
   server: dexters-web.de # used ovms server [dexters-web.de or api.openvehicles.com]

diff --git a/templates/definition/vehicle/tesla.yaml b/templates/definition/vehicle/tesla.yaml
@@ -40,7 +40,7 @@ params:
   - preset: vehicle-identify
 render: |
   type: tesla
-  {{- if ne .title "" }}
+  {{- if .title }}
   title: {{ .title }}
   {{- end }}
   {{- if ne .icon "" }}
@@ -50,7 +50,7 @@ render: |
     access: {{ .accessToken }}
     refresh: {{ .refreshToken }}
   capacity: {{ .capacity }}
-  {{- if ne .phases "" }}
+  {{- if .phases }}
   phases: {{ .phases }}
   {{- end }}
   {{- if ne .vin "" }}

diff --git a/templates/definition/vehicle/tronity.yaml b/templates/definition/vehicle/tronity.yaml
@@ -23,7 +23,7 @@ params:
   - preset: vehicle-identify
 render: |
   type: tronity
-  {{- if ne .title "" }}
+  {{- if .title }}
   title: {{ .title }}
   {{- end }}
   {{- if ne .icon "" }}
@@ -33,9 +33,10 @@ render: |
     id: {{ .user }}
     secret: {{ .password }}
   capacity: {{ .capacity }}
-  {{- if ne .phases "" }}
+  {{- if .phases }}
   phases: {{ .phases }}
   {{- end }}
   {{- if ne .vin "" }}
   vin: {{ .vin }}
   {{- end }}
+  {{ include "vehicle-identify" . }}