From dc60a8731c989a4a0d41b62231fbe54f909a6f10 Mon Sep 17 00:00:00 2001 From: Michael Geers Date: Sun, 8 Jun 2025 16:08:54 +0200 Subject: [PATCH 1/3] Docs: consistant charger/meter naming --- templates/definition/charger/abl-em4.yaml | 5 ++++- templates/definition/charger/bender-cc.yaml | 20 +++++++++++++------ .../definition/charger/hardybarth-ecb1.yaml | 2 +- templates/definition/charger/ocpp-abl.yaml | 15 ++++++++------ templates/definition/meter/abb-ab.yaml | 11 +++++++++- templates/definition/meter/acrel-adw300.yaml | 2 +- templates/definition/meter/janitza.yaml | 5 ++++- .../definition/meter/kostal-piko-pv.yaml | 5 ++++- templates/definition/meter/orno.yaml | 7 +++++-- templates/definition/meter/sbc-axx3.yaml | 7 +++++-- templates/definition/meter/shelly-1pm.yaml | 11 +++++++++- templates/definition/meter/smartfox-em2.yaml | 14 ++++++++++++- templates/definition/meter/smartfox.yaml | 8 +++++++- templates/definition/meter/sofarsolar.yaml | 10 ++++++++-- templates/definition/meter/solarwatt.yaml | 5 ++++- .../meter/sonnenbatterie_eco56.yaml | 11 +++++++++- templates/definition/meter/varta.yaml | 8 +++++++- 17 files changed, 116 insertions(+), 30 deletions(-) diff --git a/templates/definition/charger/abl-em4.yaml b/templates/definition/charger/abl-em4.yaml index 3e599287396..00601e27375 100644 --- a/templates/definition/charger/abl-em4.yaml +++ b/templates/definition/charger/abl-em4.yaml @@ -2,7 +2,10 @@ template: abl-em4 products: - brand: ABL description: - generic: eM4 (SBCx) + generic: eM4 Single (SBCx) + - brand: ABL + description: + generic: eM4 Twin (SBCx) capabilities: ["mA"] requirements: evcc: ["sponsorship"] diff --git a/templates/definition/charger/bender-cc.yaml b/templates/definition/charger/bender-cc.yaml index 4a175fb840b..036c6f06f86 100644 --- a/templates/definition/charger/bender-cc.yaml +++ b/templates/definition/charger/bender-cc.yaml @@ -1,9 +1,6 @@ template: bender-cc covers: ["bender"] products: - - brand: Ampure - description: - generic: Live - brand: Bender description: generic: CC612 @@ -19,7 +16,6 @@ products: - brand: Mennekes description: generic: AMTRON ChargeControl - - brand: Webasto description: generic: Live @@ -37,7 +33,16 @@ products: generic: Mobility One - brand: Garo description: - generic: GLB, GLB+, LS4, LS4 compact + generic: GLB + - brand: Garo + description: + generic: GLB+ + - brand: Garo + description: + generic: LS4 + - brand: Garo + description: + generic: LS4 compact - brand: Ensto description: generic: Chago Wallbox @@ -46,7 +51,10 @@ products: generic: Heinz - brand: CUBOS description: - generic: C11E, C22E + generic: C11E + - brand: CUBOS + description: + generic: C22E - brand: Spelsberg description: generic: Wallbox Smart Pro diff --git a/templates/definition/charger/hardybarth-ecb1.yaml b/templates/definition/charger/hardybarth-ecb1.yaml index 28e5b519198..b824e1f0693 100644 --- a/templates/definition/charger/hardybarth-ecb1.yaml +++ b/templates/definition/charger/hardybarth-ecb1.yaml @@ -1,6 +1,6 @@ template: hardybarth-ecb1 products: - - brand: HardyBarth + - brand: Hardy Barth description: generic: cPH1 - brand: echarge diff --git a/templates/definition/charger/ocpp-abl.yaml b/templates/definition/charger/ocpp-abl.yaml index 7c2b1e25c31..e130996076a 100644 --- a/templates/definition/charger/ocpp-abl.yaml +++ b/templates/definition/charger/ocpp-abl.yaml @@ -1,14 +1,17 @@ template: ocpp-abl products: - - brand: ABL Sursum + - brand: ABL description: - generic: eMH2 - - brand: ABL Sursum + generic: eMH2 (OCPP) + - brand: ABL description: - generic: eMH3 - - brand: ABL Sursum + generic: eMH3 (OCPP) + - brand: ABL description: - generic: eMH4 + generic: eM4 Single (OCPP) + - brand: ABL + description: + generic: eM4 Twin (OCPP) capabilities: ["mA", "rfid"] requirements: evcc: ["sponsorship", "skiptest"] diff --git a/templates/definition/meter/abb-ab.yaml b/templates/definition/meter/abb-ab.yaml index 8831966df48..d0da3d63dc0 100644 --- a/templates/definition/meter/abb-ab.yaml +++ b/templates/definition/meter/abb-ab.yaml @@ -2,7 +2,16 @@ template: abb-ab products: - brand: ABB description: - generic: A43, A44, B23, B24 + generic: A43 + - brand: ABB + description: + generic: A44 + - brand: ABB + description: + generic: B23 + - brand: ABB + description: + generic: B24 params: - name: usage choice: ["grid", "charge"] diff --git a/templates/definition/meter/acrel-adw300.yaml b/templates/definition/meter/acrel-adw300.yaml index 16a2e54cfd9..ec8628c4961 100644 --- a/templates/definition/meter/acrel-adw300.yaml +++ b/templates/definition/meter/acrel-adw300.yaml @@ -2,7 +2,7 @@ template: acrel-adw300 products: - brand: Acrel description: - generic: ADW300 Wireless Metering Meter + generic: ADW300 params: - name: usage choice: ["grid", "pv", "charge"] diff --git a/templates/definition/meter/janitza.yaml b/templates/definition/meter/janitza.yaml index b0d4cece134..0b9be58df78 100644 --- a/templates/definition/meter/janitza.yaml +++ b/templates/definition/meter/janitza.yaml @@ -2,7 +2,10 @@ template: janitza products: - brand: Janitza description: - generic: B series, UMG series + generic: B series + - brand: Janitza + description: + generic: UMG series params: - name: usage choice: ["grid", "charge"] diff --git a/templates/definition/meter/kostal-piko-pv.yaml b/templates/definition/meter/kostal-piko-pv.yaml index 8744ab699c7..438daedf719 100644 --- a/templates/definition/meter/kostal-piko-pv.yaml +++ b/templates/definition/meter/kostal-piko-pv.yaml @@ -2,7 +2,10 @@ template: kostal-piko-pv products: - brand: Kostal description: - generic: Piko, Piko BA + generic: Piko + - brand: Kostal + description: + generic: Piko BA params: - name: usage choice: ["grid", "pv"] diff --git a/templates/definition/meter/orno.yaml b/templates/definition/meter/orno.yaml index 670be49e909..f4ee83d8316 100644 --- a/templates/definition/meter/orno.yaml +++ b/templates/definition/meter/orno.yaml @@ -1,8 +1,11 @@ template: orno products: - - brand: Orno + - brand: ORNO description: - generic: OR-WE-516, OR-WE-517 + generic: OR-WE-516 + - brand: ORNO + description: + generic: OR-WE-517 params: - name: usage choice: ["grid", "charge"] diff --git a/templates/definition/meter/sbc-axx3.yaml b/templates/definition/meter/sbc-axx3.yaml index 9aca36bb8ef..cc3fcacd6e9 100644 --- a/templates/definition/meter/sbc-axx3.yaml +++ b/templates/definition/meter/sbc-axx3.yaml @@ -1,8 +1,11 @@ template: sbc-axx3 products: - - brand: Saia-Burgess Controls + - brand: Saia-Burgess Controls (SBC) description: - generic: ALE3, AWD3 + generic: ALE3 + - brand: Saia-Burgess Controls (SBC) + description: + generic: AWD3 params: - name: usage choice: ["grid", "charge"] diff --git a/templates/definition/meter/shelly-1pm.yaml b/templates/definition/meter/shelly-1pm.yaml index 404b03a49b4..2f7e5d3cb67 100644 --- a/templates/definition/meter/shelly-1pm.yaml +++ b/templates/definition/meter/shelly-1pm.yaml @@ -2,7 +2,16 @@ template: shelly-1pm products: - brand: Shelly description: - generic: 1PM, EM, Plug S, Pro 3EM in monophase mode + generic: 1PM + - brand: Shelly + description: + generic: EM + - brand: Shelly + description: + generic: Plug S + - brand: Shelly + description: + generic: Pro 3EM in monophase mode group: switchsockets params: - name: usage diff --git a/templates/definition/meter/smartfox-em2.yaml b/templates/definition/meter/smartfox-em2.yaml index ccc2a1a1673..b8c3491d098 100644 --- a/templates/definition/meter/smartfox-em2.yaml +++ b/templates/definition/meter/smartfox-em2.yaml @@ -2,7 +2,19 @@ template: smartfox-em2 products: - brand: Smartfox description: - generic: Pro, Pro 2, Pro Light, Pro Light 2, Light (EM2 firmware) + generic: Pro + - brand: Smartfox + description: + generic: Pro 2 + - brand: Smartfox + description: + generic: Pro Light + - brand: Smartfox + description: + generic: Pro Light 2 + - brand: Smartfox + description: + generic: Light (EM2 firmware) requirements: description: de: | diff --git a/templates/definition/meter/smartfox.yaml b/templates/definition/meter/smartfox.yaml index fdf2c8e9d26..611e6755a22 100644 --- a/templates/definition/meter/smartfox.yaml +++ b/templates/definition/meter/smartfox.yaml @@ -2,7 +2,13 @@ template: smartfox products: - brand: Smartfox description: - generic: Box, Reg, Reg extended + generic: Box + - brand: Smartfox + description: + generic: Reg + - brand: Smartfox + description: + generic: Reg extended requirements: description: de: | diff --git a/templates/definition/meter/sofarsolar.yaml b/templates/definition/meter/sofarsolar.yaml index 0a3bc552a8f..c9aba2b8b2b 100644 --- a/templates/definition/meter/sofarsolar.yaml +++ b/templates/definition/meter/sofarsolar.yaml @@ -2,10 +2,16 @@ template: sofarsolar products: - brand: SofarSolar description: - generic: Inverter, Hybrid Inverter + generic: Inverter + - brand: SofarSolar + description: + generic: Hybrid Inverter + - brand: ZCS Azzurro + description: + generic: Inverter - brand: ZCS Azzurro description: - generic: Inverter, Hybrid Inverter + generic: Hybrid Inverter params: - name: usage choice: ["grid", "pv", "battery"] diff --git a/templates/definition/meter/solarwatt.yaml b/templates/definition/meter/solarwatt.yaml index 529601226be..c3db9b7c54e 100644 --- a/templates/definition/meter/solarwatt.yaml +++ b/templates/definition/meter/solarwatt.yaml @@ -6,7 +6,10 @@ products: generic: MyReserve - brand: Solarwatt description: - generic: EnergyManager, EnergyManager Pro + generic: EnergyManager + - brand: Solarwatt + description: + generic: EnergyManager Pro params: - name: usage choice: ["grid", "pv", "battery"] diff --git a/templates/definition/meter/sonnenbatterie_eco56.yaml b/templates/definition/meter/sonnenbatterie_eco56.yaml index 0d5bc3049a6..fa4d7b85a57 100644 --- a/templates/definition/meter/sonnenbatterie_eco56.yaml +++ b/templates/definition/meter/sonnenbatterie_eco56.yaml @@ -2,7 +2,16 @@ template: sonnenbatterie-eco56 products: - brand: Sonnen description: - generic: comfort, eco 5, eco 6, oem 6.5 + generic: comfort + - brand: Sonnen + description: + generic: eco 5 + - brand: Sonnen + description: + generic: eco 6 + - brand: Sonnen + description: + generic: oem 6.5 params: - name: usage choice: ["grid", "pv", "battery"] diff --git a/templates/definition/meter/varta.yaml b/templates/definition/meter/varta.yaml index a68b33607af..97295c37d96 100644 --- a/templates/definition/meter/varta.yaml +++ b/templates/definition/meter/varta.yaml @@ -3,7 +3,13 @@ covers: ["varta-energiespeicher", "varta-energiespeicher-battery-only"] products: - brand: VARTA description: - generic: pulse, pulse neo, element + generic: pulse + - brand: VARTA + description: + generic: pulse neo + - brand: VARTA + description: + generic: element requirements: description: de: PV nur verfügbar mit PV-Sensor From f71af05ef578f3ea2051245e140274d442c75f7f Mon Sep 17 00:00:00 2001 From: Michael Geers Date: Sun, 8 Jun 2025 16:39:45 +0200 Subject: [PATCH 2/3] shelly products --- templates/definition/charger/shelly.yaml | 5 ++++- templates/definition/meter/shelly-1pm.yaml | 20 ++++++++------------ templates/definition/meter/shelly-3em.yaml | 3 +++ 3 files changed, 15 insertions(+), 13 deletions(-) diff --git a/templates/definition/charger/shelly.yaml b/templates/definition/charger/shelly.yaml index 366cc2b2670..5ce1305b2de 100644 --- a/templates/definition/charger/shelly.yaml +++ b/templates/definition/charger/shelly.yaml @@ -1,6 +1,9 @@ template: shelly products: - - brand: Shelly + - { brand: Shelly, description: { generic: 1 } } + - { brand: Shelly, description: { generic: Plus 1 } } + - { brand: Shelly, description: { generic: Pro 1 } } + - { brand: Shelly, description: { generic: Plug S } } group: switchsockets params: - name: host diff --git a/templates/definition/meter/shelly-1pm.yaml b/templates/definition/meter/shelly-1pm.yaml index 2f7e5d3cb67..61419a82310 100644 --- a/templates/definition/meter/shelly-1pm.yaml +++ b/templates/definition/meter/shelly-1pm.yaml @@ -1,17 +1,13 @@ template: shelly-1pm products: - - brand: Shelly - description: - generic: 1PM - - brand: Shelly - description: - generic: EM - - brand: Shelly - description: - generic: Plug S - - brand: Shelly - description: - generic: Pro 3EM in monophase mode + - { brand: Shelly, description: { generic: 1PM } } + - { brand: Shelly, description: { generic: 1PM mini } } + - { brand: Shelly, description: { generic: Pro 1PM } } + - { brand: Shelly, description: { generic: PM mini } } + - { brand: Shelly, description: { generic: EM } } + - { brand: Shelly, description: { generic: Pro EM } } + - { brand: Shelly, description: { generic: Pro 3EM (monophase mode) } } + - { brand: Shelly, description: { generic: Plug S } } group: switchsockets params: - name: usage diff --git a/templates/definition/meter/shelly-3em.yaml b/templates/definition/meter/shelly-3em.yaml index 0db4d96db0f..2327029fb15 100644 --- a/templates/definition/meter/shelly-3em.yaml +++ b/templates/definition/meter/shelly-3em.yaml @@ -3,6 +3,9 @@ products: - brand: Shelly description: generic: 3EM + - brand: Shelly + description: + generic: Pro 3EM params: - name: usage choice: ["grid", "pv", "charge"] From 6bc620beeb5d07672a8c0a1f21b06017f8f7bd70 Mon Sep 17 00:00:00 2001 From: Michael Geers Date: Sun, 8 Jun 2025 20:20:44 +0200 Subject: [PATCH 3/3] remove shelly pro 3pm --- templates/definition/meter/shelly-3em.yaml | 3 --- 1 file changed, 3 deletions(-) diff --git a/templates/definition/meter/shelly-3em.yaml b/templates/definition/meter/shelly-3em.yaml index 2327029fb15..0db4d96db0f 100644 --- a/templates/definition/meter/shelly-3em.yaml +++ b/templates/definition/meter/shelly-3em.yaml @@ -3,9 +3,6 @@ products: - brand: Shelly description: generic: 3EM - - brand: Shelly - description: - generic: Pro 3EM params: - name: usage choice: ["grid", "pv", "charge"]