diff --git a/templates/definition/meter/huawei-sun2000.yaml b/templates/definition/meter/huawei-sun2000.yaml index 7ecfc3501..26bd96105 100644 --- a/templates/definition/meter/huawei-sun2000.yaml +++ b/templates/definition/meter/huawei-sun2000.yaml @@ -29,7 +29,6 @@ params: advanced: true - name: maxchargepower default: 10000 - advanced: true - name: capacity advanced: true - name: maxacpower diff --git a/templates/definition/meter/sma-hybrid.yaml b/templates/definition/meter/sma-hybrid.yaml index 3443c1126..8d48f5117 100644 --- a/templates/definition/meter/sma-hybrid.yaml +++ b/templates/definition/meter/sma-hybrid.yaml @@ -19,18 +19,15 @@ params: - name: capacity advanced: true - name: maxacpower + - name: maxchargepower + default: 4200 - name: watchdog type: duration default: 60s advanced: true usages: ["battery"] - name: chargepower - default: 4200 # W - advanced: true - help: - de: Maximale Ladeleistung für erzwungenes Laden des Speichers in Watt - en: Maximum charging power for forced charging of the battery in Watt - usages: ["battery"] + deprecated: true render: | type: custom {{- if eq .usage "grid" }} @@ -160,7 +157,7 @@ render: | type: writemultiple decode: uint32 - source: const - value: {{ .chargepower }} + value: {{ .maxchargepower }} set: source: modbus {{- include "modbus" . | indent 12 }} @@ -178,7 +175,7 @@ render: | type: writemultiple decode: uint32 - source: const - value: {{ .chargepower }} + value: {{ .maxchargepower }} set: source: modbus {{- include "modbus" . | indent 12 }} @@ -218,7 +215,7 @@ render: | type: writemultiple decode: uint32 - source: const - value: {{ .chargepower }} + value: {{ .maxchargepower }} set: source: modbus {{- include "modbus" . | indent 12 }} @@ -267,7 +264,7 @@ render: | type: writemultiple decode: uint32 - source: const - value: {{ .chargepower }} + value: {{ .maxchargepower }} set: source: modbus {{- include "modbus" . | indent 12 }} @@ -276,7 +273,7 @@ render: | type: writemultiple decode: uint32 - source: const - value: {{ .chargepower }} + value: {{ .maxchargepower }} set: source: modbus {{- include "modbus" . | indent 12 }} diff --git a/templates/definition/meter/sma-sbs-15-25-modbus.yaml b/templates/definition/meter/sma-sbs-15-25-modbus.yaml index 0cbcbdb99..0e5840cb9 100644 --- a/templates/definition/meter/sma-sbs-15-25-modbus.yaml +++ b/templates/definition/meter/sma-sbs-15-25-modbus.yaml @@ -16,16 +16,14 @@ params: de: Der ModbusTCP Server muss aktiviert sein. - name: capacity advanced: true + - name: maxchargepower + default: 4200 - name: watchdog type: duration default: 60s advanced: true - name: chargepower - default: 4200 # W - advanced: true - help: - de: Maximale Ladeleistung für erzwungenes Laden des Speichers in Watt - en: Maximum charging power for forced charging of the battery in Watt + deprecated: true render: | type: custom power: @@ -80,7 +78,7 @@ render: | type: writemultiple decode: uint32 - source: const - value: {{ .chargepower }} + value: {{ .maxchargepower }} set: source: modbus {{- include "modbus" . | indent 12 }} @@ -98,7 +96,7 @@ render: | type: writemultiple decode: uint32 - source: const - value: {{ .chargepower }} + value: {{ .maxchargepower }} set: source: modbus {{- include "modbus" . | indent 12 }} @@ -138,7 +136,7 @@ render: | type: writemultiple decode: uint32 - source: const - value: {{ .chargepower }} + value: {{ .maxchargepower }} set: source: modbus {{- include "modbus" . | indent 12 }} @@ -187,7 +185,7 @@ render: | type: writemultiple decode: uint32 - source: const - value: {{ .chargepower }} + value: {{ .maxchargepower }} set: source: modbus {{- include "modbus" . | indent 12 }} @@ -196,7 +194,7 @@ render: | type: writemultiple decode: uint32 - source: const - value: {{ .chargepower }} + value: {{ .maxchargepower }} set: source: modbus {{- include "modbus" . | indent 12 }} diff --git a/templates/definition/meter/sma-sbs-modbus.yaml b/templates/definition/meter/sma-sbs-modbus.yaml index 23b7d470a..2a55de5ad 100644 --- a/templates/definition/meter/sma-sbs-modbus.yaml +++ b/templates/definition/meter/sma-sbs-modbus.yaml @@ -16,16 +16,14 @@ params: de: Der ModbusTCP Server muss aktiviert sein. - name: capacity advanced: true + - name: maxchargepower + default: 4200 - name: watchdog type: duration default: 60s advanced: true - name: chargepower - default: 4200 # W - advanced: true - help: - de: Maximale Ladeleistung für erzwungenes Laden des Speichers in Watt - en: Maximum charging power for forced charging of the battery in Watt + deprecated: true render: | type: custom power: @@ -80,7 +78,7 @@ render: | type: writemultiple decode: uint32 - source: const - value: {{ .chargepower }} + value: {{ .maxchargepower }} set: source: modbus {{- include "modbus" . | indent 12 }} @@ -98,7 +96,7 @@ render: | type: writemultiple decode: uint32 - source: const - value: {{ .chargepower }} + value: {{ .maxchargepower }} set: source: modbus {{- include "modbus" . | indent 12 }} @@ -138,7 +136,7 @@ render: | type: writemultiple decode: uint32 - source: const - value: {{ .chargepower }} + value: {{ .maxchargepower }} set: source: modbus {{- include "modbus" . | indent 12 }} @@ -187,7 +185,7 @@ render: | type: writemultiple decode: uint32 - source: const - value: {{ .chargepower }} + value: {{ .maxchargepower }} set: source: modbus {{- include "modbus" . | indent 12 }} @@ -196,7 +194,7 @@ render: | type: writemultiple decode: uint32 - source: const - value: {{ .chargepower }} + value: {{ .maxchargepower }} set: source: modbus {{- include "modbus" . | indent 12 }} diff --git a/templates/definition/meter/sma-si-modbus.yaml b/templates/definition/meter/sma-si-modbus.yaml index c9496837a..8db76b9e5 100644 --- a/templates/definition/meter/sma-si-modbus.yaml +++ b/templates/definition/meter/sma-si-modbus.yaml @@ -16,16 +16,14 @@ params: de: Der ModbusTCP Server muss aktiviert sein. - name: capacity advanced: true + - name: maxchargepower + default: 4200 - name: watchdog type: duration default: 60s advanced: true - name: chargepower - default: 4200 # W - advanced: true - help: - de: Maximale Ladeleistung für erzwungenes Laden des Speichers in Watt - en: Maximum charging power for forced charging of the battery in Watt + deprecated: true render: | type: custom power: @@ -95,7 +93,7 @@ render: | source: sequence set: - source: const - value: -{{ .chargepower }} # Wirkleistungsvorgabe + value: -{{ .maxchargepower }} # Wirkleistungsvorgabe set: source: modbus {{- include "modbus" . | indent 12 }} diff --git a/templates/definition/meter/sonnenbatterie.yaml b/templates/definition/meter/sonnenbatterie.yaml index 97277ff70..428e5ecef 100644 --- a/templates/definition/meter/sonnenbatterie.yaml +++ b/templates/definition/meter/sonnenbatterie.yaml @@ -10,11 +10,11 @@ requirements: de: | Für die aktive Batteriesteuerung muss über das Webinterface der sonnenBatterie (unter Software-Integration) das "JSON Write API" aktiviert und das dort generierte API-Token in der Batteriekonfiguration unter `token` eingetragen werden. Als Betriebsart der sonnenBatterie werden die beiden Modi "Eigenverbrauch" (Standard) und "Time-of-use" unterstützt. Der Modus kann über den Parameter `defaultmode` an die Konfiguration der sonnenBatterie angepasst werden. - Die Leistung für das Netzladen kann an die Wechselrichterleistung der sonnenBatterie über den Parameter `chargepower` angepasst werden. + Die Leistung für das Netzladen kann an die Wechselrichterleistung der sonnenBatterie über den Parameter `maxchargepower` angepasst werden. en: | For active battery control, the "JSON Write API" must be activated via the sonnenBatterie web interface (under Software-Integration) and the API token generated there must be entered in the battery configuration under `token`. The two operating modes supported for the sonnenBatterie are “self-consumption” (default) and “time-of-use”. The mode can be adapted to the configuration of the sonnenBatterie via the 'defaultmode' parameter. - The power for grid charging can be adapted to the inverter power of the sonnenBatterie via the `chargepower` parameter. + The power for grid charging can be adapted to the inverter power of the sonnenBatterie via the `maxchargepower` parameter. params: - name: usage choice: ["grid", "pv", "battery"] @@ -24,6 +24,8 @@ params: default: 8080 - name: capacity advanced: true + - name: maxchargepower + default: 3300 - name: token required: false help: @@ -41,12 +43,7 @@ params: en: Default mode for active battery control usages: ["battery"] - name: chargepower - default: 3300 - advanced: true - help: - de: Ladeleistung für Netzladen in W - en: Charging power for grid charging in W - usages: ["battery"] + deprecated: true render: | type: custom power: @@ -129,7 +126,7 @@ render: | - content-type: application/json - Auth-Token: {{ .token }} - source: http - uri: http://{{ .host }}/api/v2/setpoint/charge/{{ .chargepower }} + uri: http://{{ .host }}/api/v2/setpoint/charge/{{ .maxchargepower }} insecure: true method: POST headers: diff --git a/templates/definition/meter/sungrow-hybrid.yaml b/templates/definition/meter/sungrow-hybrid.yaml index 7b61d03d6..2ac796409 100644 --- a/templates/definition/meter/sungrow-hybrid.yaml +++ b/templates/definition/meter/sungrow-hybrid.yaml @@ -21,8 +21,9 @@ params: advanced: true - name: maxacpower - name: maxchargepower - usages: ["battery"] - advanced: true + help: + en: Maximum charge power for forced charging of the battery in watts. (0 to automatically set the value of the maximum BDC rated power) + de: Maximale Ladeleistung für erzwungenes Laden des Speichers in Watt. (0 um automatisch den Wert der maximalen BDC-Nennleistung einzustellen) render: | type: custom {{- if eq .usage "grid" }} diff --git a/util/templates/defaults.yaml b/util/templates/defaults.yaml index 2ab2bb182..39f0f7e00 100644 --- a/util/templates/defaults.yaml +++ b/util/templates/defaults.yaml @@ -328,8 +328,9 @@ params: en: Maximum charge power (W) de: Maximale Ladeleistung (W) help: - en: Power limit for grid charging. - de: Leistungslimit für Netzladung. + en: Maximum charge power for forced charging of the battery in watts. + de: Maximale Ladeleistung für erzwungenes Laden des Speichers in Watt. + advanced: true - name: maxchargerate type: int usages: ["battery"] @@ -337,9 +338,10 @@ params: en: Maximum charge power (%) de: Maximale Ladeleistung (%) help: - en: Power limit for grid charging. - de: Leistungslimit für Netzladung. + en: Maximum charge power for forced charging of the battery in percent in relation to the maximum charge power of the battery inverter. + de: Maximale Leistung für erzwungenes Laden des Speichers in Prozent in Relation zur maximalen Ladeleistung des Batteriewechselrichters. default: 100 + advanced: true presets: vehicle-base: