From 7445333dbba0a0156ed909b68d36f0be01f9b304 Mon Sep 17 00:00:00 2001 From: andig Date: Thu, 24 Oct 2024 08:34:51 +0000 Subject: [PATCH] Templates update for release evcc-io/evcc@a804a775235ab0c350b41a6f59c642dbeca262f5 --- .../release/de/charger/pulsarplus-fw5_0.yaml | 2 +- .../release/de/meter/solis-hybrid-s_0.yaml | 111 ------------------ .../release/de/meter/solis-hybrid_0.yaml | 2 +- .../de/tariff/electricitymaps-free_0.yaml | 13 ++ .../release/de/vehicle/volvo2mqtt_0.yaml | 27 +++++ .../release/en/charger/pulsarplus-fw5_0.yaml | 2 +- .../release/en/meter/solis-hybrid-s_0.yaml | 111 ------------------ .../release/en/meter/solis-hybrid_0.yaml | 2 +- .../en/tariff/electricitymaps-free_0.yaml | 13 ++ .../release/en/vehicle/volvo2mqtt_0.yaml | 27 +++++ 10 files changed, 84 insertions(+), 226 deletions(-) delete mode 100644 templates/release/de/meter/solis-hybrid-s_0.yaml create mode 100644 templates/release/de/tariff/electricitymaps-free_0.yaml create mode 100644 templates/release/de/vehicle/volvo2mqtt_0.yaml delete mode 100644 templates/release/en/meter/solis-hybrid-s_0.yaml create mode 100644 templates/release/en/tariff/electricitymaps-free_0.yaml create mode 100644 templates/release/en/vehicle/volvo2mqtt_0.yaml diff --git a/templates/release/de/charger/pulsarplus-fw5_0.yaml b/templates/release/de/charger/pulsarplus-fw5_0.yaml index 10b426595..4a28374a8 100644 --- a/templates/release/de/charger/pulsarplus-fw5_0.yaml +++ b/templates/release/de/charger/pulsarplus-fw5_0.yaml @@ -24,4 +24,4 @@ render: idtag: evcc # Diese Option ist nur in Ausnahmefällen erforderlich wenn der Ladepunkt für die Annahme externer Transaktionen einen spezifischen Token erfordert. (optional) connecttimeout: 5m # optional meterinterval: 10s # optional - metervalues: -Current.Offered,-Power.Offered # optional + metervalues: -Current.Offered,Power.Offered # optional diff --git a/templates/release/de/meter/solis-hybrid-s_0.yaml b/templates/release/de/meter/solis-hybrid-s_0.yaml deleted file mode 100644 index 1baea4390..000000000 --- a/templates/release/de/meter/solis-hybrid-s_0.yaml +++ /dev/null @@ -1,111 +0,0 @@ -product: - brand: Ginlong - description: Solis Hybrid Inverter (S Series) -render: - - usage: grid - default: | - type: template - template: solis-hybrid-s - usage: grid - - # RS485 via adapter (Modbus RTU) - modbus: rs485serial - id: 1 - device: /dev/ttyUSB0 # USB-RS485 Adapter Adresse - baudrate: 9600 # Prüfe die Geräteeinstellungen, typische Werte sind 9600, 19200, 38400, 57600, 115200 - comset: "8N1" # Kommunikationsparameter für den Adapter - - # RS485 via TCP/IP (Modbus RTU) - modbus: rs485tcpip - id: 1 - host: 192.0.2.2 # Hostname - port: 502 # Port - advanced: | - type: template - template: solis-hybrid-s - usage: grid - - # RS485 via adapter (Modbus RTU) - modbus: rs485serial - id: 1 - device: /dev/ttyUSB0 # USB-RS485 Adapter Adresse - baudrate: 9600 # Prüfe die Geräteeinstellungen, typische Werte sind 9600, 19200, 38400, 57600, 115200 - comset: "8N1" # Kommunikationsparameter für den Adapter - - # RS485 via TCP/IP (Modbus RTU) - modbus: rs485tcpip - id: 1 - host: 192.0.2.2 # Hostname - port: 502 # Port - - usage: pv - default: | - type: template - template: solis-hybrid-s - usage: pv - - # RS485 via adapter (Modbus RTU) - modbus: rs485serial - id: 1 - device: /dev/ttyUSB0 # USB-RS485 Adapter Adresse - baudrate: 9600 # Prüfe die Geräteeinstellungen, typische Werte sind 9600, 19200, 38400, 57600, 115200 - comset: "8N1" # Kommunikationsparameter für den Adapter - - # RS485 via TCP/IP (Modbus RTU) - modbus: rs485tcpip - id: 1 - host: 192.0.2.2 # Hostname - port: 502 # Port - advanced: | - type: template - template: solis-hybrid-s - usage: pv - - # RS485 via adapter (Modbus RTU) - modbus: rs485serial - id: 1 - device: /dev/ttyUSB0 # USB-RS485 Adapter Adresse - baudrate: 9600 # Prüfe die Geräteeinstellungen, typische Werte sind 9600, 19200, 38400, 57600, 115200 - comset: "8N1" # Kommunikationsparameter für den Adapter - - # RS485 via TCP/IP (Modbus RTU) - modbus: rs485tcpip - id: 1 - host: 192.0.2.2 # Hostname - port: 502 # Port - maxacpower: 0 # Maximale AC Leistung des Hybrid-Wechselrichters (optional) - - usage: battery - default: | - type: template - template: solis-hybrid-s - usage: battery - - # RS485 via adapter (Modbus RTU) - modbus: rs485serial - id: 1 - device: /dev/ttyUSB0 # USB-RS485 Adapter Adresse - baudrate: 9600 # Prüfe die Geräteeinstellungen, typische Werte sind 9600, 19200, 38400, 57600, 115200 - comset: "8N1" # Kommunikationsparameter für den Adapter - - # RS485 via TCP/IP (Modbus RTU) - modbus: rs485tcpip - id: 1 - host: 192.0.2.2 # Hostname - port: 502 # Port - advanced: | - type: template - template: solis-hybrid-s - usage: battery - - # RS485 via adapter (Modbus RTU) - modbus: rs485serial - id: 1 - device: /dev/ttyUSB0 # USB-RS485 Adapter Adresse - baudrate: 9600 # Prüfe die Geräteeinstellungen, typische Werte sind 9600, 19200, 38400, 57600, 115200 - comset: "8N1" # Kommunikationsparameter für den Adapter - - # RS485 via TCP/IP (Modbus RTU) - modbus: rs485tcpip - id: 1 - host: 192.0.2.2 # Hostname - port: 502 # Port - capacity: 50 # Akkukapazität in kWh (optional) diff --git a/templates/release/de/meter/solis-hybrid_0.yaml b/templates/release/de/meter/solis-hybrid_0.yaml index a469bd2fc..ceee058df 100644 --- a/templates/release/de/meter/solis-hybrid_0.yaml +++ b/templates/release/de/meter/solis-hybrid_0.yaml @@ -1,6 +1,6 @@ product: brand: Ginlong - description: Solis Hybrid Inverter (RHI series) + description: Solis Hybrid Inverter (RHI and S series) render: - usage: grid default: | diff --git a/templates/release/de/tariff/electricitymaps-free_0.yaml b/templates/release/de/tariff/electricitymaps-free_0.yaml new file mode 100644 index 000000000..1c4d0e7b0 --- /dev/null +++ b/templates/release/de/tariff/electricitymaps-free_0.yaml @@ -0,0 +1,13 @@ +product: + brand: Electricity Maps + description: Free API + group: CO₂ Vorhersage +requirements: ["skiptest"] +description: | + CO₂-Daten für viele Länder von https://electricitymaps.com/. Der 'Free Personal Tier' beinhaltet leider keine Prognosedaten. Dafür benötigst du einen kommerziellen Account von https://api-portal.electricitymaps.com/. Kostenloser Testmonat verfügbar. +render: + - default: | + type: template + template: electricitymaps-free + token: + zone: DE # siehe https://api.electricitymap.org/v3/zones diff --git a/templates/release/de/vehicle/volvo2mqtt_0.yaml b/templates/release/de/vehicle/volvo2mqtt_0.yaml new file mode 100644 index 000000000..a0c4b64a1 --- /dev/null +++ b/templates/release/de/vehicle/volvo2mqtt_0.yaml @@ -0,0 +1,27 @@ +product: + description: volvo2mqtt + group: Generische Unterstützung +description: | + Erforderlich ist eine konfigurierte MQTT Broker-Konfiguration und eine volvo2mqtt-Installation https://github.com/Dielee/volvo2mqtt. +render: + - default: | + type: template + template: volvo2mqtt + title: # Wird in der Benutzeroberfläche angezeigt (optional) + vin: W... # Erforderlich + capacity: 50 # Akkukapazität in kWh (optional) + timeout: 720h # optional + advanced: | + type: template + template: volvo2mqtt + title: # Wird in der Benutzeroberfläche angezeigt (optional) + vin: W... # Erforderlich + capacity: 50 # Akkukapazität in kWh (optional) + timeout: 720h # optional + icon: car # Icon in der Benutzeroberfläche (optional) + phases: 3 # Die maximale Anzahl der Phasen welche genutzt werden können (optional) + mode: # Möglich sind Off, Now, MinPV und PV, oder leer wenn keiner definiert werden soll (optional) + minCurrent: 6 # Definiert die minimale Stromstärke pro angeschlossener Phase mit welcher das Fahrzeug geladen werden soll (optional) + maxCurrent: 16 # Definiert die maximale Stromstärke pro angeschlossener Phase mit welcher das Fahrzeug geladen werden soll (optional) + identifiers: # Kann meist erst später eingetragen werden, siehe: https://docs.evcc.io/docs/features/vehicle (optional) + priority: # Priorität des Ladepunktes oder Fahrzeugs in Relation zu anderen Ladepunkten oder Fahrzeugen für die Zuweisung von PV-Energie (optional) diff --git a/templates/release/en/charger/pulsarplus-fw5_0.yaml b/templates/release/en/charger/pulsarplus-fw5_0.yaml index e4fc8a867..a5402fbeb 100644 --- a/templates/release/en/charger/pulsarplus-fw5_0.yaml +++ b/templates/release/en/charger/pulsarplus-fw5_0.yaml @@ -24,4 +24,4 @@ render: idtag: evcc # This option is only required in exceptional cases if the charger requires a specific token for accepting external transactions. (optional) connecttimeout: 5m # optional meterinterval: 10s # optional - metervalues: -Current.Offered,-Power.Offered # optional + metervalues: -Current.Offered,Power.Offered # optional diff --git a/templates/release/en/meter/solis-hybrid-s_0.yaml b/templates/release/en/meter/solis-hybrid-s_0.yaml deleted file mode 100644 index a94dbd2cf..000000000 --- a/templates/release/en/meter/solis-hybrid-s_0.yaml +++ /dev/null @@ -1,111 +0,0 @@ -product: - brand: Ginlong - description: Solis Hybrid Inverter (S Series) -render: - - usage: grid - default: | - type: template - template: solis-hybrid-s - usage: grid - - # RS485 via adapter (Modbus RTU) - modbus: rs485serial - id: 1 - device: /dev/ttyUSB0 # USB-RS485 Adapter Adresse - baudrate: 9600 # Prüfe die Geräteeinstellungen, typische Werte sind 9600, 19200, 38400, 57600, 115200 - comset: "8N1" # Kommunikationsparameter für den Adapter - - # RS485 via TCP/IP (Modbus RTU) - modbus: rs485tcpip - id: 1 - host: 192.0.2.2 # Hostname - port: 502 # Port - advanced: | - type: template - template: solis-hybrid-s - usage: grid - - # RS485 via adapter (Modbus RTU) - modbus: rs485serial - id: 1 - device: /dev/ttyUSB0 # USB-RS485 Adapter Adresse - baudrate: 9600 # Prüfe die Geräteeinstellungen, typische Werte sind 9600, 19200, 38400, 57600, 115200 - comset: "8N1" # Kommunikationsparameter für den Adapter - - # RS485 via TCP/IP (Modbus RTU) - modbus: rs485tcpip - id: 1 - host: 192.0.2.2 # Hostname - port: 502 # Port - - usage: pv - default: | - type: template - template: solis-hybrid-s - usage: pv - - # RS485 via adapter (Modbus RTU) - modbus: rs485serial - id: 1 - device: /dev/ttyUSB0 # USB-RS485 Adapter Adresse - baudrate: 9600 # Prüfe die Geräteeinstellungen, typische Werte sind 9600, 19200, 38400, 57600, 115200 - comset: "8N1" # Kommunikationsparameter für den Adapter - - # RS485 via TCP/IP (Modbus RTU) - modbus: rs485tcpip - id: 1 - host: 192.0.2.2 # Hostname - port: 502 # Port - advanced: | - type: template - template: solis-hybrid-s - usage: pv - - # RS485 via adapter (Modbus RTU) - modbus: rs485serial - id: 1 - device: /dev/ttyUSB0 # USB-RS485 Adapter Adresse - baudrate: 9600 # Prüfe die Geräteeinstellungen, typische Werte sind 9600, 19200, 38400, 57600, 115200 - comset: "8N1" # Kommunikationsparameter für den Adapter - - # RS485 via TCP/IP (Modbus RTU) - modbus: rs485tcpip - id: 1 - host: 192.0.2.2 # Hostname - port: 502 # Port - maxacpower: 0 # Maximum AC power of the hybrid inverter (optional) - - usage: battery - default: | - type: template - template: solis-hybrid-s - usage: battery - - # RS485 via adapter (Modbus RTU) - modbus: rs485serial - id: 1 - device: /dev/ttyUSB0 # USB-RS485 Adapter Adresse - baudrate: 9600 # Prüfe die Geräteeinstellungen, typische Werte sind 9600, 19200, 38400, 57600, 115200 - comset: "8N1" # Kommunikationsparameter für den Adapter - - # RS485 via TCP/IP (Modbus RTU) - modbus: rs485tcpip - id: 1 - host: 192.0.2.2 # Hostname - port: 502 # Port - advanced: | - type: template - template: solis-hybrid-s - usage: battery - - # RS485 via adapter (Modbus RTU) - modbus: rs485serial - id: 1 - device: /dev/ttyUSB0 # USB-RS485 Adapter Adresse - baudrate: 9600 # Prüfe die Geräteeinstellungen, typische Werte sind 9600, 19200, 38400, 57600, 115200 - comset: "8N1" # Kommunikationsparameter für den Adapter - - # RS485 via TCP/IP (Modbus RTU) - modbus: rs485tcpip - id: 1 - host: 192.0.2.2 # Hostname - port: 502 # Port - capacity: 50 # Battery capacity in kWh (optional) diff --git a/templates/release/en/meter/solis-hybrid_0.yaml b/templates/release/en/meter/solis-hybrid_0.yaml index 4101a0e4d..cb51c7fa7 100644 --- a/templates/release/en/meter/solis-hybrid_0.yaml +++ b/templates/release/en/meter/solis-hybrid_0.yaml @@ -1,6 +1,6 @@ product: brand: Ginlong - description: Solis Hybrid Inverter (RHI series) + description: Solis Hybrid Inverter (RHI and S series) render: - usage: grid default: | diff --git a/templates/release/en/tariff/electricitymaps-free_0.yaml b/templates/release/en/tariff/electricitymaps-free_0.yaml new file mode 100644 index 000000000..7747adae0 --- /dev/null +++ b/templates/release/en/tariff/electricitymaps-free_0.yaml @@ -0,0 +1,13 @@ +product: + brand: Electricity Maps + description: Free API + group: CO₂ forecast +requirements: ["skiptest"] +description: | + CO₂ data for many countries from https://electricitymaps.com/. The 'Free Personal Tier' unfortunately does not include forecast data. You'll need a commercial account from https://api-portal.electricitymaps.com/. Free trial available. +render: + - default: | + type: template + template: electricitymaps-free + token: + zone: DE # see https://api.electricitymap.org/v3/zones diff --git a/templates/release/en/vehicle/volvo2mqtt_0.yaml b/templates/release/en/vehicle/volvo2mqtt_0.yaml new file mode 100644 index 000000000..bd7bc14be --- /dev/null +++ b/templates/release/en/vehicle/volvo2mqtt_0.yaml @@ -0,0 +1,27 @@ +product: + description: volvo2mqtt + group: Generic support +description: | + Requires MQTT broker configuration and a volvo2mqtt installation https://github.com/Dielee/volvo2mqtt +render: + - default: | + type: template + template: volvo2mqtt + title: # Will be displayed in the user interface (optional) + vin: W... # Required + capacity: 50 # Battery capacity in kWh (optional) + timeout: 720h # optional + advanced: | + type: template + template: volvo2mqtt + title: # Will be displayed in the user interface (optional) + vin: W... # Required + capacity: 50 # Battery capacity in kWh (optional) + timeout: 720h # optional + icon: car # Icon as shown in user interface (optional) + phases: 3 # The maximum number of phases which can be used (optional) + mode: # Possible values are Off, Now, MinPV and PV, or empty if none should be set (optional) + minCurrent: 6 # The minimum amperage per connected phase with which the car should be charged (optional) + maxCurrent: 16 # The maximum amperage per connected phase with which the car shuold be charged (optional) + identifiers: # Mostly this can be added later, see: https://docs.evcc.io/en/docs/features/vehicle (optional) + priority: # Priority of the loadpoint or vehicle in relation to other loadpoints or vehicles for allocating pv energy (optional)