evcc-io · premultiply · Aug 7, 2024 · Aug 7, 2024 · Aug 8, 2024 · Aug 8, 2024
diff --git a/assets/js/components/Config/VehicleModal.vue b/assets/js/components/Config/VehicleModal.vue
@@ -303,11 +303,22 @@ export default {
 		};
 	},
 	computed: {
+		uniqueProducts() {
+			// add protocol to name if multiple products with same name exist
+			// TODO: add this logic to all devices (charger, meter, ...)
+			const names = this.products.map((p) => p.name);
+			return this.products.map((p) => {
+				if (names.filter((n) => n === p.name).length > 1 && p.protocol) {
+					return { ...p, name: `${p.name} (${p.protocol})` };
+				}
+				return p;
+			});
+		},
 		templateOptions() {
 			return {
-				online: this.products.filter((p) => !p.group && p.template !== "offline"),
-				generic: this.products.filter((p) => p.group === "generic"),
-				scooter: this.products.filter((p) => p.group === "scooter"),
+				online: this.uniqueProducts.filter((p) => !p.group && p.template !== "offline"),
+				generic: this.uniqueProducts.filter((p) => p.group === "generic"),
+				scooter: this.uniqueProducts.filter((p) => p.group === "scooter"),
 			};
 		},
 		templateParams() {

diff --git a/server/http_config_metadata_handler.go b/server/http_config_metadata_handler.go
@@ -82,6 +82,7 @@ func productsHandler(w http.ResponseWriter, r *http.Request) {
 					Name:     p.Title(lang),
 					Template: t.TemplateDefinition.Template,
 					Group:    t.Group,
+					Protocol: t.Protocol,
 				})
 			}
 		}

diff --git a/server/product.go b/server/product.go
@@ -4,6 +4,7 @@ type product struct {
 	Name     string `json:"name"`
 	Template string `json:"template"`
 	Group    string `json:"group,omitempty"`
+	Protocol string `json:"protocol,omitempty"`
 }
 
 type products []product
diff --git a/templates/definition/charger/abb.yaml b/templates/definition/charger/abb.yaml
@@ -1,4 +1,5 @@
 template: abb
+protocol: modbus
 products:
   - brand: ABB
     description:

diff --git a/templates/definition/charger/alfen.yaml b/templates/definition/charger/alfen.yaml
@@ -1,4 +1,5 @@
 template: alfen
+protocol: modbus
 products:
   - brand: Alfen
     description:

diff --git a/templates/definition/charger/cfos.yaml b/templates/definition/charger/cfos.yaml
@@ -2,7 +2,10 @@ template: cfos
 products:
   - brand: cFos
     description:
-      generic: Power Brain, Power Brain Solar
+      generic: Power Brain
+  - brand: cFos
+    description:
+      generic: Power Brain Solar
 capabilities: ["mA", "rfid", "1p3p"]
 requirements:
   description:

diff --git a/templates/definition/charger/daheimladen-mb.yaml b/templates/definition/charger/daheimladen-mb.yaml
@@ -1,8 +1,9 @@
 template: daheimladen-mb
+protocol: modbus
 products:
   - brand: DaheimLaden
     description:
-      generic: Wallbox (via ModbusTCP)
+      generic: Wallbox
 requirements:
   description:
     de: Die Wallbox muss über eine aktuelle Firmware mit Modbus-Unterstützung verfügen. In den Einstellungen muss "Nachladen" (Smart) bzw. "RSDA" (Touch) aktiviert sein

diff --git a/templates/definition/charger/fronius-wattpilot.yaml b/templates/definition/charger/fronius-wattpilot.yaml
@@ -1,4 +1,5 @@
 template: fronius-wattpilot
+protocol: localapi
 deprecated: true
 products:
   - brand: Fronius

diff --git a/templates/definition/charger/go-e-v3.yaml b/templates/definition/charger/go-e-v3.yaml
@@ -1,9 +1,16 @@
 template: go-e-v3
+protocol: localapi
 covers: ["go-e-gemini"]
 products:
   - brand: go-e
     description:
-      generic: Charger Gemini, HOME+, HOMEfix (V3)
+      generic: Charger Gemini
+  - brand: go-e
+    description:
+      generic: Charger HOME+
+  - brand: go-e
+    description:
+      generic: Charger V3
 capabilities: ["1p3p", "rfid"]
 requirements:
   description:

diff --git a/templates/definition/charger/go-e.yaml b/templates/definition/charger/go-e.yaml
@@ -1,8 +1,12 @@
 template: go-e
+protocol: localapi
 products:
   - brand: go-e
     description:
-      generic: Charger HOME+, HOMEfix, Pro
+      generic: Charger HOMEfix
+  - brand: go-e
+    description:
+      generic: Charger PRO
 capabilities: ["rfid"]
 requirements:
   description:

diff --git a/templates/definition/charger/ocpp-abb-tac.yaml b/templates/definition/charger/ocpp-abb-tac.yaml
@@ -0,0 +1,15 @@
+template: ocpp-abb-tac
+covers: ["ocpp-abb"]
+products:
+  - brand: ABB
+    description:
+      generic: Terra AC
+capabilities: ["mA", "rfid"]
+requirements:
+  description:
+    generic: https://library.e.abb.com/public/8f07987a3a284da6bf4e4f8f53cd6502/ABB_Terra_AC_Charger_OCPP1.6_ImplementationOverview%20_v1.8_FW1.6.6.pdf
+params:
+  - preset: ocpp
+render: |
+  {{ include "ocpp" . }}
+  stacklevelzero: true
diff --git a/templates/definition/charger/ocpp-abb.yaml b/templates/definition/charger/ocpp-abb.yaml
diff --git a/templates/definition/charger/ocpp-abl.yaml b/templates/definition/charger/ocpp-abl.yaml
@@ -0,0 +1,16 @@
+template: ocpp-abl
+products:
+  - brand: ABL Sursum
+    description:
+      generic: eMH2
+  - brand: ABL Sursum
+    description:
+      generic: eMH3
+  - brand: ABL Sursum
+    description:
+      generic: eMH4
+capabilities: ["mA", "rfid"]
+params:
+  - preset: ocpp
+render: |
+  {{ include "ocpp" . }}
diff --git a/templates/definition/charger/ocpp-alfen-eve.yaml b/templates/definition/charger/ocpp-alfen-eve.yaml
@@ -0,0 +1,10 @@
+template: ocpp-alfen-eve
+products:
+  - brand: Alfen
+    description:
+      generic: Eve
+capabilities: ["mA", "rfid", "1p3p"]
+params:
+  - preset: ocpp
+render: |
+  {{ include "ocpp" . }}
diff --git a/templates/definition/charger/ocpp-autoaid.yaml b/templates/definition/charger/ocpp-autoaid.yaml
@@ -0,0 +1,13 @@
+template: ocpp-autoaid
+products:
+  - brand: Autoaid
+    description:
+      generic: Intelligent Wallbox
+  - brand: Autoaid
+    description:
+      generic: Business Wallbox
+capabilities: ["rfid"]
+params:
+  - preset: ocpp
+render: |
+  {{ include "ocpp" . }}
diff --git a/templates/definition/charger/ocpp-beny.yaml b/templates/definition/charger/ocpp-beny.yaml
@@ -0,0 +1,10 @@
+template: ocpp-beny
+products:
+  - brand: ZJ Beny
+    description:
+      generic: BCP EV charger
+capabilities: ["rfid"]
+params:
+  - preset: ocpp
+render: |
+  {{ include "ocpp" . }}
diff --git a/templates/definition/charger/ocpp-chargeampsyaml b/templates/definition/charger/ocpp-chargeampsyaml
@@ -0,0 +1,10 @@
+template: ocpp-chargeamps
+products:
+  - brand: Charge Amps
+    description:
+      generic: Halo
+capabilities: ["rfid"]
+params:
+  - preset: ocpp
+render: |
+  {{ include "ocpp" . }}
diff --git a/templates/definition/charger/ocpp-elvi.yaml b/templates/definition/charger/ocpp-elvi.yaml
@@ -1,4 +1,5 @@
-template: elvi
+template: ocpp-elvi
+covers: ["elvi"]
 products:
   - brand: EVBox
     description:

diff --git a/templates/definition/charger/ocpp-enercab-smart.yaml b/templates/definition/charger/ocpp-enercab-smart.yaml
@@ -0,0 +1,17 @@
+template: ocpp-enercab-smart
+products:
+  - brand: enercab
+    description:
+      generic: smart
+  - brand: eledio
+    description:
+      generic: go
+capabilities: ["1p3p"]
+requirements:
+  description:
+    generic: |
+      https://www.enercab.at/index.php?controller=attachment&id_attachment=311
+params:
+  - preset: ocpp
+render: |
+  {{ include "ocpp" . }}
diff --git a/templates/definition/charger/ocpp-enplus.yaml b/templates/definition/charger/ocpp-enplus.yaml
@@ -0,0 +1,10 @@
+template: ocpp-enplus
+products:
+  - brand: EN+
+    description:
+      generic: AC EV Charger
+capabilities: ["rfid"]
+params:
+  - preset: ocpp
+render: |
+  {{ include "ocpp" . }}
diff --git a/templates/definition/charger/ocpp-entratek.yaml b/templates/definition/charger/ocpp-entratek.yaml
@@ -0,0 +1,13 @@
+template: ocpp-entratek
+products:
+  - brand: EntraTek
+    description:
+      generic: Power Dot Fix
+  - brand: EntraTek
+    description:
+      generic: Power Dot Pro 2
+capabilities: ["rfid"]
+params:
+  - preset: ocpp
+render: |
+  {{ include "ocpp" . }}
diff --git a/templates/definition/charger/ocpp-esolutions.yaml b/templates/definition/charger/ocpp-esolutions.yaml
@@ -0,0 +1,10 @@
+template: ocpp-esolutions
+products:
+  - brand: Free2move eSolutions
+    description:
+      generic: eProWallbox
+capabilities: ["rfid"]
+params:
+  - preset: ocpp
+render: |
+  {{ include "ocpp" . }}
diff --git a/templates/definition/charger/ocpp-fronius-wattpilot.yaml b/templates/definition/charger/ocpp-fronius-wattpilot.yaml
diff --git a/templates/definition/charger/ocpp-goe-charger.yaml b/templates/definition/charger/ocpp-goe-charger.yaml
@@ -0,0 +1,20 @@
+template: ocpp-goe-charger
+covers: ["ocpp-fronius-wattpilot"]
+products:
+  - brand: go-e
+    description:
+      generic: Charger V3
+  - brand: go-e
+    description:
+      generic: Charger Gemini
+  - brand: go-e
+    description:
+      generic: Charger PRO
+  - brand: Fronius
+    description:
+      generic: Wattpilot
+capabilities: ["rfid", "1p3p"]
+params:
+  - preset: ocpp
+render: |
+  {{ include "ocpp" . }}
diff --git a/templates/definition/charger/ocpp-homecharge.yaml b/templates/definition/charger/ocpp-homecharge.yaml
@@ -1,8 +1,9 @@
-template: homecharge
+template: ocpp-homecharge
+covers: ["homecharge"]
 products:
   - brand: Homecharge
     description:
-      generic: Homecharger HC11L, HC22L
+      generic: Homecharger
 requirements:
   description:
     de: |

diff --git a/...definition/charger/ocpp-orbis-viaris.yaml → templates/definition/charger/ocpp-orbis.yaml b/...definition/charger/ocpp-orbis-viaris.yaml → templates/definition/charger/ocpp-orbis.yaml
@@ -1,4 +1,5 @@
-template: orbis-viaris
+template: ocpp-orbis
+covers: ["orbis-viaris"]
 products:
   - brand: Orbis
     description:

diff --git a/templates/definition/charger/ocpp-sungrow-ac.yaml b/templates/definition/charger/ocpp-sungrow-ac.yaml
@@ -0,0 +1,10 @@
+template: ocpp-sungrow-ac
+products:
+  - brand: Sungrow
+    description:
+      generic: AC011E
+capabilities: ["mA", "rfid"]
+params:
+  - preset: ocpp
+render: |
+  {{ include "ocpp" . }}
diff --git a/...finition/charger/ocpp-pulsarplus-fw5.yaml → .../definition/charger/ocpp-wallbox-fw5.yaml b/...finition/charger/ocpp-pulsarplus-fw5.yaml → .../definition/charger/ocpp-wallbox-fw5.yaml
@@ -1,4 +1,5 @@
-template: pulsarplus-fw5
+template: wallbox-fw5
+covers: ["pulsarplus-fw5"]
 products:
   - brand: wallbox
     description:

diff --git a/...s/definition/charger/ocpp-pulsarplus.yaml → ...ates/definition/charger/ocpp-wallbox.yaml b/...s/definition/charger/ocpp-pulsarplus.yaml → ...ates/definition/charger/ocpp-wallbox.yaml
@@ -1,19 +1,31 @@
-template: pulsarplus
+template: ocpp-wallbox
+covers: ["pulsarplus"]
 products:
   - brand: wallbox
     description:
-      generic: Pulsar Plus, Pulsar Max, Commander 2, Copper SB (FW 6.x)
+      generic: Pulsar Plus
+  - brand: wallbox
+    description:
+      generic: Pulsar Max
+  - brand: wallbox
+    description:
+      generic: Commander 2
+  - brand: wallbox
+    description:
+      generic: Copper SB
 requirements:
   description:
     de: |
       Anleitung: https://support.wallbox.com/en/knowledge-base/ocpp-activation-and-setup-guide/
+
       * “OCPP aktivieren” (myWallbox app) bzw. den “OCPP-WebSocket-Verbindung” Schalter (myWallbox Portal) aktivieren
       * Zusätzlich die “Verbesserte Ladegerätsteuerung” (Profil -> Experimentelle Funktionen) einschalten (myWallbox app)
       * URL: ws://[evcc-adresse]:8887/ (Verbindung über das lokale Netzwerk)
       * Ladepunktidentität: beliebiger Wert (z.B. die Seriennummer der Box), der als *stationid* verwendet wird
       * Passwort: leer lassen
     en: |
       Setup Guide: https://support.wallbox.com/en/knowledge-base/ocpp-activation-and-setup-guide/
+
       * Switch on “Enable OCPP” (myWallbox app) or enable the “OCPP WebSocket connection” switch (myWallbox Portal)
       * Enable “Improved charger control” (Profile -> Experimental functions) (myWallbox app) 
       * URL: ws://[evcc-adresse]:8887/ (local network connection)

diff --git a/templates/definition/charger/ocpp-zaptec-go.yaml b/templates/definition/charger/ocpp-zaptec-go.yaml
@@ -0,0 +1,16 @@
+template: ocpp-zaptec-go
+products:
+  - brand: Zaptec
+    description:
+      generic: Go
+capabilities: ["rfid"]
+requirements:
+  description:
+    generic: |
+      OCPP Native mode
+
+      https://help.zaptec.com/hc/en-001/articles/22330328601489-Zaptec-Go-OCPP-Native-configuration-guide#h_01HP261F5NP6Z9VY0MVHJCZEBJ
+params:
+  - preset: ocpp
+render: |
+  {{ include "ocpp" . }}