From a70f4b35f1a58abc58a0efb5670015e8c9619b18 Mon Sep 17 00:00:00 2001 From: andig Date: Tue, 16 Jun 2026 10:03:44 +0200 Subject: [PATCH] Templates: consolidate shared param properties with defaults.yaml (#30908) --- AGENTS.md | 1 + templates/definition/charger/abl-em4.yaml | 1 - templates/definition/charger/alpitronic.yaml | 1 - .../definition/charger/demo-charger.yaml | 3 --- .../definition/charger/demo-heatpump.yaml | 3 --- templates/definition/charger/e3dc-rscp.yaml | 1 - templates/definition/charger/em2go-duo.yaml | 1 - templates/definition/charger/evecube.yaml | 2 -- .../definition/charger/evsemaster-udp.yaml | 1 - templates/definition/charger/fritzdect.yaml | 1 - .../definition/charger/hardybarth-ecb1.yaml | 2 -- templates/definition/charger/homematic.yaml | 1 - templates/definition/charger/iobroker.yaml | 1 - .../definition/charger/keba-modbus-p40.yaml | 1 - templates/definition/charger/keba-modbus.yaml | 1 - templates/definition/charger/kermi.yaml | 2 -- .../definition/charger/lambda-zewotherm.yaml | 2 -- templates/definition/charger/openwb-2.0.yaml | 1 - .../definition/charger/openwb-native.yaml | 2 -- templates/definition/charger/plugchoice.yaml | 1 - templates/definition/charger/pulsatrix.yaml | 1 - .../definition/charger/shelly-topac.yaml | 1 - templates/definition/charger/smart-evse.yaml | 1 - templates/definition/charger/tasmota.yaml | 1 - templates/definition/charger/viessmann.yaml | 4 ---- templates/definition/messenger/email.yaml | 1 - templates/definition/messenger/ntfy.yaml | 4 ---- templates/definition/messenger/shoutrrr.yaml | 1 - templates/definition/messenger/telegram.yaml | 1 - templates/definition/meter/atmoce.yaml | 1 - templates/definition/meter/cozify.yaml | 2 -- templates/definition/meter/demo-battery.yaml | 2 -- .../definition/meter/ecoflow-powerocean.yaml | 1 - .../definition/meter/ecoflow-stream.yaml | 1 - templates/definition/meter/enphase.yaml | 2 -- .../meter/esphome-dlms-austria.yaml | 1 - templates/definition/meter/fritzdect.yaml | 1 - templates/definition/meter/fritzgrid.yaml | 1 - templates/definition/meter/fronius-gen24.yaml | 1 - .../definition/meter/fronius-vertoplus.yaml | 1 - templates/definition/meter/homematic.yaml | 1 - .../definition/meter/hoymiles-dtu-mb.yaml | 1 - templates/definition/meter/iammeter-1p.yaml | 1 - templates/definition/meter/iammeter-2p.yaml | 2 -- templates/definition/meter/iammeter-3p.yaml | 1 - .../definition/meter/indevolt-battery.yaml | 1 - .../definition/meter/indevolt-hybrid.yaml | 1 - templates/definition/meter/iotawatt.yaml | 1 - .../definition/meter/kaco-blueplanet.yaml | 1 - .../meter/kostal-plenticore-gen2.yaml | 2 -- .../definition/meter/kostal-plenticore.yaml | 2 -- .../definition/meter/openems-modbus.yaml | 2 -- templates/definition/meter/openems.yaml | 2 -- templates/definition/meter/pstryk.yaml | 1 - templates/definition/meter/rct-power.yaml | 1 - templates/definition/meter/saj-h2.yaml | 2 -- templates/definition/meter/sax.yaml | 2 -- templates/definition/meter/sma-hybrid.yaml | 2 -- .../meter/sma-sbs-15-25-modbus.yaml | 2 -- .../definition/meter/sma-sbs-modbus.yaml | 2 -- templates/definition/meter/sma-si-modbus.yaml | 2 -- templates/definition/meter/smartfox-em2.yaml | 1 - templates/definition/meter/sofarsolar-g3.yaml | 1 - .../definition/meter/solaredge-hybrid.yaml | 2 -- .../definition/meter/solarmax-maxstorage.yaml | 2 -- templates/definition/meter/solax.yaml | 1 - .../definition/meter/sonnenbatterie.yaml | 2 -- .../meter/sonnenbatterie_eco56.yaml | 1 - .../meter/sunspec-inverter-control.yaml | 1 - templates/definition/meter/tasmota.yaml | 1 - .../definition/meter/tesla-powerwall.yaml | 2 -- templates/definition/meter/varta.yaml | 2 -- templates/definition/meter/victron-vrm.yaml | 1 - templates/definition/meter/vzlogger.yaml | 1 - .../meter/zendure-solarflow-ac.yaml | 2 -- .../meter/zendure-solarflow-pro.yaml | 1 - .../tariff/energypriceforecast.yaml | 6 ------ templates/definition/tariff/esios.yaml | 2 -- templates/definition/tariff/ews.yaml | 1 - .../definition/tariff/green-grid-compass.yaml | 2 -- templates/definition/tariff/nordpool.yaml | 6 ------ templates/definition/tariff/octopus-de.yaml | 4 ---- templates/definition/tariff/ostrom.yaml | 2 -- .../tariff/stroomprijsprognose.yaml | 6 ------ templates/definition/vehicle/cardata.yaml | 1 - templates/definition/vehicle/citroen.yaml | 2 -- templates/definition/vehicle/ds.yaml | 2 -- .../vehicle/ford-connect-query.yaml | 3 --- .../definition/vehicle/ford-connect.yaml | 4 ---- templates/definition/vehicle/mercedes.yaml | 2 -- templates/definition/vehicle/offline.yaml | 1 - templates/definition/vehicle/opel.yaml | 2 -- templates/definition/vehicle/peugeot.yaml | 2 -- templates/definition/vehicle/smart.yaml | 2 -- templates/definition/vehicle/tesla-ble.yaml | 1 - templates/definition/vehicle/tesla.yaml | 6 ------ templates/definition/vehicle/tibber.yaml | 6 ------ templates/definition/vehicle/tronity.yaml | 3 --- .../definition/vehicle/volvo-connected.yaml | 5 ----- util/templates/defaults.yaml | 19 +++++++++++++++++++ 100 files changed, 20 insertions(+), 181 deletions(-) diff --git a/AGENTS.md b/AGENTS.md index e875e7c92..369676278 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -264,6 +264,7 @@ Deep documentation on specific subsystems is available in `docs/agents/`. Load w - Device types: chargers, meters, vehicles, tariffs - Plugin protocols: Modbus, HTTP, MQTT, JavaScript, Go - Define device capabilities and configuration in templates at `templates/definition/[type]/` +- Don't restate param properties that `util/templates/defaults.yaml` already defines for that param name. Properties (description, help, type, unit, default, example, required, advanced, mask, private, usages, …) are inherited from defaults; only specify a property in a template to give it a *different* value. Restating the same value is redundant duplication: reference the param by `name` alone. - Test templates: `evcc --template-type [type] --template [file]` - Update docs after template changes: `make docs` - When implementing or debugging against a third-party device library (eebus-go/ship/spine-go, ocpp-go, modbus/SunSpec), consult the library's current upstream documentation before coding rather than relying on recalled API details diff --git a/templates/definition/charger/abl-em4.yaml b/templates/definition/charger/abl-em4.yaml index 4643ba457..aeb36b8dc 100644 --- a/templates/definition/charger/abl-em4.yaml +++ b/templates/definition/charger/abl-em4.yaml @@ -14,7 +14,6 @@ params: choice: ["tcpip"] id: 255 - name: connector - default: 1 render: | type: abl-em4 {{- include "modbus" . }} diff --git a/templates/definition/charger/alpitronic.yaml b/templates/definition/charger/alpitronic.yaml index a683b73eb..5434c6c2a 100644 --- a/templates/definition/charger/alpitronic.yaml +++ b/templates/definition/charger/alpitronic.yaml @@ -10,7 +10,6 @@ params: - name: modbus choice: ["tcpip"] - name: connector - default: 1 render: | type: alpitronic {{- include "modbus" . }} diff --git a/templates/definition/charger/demo-charger.yaml b/templates/definition/charger/demo-charger.yaml index eb308611a..13b8c475b 100644 --- a/templates/definition/charger/demo-charger.yaml +++ b/templates/definition/charger/demo-charger.yaml @@ -34,10 +34,7 @@ params: description: de: Maximale Stromstärke en: Maximum amperage - unit: A help: - example: 16 - type: int advanced: true - name: phases1p3p description: diff --git a/templates/definition/charger/demo-heatpump.yaml b/templates/definition/charger/demo-heatpump.yaml index 478a9178e..01d4cb8e3 100644 --- a/templates/definition/charger/demo-heatpump.yaml +++ b/templates/definition/charger/demo-heatpump.yaml @@ -50,10 +50,7 @@ params: description: de: Maximale Stromstärke en: Maximum amperage - unit: A help: - example: 16 - type: int advanced: true render: | diff --git a/templates/definition/charger/e3dc-rscp.yaml b/templates/definition/charger/e3dc-rscp.yaml index 96e4d9b78..35789c4c8 100644 --- a/templates/definition/charger/e3dc-rscp.yaml +++ b/templates/definition/charger/e3dc-rscp.yaml @@ -27,7 +27,6 @@ params: description: en: E3DC portal password de: E3DC Portal Passwort - mask: true required: true - name: key description: diff --git a/templates/definition/charger/em2go-duo.yaml b/templates/definition/charger/em2go-duo.yaml index 647875fda..e33178607 100644 --- a/templates/definition/charger/em2go-duo.yaml +++ b/templates/definition/charger/em2go-duo.yaml @@ -9,7 +9,6 @@ params: choice: ["tcpip"] id: 255 - name: connector - default: 1 render: | type: em2go-duo {{- include "modbus" . }} diff --git a/templates/definition/charger/evecube.yaml b/templates/definition/charger/evecube.yaml index bc2f126bc..f07e81980 100644 --- a/templates/definition/charger/evecube.yaml +++ b/templates/definition/charger/evecube.yaml @@ -25,8 +25,6 @@ params: en: Password for admin API de: Passwort für Admin-API - name: connector - default: 1 - advanced: true help: en: Connector number (1-4) de: Anschluss-Nummer (1-4) diff --git a/templates/definition/charger/evsemaster-udp.yaml b/templates/definition/charger/evsemaster-udp.yaml index 8e8e6a618..daa6bda2c 100644 --- a/templates/definition/charger/evsemaster-udp.yaml +++ b/templates/definition/charger/evsemaster-udp.yaml @@ -24,7 +24,6 @@ params: en: Found on the device label. Enter as a 16-character hex string (8 bytes). - name: password required: true - mask: true description: de: Passwort (wie in der EVSE Master App gesetzt) en: Password (set in the EVSE Master app) diff --git a/templates/definition/charger/fritzdect.yaml b/templates/definition/charger/fritzdect.yaml index 509168375..bc4022efc 100644 --- a/templates/definition/charger/fritzdect.yaml +++ b/templates/definition/charger/fritzdect.yaml @@ -25,7 +25,6 @@ params: - name: password required: true - name: ain - required: true service: fritz/devices?uri={uri}&user={user}&password={password} - name: firmware82 advanced: true diff --git a/templates/definition/charger/hardybarth-ecb1.yaml b/templates/definition/charger/hardybarth-ecb1.yaml index 55a5c5511..4253d3179 100644 --- a/templates/definition/charger/hardybarth-ecb1.yaml +++ b/templates/definition/charger/hardybarth-ecb1.yaml @@ -15,8 +15,6 @@ requirements: params: - name: host - name: connector - default: 1 - advanced: true render: | type: hardybarth-ecb1 uri: http://{{ .host }} diff --git a/templates/definition/charger/homematic.yaml b/templates/definition/charger/homematic.yaml index 297b284b4..c2446321b 100644 --- a/templates/definition/charger/homematic.yaml +++ b/templates/definition/charger/homematic.yaml @@ -48,7 +48,6 @@ params: de: Kanalnummer der schaltbaren Steckdose, wie im CCU Webfrontend angezeigt. example: HMIP-PSM=3, HMIP-FSM+HMIP-FSM16=2, HM=1 - name: cache - advanced: true default: 1s description: en: XML-RPC API cache duration diff --git a/templates/definition/charger/iobroker.yaml b/templates/definition/charger/iobroker.yaml index 225166b33..73184b1a3 100644 --- a/templates/definition/charger/iobroker.yaml +++ b/templates/definition/charger/iobroker.yaml @@ -55,7 +55,6 @@ params: description: de: Setze maximale Stromstärke en: Set maximum amperage - unit: A type: string - name: maxcurrentmillis description: diff --git a/templates/definition/charger/keba-modbus-p40.yaml b/templates/definition/charger/keba-modbus-p40.yaml index 6eaabdb3b..1011d4a6c 100644 --- a/templates/definition/charger/keba-modbus-p40.yaml +++ b/templates/definition/charger/keba-modbus-p40.yaml @@ -25,7 +25,6 @@ params: choice: ["tcpip"] id: 255 - name: welcomecharge - advanced: true render: | type: keba-modbus {{- include "modbus" . }} diff --git a/templates/definition/charger/keba-modbus.yaml b/templates/definition/charger/keba-modbus.yaml index 4b122a82a..83514bf22 100644 --- a/templates/definition/charger/keba-modbus.yaml +++ b/templates/definition/charger/keba-modbus.yaml @@ -26,7 +26,6 @@ params: choice: ["tcpip"] id: 255 - name: welcomecharge - advanced: true render: | type: keba-modbus {{- include "modbus" . }} diff --git a/templates/definition/charger/kermi.yaml b/templates/definition/charger/kermi.yaml index 5d1ecfec2..819183ee5 100644 --- a/templates/definition/charger/kermi.yaml +++ b/templates/definition/charger/kermi.yaml @@ -16,9 +16,7 @@ params: type: choice choice: ["warmwater", "buffer"] - name: watchdog - type: duration default: 60s - advanced: true render: | type: heatpump setmaxpower: diff --git a/templates/definition/charger/lambda-zewotherm.yaml b/templates/definition/charger/lambda-zewotherm.yaml index b33f37cb4..555fc9363 100644 --- a/templates/definition/charger/lambda-zewotherm.yaml +++ b/templates/definition/charger/lambda-zewotherm.yaml @@ -41,9 +41,7 @@ params: de: veraltet, bei neg. E-Überschuss auf minus en: deprecated, set for neg. e-excess to minus - name: watchdog - type: duration default: 60s - advanced: true - name: firmware type: choice choice: ["<1.1.3", ">=1.1.3"] diff --git a/templates/definition/charger/openwb-2.0.yaml b/templates/definition/charger/openwb-2.0.yaml index c66299f87..8f436bbea 100644 --- a/templates/definition/charger/openwb-2.0.yaml +++ b/templates/definition/charger/openwb-2.0.yaml @@ -30,7 +30,6 @@ params: port: 1502 id: 1 - name: connector - default: 1 - name: phases1p3p type: bool description: diff --git a/templates/definition/charger/openwb-native.yaml b/templates/definition/charger/openwb-native.yaml index c7de4a213..e42f1deb1 100644 --- a/templates/definition/charger/openwb-native.yaml +++ b/templates/definition/charger/openwb-native.yaml @@ -136,8 +136,6 @@ params: default: 10s advanced: true - name: connector - type: int - default: 1 render: | type: openwb-native phases1p3p: {{ .phases1p3p }} diff --git a/templates/definition/charger/plugchoice.yaml b/templates/definition/charger/plugchoice.yaml index 46c5191c7..76b864cb7 100644 --- a/templates/definition/charger/plugchoice.yaml +++ b/templates/definition/charger/plugchoice.yaml @@ -37,7 +37,6 @@ params: example: AA123456 - name: connector required: true - default: 1 description: de: Anschluss-ID en: Connector ID diff --git a/templates/definition/charger/pulsatrix.yaml b/templates/definition/charger/pulsatrix.yaml index 3be47c2e5..adcb3f066 100644 --- a/templates/definition/charger/pulsatrix.yaml +++ b/templates/definition/charger/pulsatrix.yaml @@ -6,7 +6,6 @@ requirements: evcc: ["sponsorship"] params: - name: host #IP address or hostname (can be found on 3rd page of SECC display) - required: true help: en: Shown on 3rd page of SECC display de: Wird auf der dritten Displayseite des SECC angezeigt diff --git a/templates/definition/charger/shelly-topac.yaml b/templates/definition/charger/shelly-topac.yaml index 2ec7c822e..1118101bb 100644 --- a/templates/definition/charger/shelly-topac.yaml +++ b/templates/definition/charger/shelly-topac.yaml @@ -11,7 +11,6 @@ requirements: evcc: ["sponsorship"] params: - name: host - required: true - name: user - name: password render: | diff --git a/templates/definition/charger/smart-evse.yaml b/templates/definition/charger/smart-evse.yaml index 6fbdd90ee..f850e195c 100644 --- a/templates/definition/charger/smart-evse.yaml +++ b/templates/definition/charger/smart-evse.yaml @@ -16,7 +16,6 @@ params: - name: host - name: cache default: 1s - advanced: true - name: chargeMode default: normal advanced: true diff --git a/templates/definition/charger/tasmota.yaml b/templates/definition/charger/tasmota.yaml index 97378707b..5727e7532 100644 --- a/templates/definition/charger/tasmota.yaml +++ b/templates/definition/charger/tasmota.yaml @@ -14,7 +14,6 @@ params: en: admin is default - name: password - name: channel - type: int default: 1 required: true description: diff --git a/templates/definition/charger/viessmann.yaml b/templates/definition/charger/viessmann.yaml index ce1e87bfb..c099583b9 100644 --- a/templates/definition/charger/viessmann.yaml +++ b/templates/definition/charger/viessmann.yaml @@ -18,14 +18,10 @@ params: - name: password deprecated: true - name: clientid - required: true help: de: Konfigurieren in [app.developer.viessmann-climatesolutions.com](https://app.developer.viessmann-climatesolutions.com) en: Configure at [app.developer.viessmann-climatesolutions.com](https://app.developer.viessmann-climatesolutions.com) - name: redirecturi - required: true - description: - generic: Redirect URI help: en: "Redirect URI of the evcc instance. Must match the redirect URI set in the Viessmann developer portal." de: "Redirect-URI der evcc-Instanz. Muss mit der Redirect URI übereinstimmen, die im Viessmann Developer Portal konfiguriert ist." diff --git a/templates/definition/messenger/email.yaml b/templates/definition/messenger/email.yaml index aca3a6ea3..e576bfd84 100644 --- a/templates/definition/messenger/email.yaml +++ b/templates/definition/messenger/email.yaml @@ -5,7 +5,6 @@ products: de: E-Mail params: - name: host - required: true example: smtp.example.com - name: port required: true diff --git a/templates/definition/messenger/ntfy.yaml b/templates/definition/messenger/ntfy.yaml index 6857e9a38..be545a977 100644 --- a/templates/definition/messenger/ntfy.yaml +++ b/templates/definition/messenger/ntfy.yaml @@ -3,7 +3,6 @@ products: - brand: Ntfy params: - name: host - required: true example: ntfy.sh default: ntfy.sh - name: topics @@ -30,9 +29,6 @@ params: type: choice choice: ["max", "high", "default", "low", "min"] default: default - description: - de: Priorität - en: Priority help: de: > Nachrichten haben eine Prioritätsstufe, die bestimmt, wie dringend dein Telefon dich benachrichtigt. diff --git a/templates/definition/messenger/shoutrrr.yaml b/templates/definition/messenger/shoutrrr.yaml index 4a7f8364b..bc611e9c0 100644 --- a/templates/definition/messenger/shoutrrr.yaml +++ b/templates/definition/messenger/shoutrrr.yaml @@ -10,7 +10,6 @@ params: - name: uri required: true example: gotify://gotify.example.com:443/secr3t/?priority=1 - private: true help: en: See [shoutrrr.nickfedor.com](https://shoutrrr.nickfedor.com/latest/usage/) for possible formats. de: Übersicht unter [shoutrrr.nickfedor.com](https://shoutrrr.nickfedor.com/latest/usage/) für mögliche Formate. diff --git a/templates/definition/messenger/telegram.yaml b/templates/definition/messenger/telegram.yaml index 498724111..bf2527e93 100644 --- a/templates/definition/messenger/telegram.yaml +++ b/templates/definition/messenger/telegram.yaml @@ -6,7 +6,6 @@ requirements: params: - name: token required: true - mask: true example: 123456:ABC-DEF1234ghIkl-zyx57W2v1u123ew11 description: de: Token diff --git a/templates/definition/meter/atmoce.yaml b/templates/definition/meter/atmoce.yaml index 766dcbfe9..ab378b39b 100644 --- a/templates/definition/meter/atmoce.yaml +++ b/templates/definition/meter/atmoce.yaml @@ -17,7 +17,6 @@ params: choice: ["tcpip"] id: 1 - name: maxacpower - advanced: true - preset: battery-params - name: capacity service: modbus/read?address=60031&type=holding&encoding=uint32&scale=0.001&resulttype=int&{modbus} diff --git a/templates/definition/meter/cozify.yaml b/templates/definition/meter/cozify.yaml index 321f0d7c9..89424ebea 100644 --- a/templates/definition/meter/cozify.yaml +++ b/templates/definition/meter/cozify.yaml @@ -11,9 +11,7 @@ params: - name: usage choice: ["grid"] - name: host - required: true - name: cache - advanced: true default: 5s render: | type: custom diff --git a/templates/definition/meter/demo-battery.yaml b/templates/definition/meter/demo-battery.yaml index 84f642df2..62b3ad8a8 100644 --- a/templates/definition/meter/demo-battery.yaml +++ b/templates/definition/meter/demo-battery.yaml @@ -40,9 +40,7 @@ params: - name: maxsoc advanced: true - name: maxchargepower - advanced: true - name: maxdischargepower - advanced: true - name: energy description: de: Zählerstand diff --git a/templates/definition/meter/ecoflow-powerocean.yaml b/templates/definition/meter/ecoflow-powerocean.yaml index 5468e9f74..166cbde48 100644 --- a/templates/definition/meter/ecoflow-powerocean.yaml +++ b/templates/definition/meter/ecoflow-powerocean.yaml @@ -51,7 +51,6 @@ params: de: 'Manche Nutzer, z.B. mit Starlink-Internet, sehen gelegentlich in den Logs den "error code 8513". Das passiert, wenn die API Region nicht korrekt erkannt wird. Um das zu beheben, kann man die API Region manuell setzen. Mögliche Werte: auto (Standard), europe oder america.' - name: cache default: 30s - advanced: true - preset: battery-params render: | type: ecoflow diff --git a/templates/definition/meter/ecoflow-stream.yaml b/templates/definition/meter/ecoflow-stream.yaml index 95040b692..d118e008a 100644 --- a/templates/definition/meter/ecoflow-stream.yaml +++ b/templates/definition/meter/ecoflow-stream.yaml @@ -52,7 +52,6 @@ params: de: 'Manche Nutzer, z.B. mit Starlink-Internet, sehen gelegentlich in den Logs den "error code 8513". Das passiert, wenn die API Region nicht korrekt erkannt wird. Um das zu beheben, kann man die API Region manuell setzen. Mögliche Werte: auto (Standard), europe oder america.' - name: cache default: 30s - advanced: true - preset: battery-params render: | type: ecoflow diff --git a/templates/definition/meter/enphase.yaml b/templates/definition/meter/enphase.yaml index 913e78435..b4b72d188 100644 --- a/templates/definition/meter/enphase.yaml +++ b/templates/definition/meter/enphase.yaml @@ -9,7 +9,6 @@ params: choice: ["grid", "pv", "battery"] - name: host - name: schema - default: https advanced: true - name: token help: @@ -28,7 +27,6 @@ params: usages: ["battery"] - preset: battery-params - name: cache - advanced: true default: 1s - name: timeout advanced: true diff --git a/templates/definition/meter/esphome-dlms-austria.yaml b/templates/definition/meter/esphome-dlms-austria.yaml index 9318d59a2..a03411523 100644 --- a/templates/definition/meter/esphome-dlms-austria.yaml +++ b/templates/definition/meter/esphome-dlms-austria.yaml @@ -15,7 +15,6 @@ params: - name: usage choice: ["grid"] - name: host - required: true - name: timeout default: 10s advanced: true diff --git a/templates/definition/meter/fritzdect.yaml b/templates/definition/meter/fritzdect.yaml index 1a659d54f..4dd7cdbb9 100644 --- a/templates/definition/meter/fritzdect.yaml +++ b/templates/definition/meter/fritzdect.yaml @@ -26,7 +26,6 @@ params: - name: password required: true - name: ain - required: true service: fritz/devices?uri={uri}&user={user}&password={password} - name: firmware82 advanced: true diff --git a/templates/definition/meter/fritzgrid.yaml b/templates/definition/meter/fritzgrid.yaml index 604b50e2c..c0219f546 100644 --- a/templates/definition/meter/fritzgrid.yaml +++ b/templates/definition/meter/fritzgrid.yaml @@ -13,7 +13,6 @@ params: - name: password required: true - name: ain - required: true service: fritz/devices?uri={uri}&user={user}&password={password} - name: unit advanced: true diff --git a/templates/definition/meter/fronius-gen24.yaml b/templates/definition/meter/fronius-gen24.yaml index 250e78e27..23a167a86 100644 --- a/templates/definition/meter/fronius-gen24.yaml +++ b/templates/definition/meter/fronius-gen24.yaml @@ -33,7 +33,6 @@ params: - name: maxacpower - preset: battery-params - name: maxchargerate - advanced: true render: | type: custom # sunspec model 20x (int+sf)/ 21x (float) meter diff --git a/templates/definition/meter/fronius-vertoplus.yaml b/templates/definition/meter/fronius-vertoplus.yaml index 26e348ea9..f86779f32 100644 --- a/templates/definition/meter/fronius-vertoplus.yaml +++ b/templates/definition/meter/fronius-vertoplus.yaml @@ -19,7 +19,6 @@ params: usages: ["grid"] - name: maxacpower - name: maxchargerate - advanced: true - preset: battery-params render: | type: custom diff --git a/templates/definition/meter/homematic.yaml b/templates/definition/meter/homematic.yaml index 80d0dd9e6..a78d75f09 100644 --- a/templates/definition/meter/homematic.yaml +++ b/templates/definition/meter/homematic.yaml @@ -30,7 +30,6 @@ params: de: Kanalnummer des Messwertkanals, wie im CCU Webfrontend mit Doppelpunkt getrennt nach der Geräte Id angezeigt. example: HMIP-PSM=6, HMIP-FSM+HMIP-FSM16=5, HM-ES-TX-WM=1 - name: cache - advanced: true default: 1s description: en: XML-RPC API cache duration diff --git a/templates/definition/meter/hoymiles-dtu-mb.yaml b/templates/definition/meter/hoymiles-dtu-mb.yaml index 0e2165b5c..e90744379 100644 --- a/templates/definition/meter/hoymiles-dtu-mb.yaml +++ b/templates/definition/meter/hoymiles-dtu-mb.yaml @@ -16,7 +16,6 @@ params: - name: modbus choice: ["tcpip"] - name: maxacpower - advanced: true default: "0" description: de: "Gesamtleistung der Wechselrichter" diff --git a/templates/definition/meter/iammeter-1p.yaml b/templates/definition/meter/iammeter-1p.yaml index 324b30310..a8f582faf 100644 --- a/templates/definition/meter/iammeter-1p.yaml +++ b/templates/definition/meter/iammeter-1p.yaml @@ -8,7 +8,6 @@ params: choice: ["grid", "pv", "charge"] - name: host - name: cache - advanced: true default: 2s render: | type: custom diff --git a/templates/definition/meter/iammeter-2p.yaml b/templates/definition/meter/iammeter-2p.yaml index b56ef6b41..519aa871f 100644 --- a/templates/definition/meter/iammeter-2p.yaml +++ b/templates/definition/meter/iammeter-2p.yaml @@ -8,14 +8,12 @@ params: choice: ["grid", "pv", "charge"] - name: host - name: channel - type: int default: 1 required: true description: de: Messkanal (1-2) en: Meter channel (1-2) - name: cache - advanced: true default: 2s render: | type: custom diff --git a/templates/definition/meter/iammeter-3p.yaml b/templates/definition/meter/iammeter-3p.yaml index 693e1d97f..0fc8032bb 100644 --- a/templates/definition/meter/iammeter-3p.yaml +++ b/templates/definition/meter/iammeter-3p.yaml @@ -20,7 +20,6 @@ params: choice: ["grid", "pv", "charge"] - name: host - name: cache - advanced: true default: 2s render: | type: custom diff --git a/templates/definition/meter/indevolt-battery.yaml b/templates/definition/meter/indevolt-battery.yaml index b61bc04ce..7a981d085 100644 --- a/templates/definition/meter/indevolt-battery.yaml +++ b/templates/definition/meter/indevolt-battery.yaml @@ -38,7 +38,6 @@ params: advanced: true - name: password advanced: true - mask: true - name: cache default: 5s - preset: battery-params diff --git a/templates/definition/meter/indevolt-hybrid.yaml b/templates/definition/meter/indevolt-hybrid.yaml index 3b9e5319f..f3f7b1271 100644 --- a/templates/definition/meter/indevolt-hybrid.yaml +++ b/templates/definition/meter/indevolt-hybrid.yaml @@ -44,7 +44,6 @@ params: advanced: true - name: password advanced: true - mask: true - name: cache default: 5s - preset: battery-params diff --git a/templates/definition/meter/iotawatt.yaml b/templates/definition/meter/iotawatt.yaml index 226fcf820..c28ec80de 100644 --- a/templates/definition/meter/iotawatt.yaml +++ b/templates/definition/meter/iotawatt.yaml @@ -46,7 +46,6 @@ params: de: "Serienname für Phase L3. Für einphasig leer lassen." - name: cache default: 2s - advanced: true render: | type: custom {{- if and .seriesL2 .seriesL3 }} diff --git a/templates/definition/meter/kaco-blueplanet.yaml b/templates/definition/meter/kaco-blueplanet.yaml index 86a09190b..d0a1cde00 100644 --- a/templates/definition/meter/kaco-blueplanet.yaml +++ b/templates/definition/meter/kaco-blueplanet.yaml @@ -2,7 +2,6 @@ params: - name: usage choice: ["pv"] - name: host - required: true - name: serial required: true example: 8.0NX312001234 diff --git a/templates/definition/meter/kostal-plenticore-gen2.yaml b/templates/definition/meter/kostal-plenticore-gen2.yaml index 5137afefc..e3b7b1bc1 100644 --- a/templates/definition/meter/kostal-plenticore-gen2.yaml +++ b/templates/definition/meter/kostal-plenticore-gen2.yaml @@ -47,9 +47,7 @@ params: - name: maxchargerate deprecated: true - name: watchdog - type: duration default: 60s - advanced: true render: | {{- if eq .usage "pv" }} type: custom diff --git a/templates/definition/meter/kostal-plenticore.yaml b/templates/definition/meter/kostal-plenticore.yaml index 80303ce83..92da42597 100644 --- a/templates/definition/meter/kostal-plenticore.yaml +++ b/templates/definition/meter/kostal-plenticore.yaml @@ -41,9 +41,7 @@ params: - name: maxdischargepower service: modbus/read?address=1040&type=holding&encoding=float32s&resulttype=int&{modbus} - name: watchdog - type: duration default: 60s - advanced: true render: | {{- if eq .usage "pv" }} type: custom diff --git a/templates/definition/meter/openems-modbus.yaml b/templates/definition/meter/openems-modbus.yaml index acafb4011..6b1a79b39 100644 --- a/templates/definition/meter/openems-modbus.yaml +++ b/templates/definition/meter/openems-modbus.yaml @@ -115,13 +115,11 @@ params: en: active battery control (Modbus/TCP Write Access) usages: ["battery"] - name: watchdog - type: duration default: 60s description: de: Batteriesteuerung API-Timeout en: battery control API timeout usages: ["battery"] - advanced: true - preset: battery-params render: | type: custom diff --git a/templates/definition/meter/openems.yaml b/templates/definition/meter/openems.yaml index 1bda8d6f1..4e7c11963 100644 --- a/templates/definition/meter/openems.yaml +++ b/templates/definition/meter/openems.yaml @@ -46,7 +46,6 @@ params: usages: ["battery"] advanced: true - name: watchdog - type: duration default: 60s description: de: FEMS/OpenEMS Batteriesteuerung API-Timeout @@ -55,7 +54,6 @@ params: de: FEMS/OpenEMS Standard 60s en: FEMS/OpenEMS standard 60s usages: ["battery"] - advanced: true - preset: battery-params render: | type: custom diff --git a/templates/definition/meter/pstryk.yaml b/templates/definition/meter/pstryk.yaml index 0b460bf9f..03ee95288 100644 --- a/templates/definition/meter/pstryk.yaml +++ b/templates/definition/meter/pstryk.yaml @@ -9,7 +9,6 @@ params: choice: ["grid"] - name: host - name: cache - advanced: true default: 1s render: | diff --git a/templates/definition/meter/rct-power.yaml b/templates/definition/meter/rct-power.yaml index ebf736681..1ac67b271 100644 --- a/templates/definition/meter/rct-power.yaml +++ b/templates/definition/meter/rct-power.yaml @@ -37,7 +37,6 @@ params: type: float usages: ["battery"] - name: cache - advanced: true default: 30s render: | type: rct diff --git a/templates/definition/meter/saj-h2.yaml b/templates/definition/meter/saj-h2.yaml index 20866568b..c72c72ab4 100644 --- a/templates/definition/meter/saj-h2.yaml +++ b/templates/definition/meter/saj-h2.yaml @@ -16,9 +16,7 @@ params: - preset: battery-params # battery control - name: defaultmode - usages: ["battery"] default: 2 - advanced: true render: | type: custom {{- if eq .usage "grid" }} diff --git a/templates/definition/meter/sax.yaml b/templates/definition/meter/sax.yaml index 362eb10cb..db776159c 100644 --- a/templates/definition/meter/sax.yaml +++ b/templates/definition/meter/sax.yaml @@ -19,9 +19,7 @@ params: id: 64 - preset: battery-params - name: watchdog - type: duration default: 240s - advanced: true render: | type: custom {{- if eq .usage "grid" }} diff --git a/templates/definition/meter/sma-hybrid.yaml b/templates/definition/meter/sma-hybrid.yaml index 85f39e129..4dd47c215 100644 --- a/templates/definition/meter/sma-hybrid.yaml +++ b/templates/definition/meter/sma-hybrid.yaml @@ -26,9 +26,7 @@ params: - name: maxdischargepower default: 4200 - name: watchdog - type: duration default: 60s - advanced: true usages: ["battery"] - name: chargepower deprecated: true diff --git a/templates/definition/meter/sma-sbs-15-25-modbus.yaml b/templates/definition/meter/sma-sbs-15-25-modbus.yaml index b7946dca8..1b490ecee 100644 --- a/templates/definition/meter/sma-sbs-15-25-modbus.yaml +++ b/templates/definition/meter/sma-sbs-15-25-modbus.yaml @@ -19,9 +19,7 @@ params: default: 4200 required: true - name: watchdog - type: duration default: 60s - advanced: true - name: chargepower deprecated: true render: | diff --git a/templates/definition/meter/sma-sbs-modbus.yaml b/templates/definition/meter/sma-sbs-modbus.yaml index b8f4acb2e..805380636 100644 --- a/templates/definition/meter/sma-sbs-modbus.yaml +++ b/templates/definition/meter/sma-sbs-modbus.yaml @@ -19,9 +19,7 @@ params: default: 4200 required: true - name: watchdog - type: duration default: 60s - advanced: true - name: chargepower deprecated: true render: | diff --git a/templates/definition/meter/sma-si-modbus.yaml b/templates/definition/meter/sma-si-modbus.yaml index fa9f91bf5..4977296a7 100644 --- a/templates/definition/meter/sma-si-modbus.yaml +++ b/templates/definition/meter/sma-si-modbus.yaml @@ -19,9 +19,7 @@ params: default: 4200 required: true - name: watchdog - type: duration default: 60s - advanced: true - name: chargepower deprecated: true render: | diff --git a/templates/definition/meter/smartfox-em2.yaml b/templates/definition/meter/smartfox-em2.yaml index c9999c1fa..f0c0342ed 100644 --- a/templates/definition/meter/smartfox-em2.yaml +++ b/templates/definition/meter/smartfox-em2.yaml @@ -26,7 +26,6 @@ params: choice: ["grid", "pv", "aux"] - name: host - name: cache - advanced: true default: 1s render: | {{- define "uri" -}} diff --git a/templates/definition/meter/sofarsolar-g3.yaml b/templates/definition/meter/sofarsolar-g3.yaml index 33d444ec9..03b650e7c 100644 --- a/templates/definition/meter/sofarsolar-g3.yaml +++ b/templates/definition/meter/sofarsolar-g3.yaml @@ -36,7 +36,6 @@ params: de: Gültige Werte sind 0 (Eigenbedarfsmodus), 1 (Nutzungszeitmodus), 2 (Zeitmodus), 4 (Peak-shaving Modus) en: Valid values are 0 (self use), 1 (time of use), 2 (timing mode), 4 (peak-shaving mode) default: 0 # self use - advanced: true - name: externalpower type: bool description: diff --git a/templates/definition/meter/solaredge-hybrid.yaml b/templates/definition/meter/solaredge-hybrid.yaml index 541464109..a60fb2364 100644 --- a/templates/definition/meter/solaredge-hybrid.yaml +++ b/templates/definition/meter/solaredge-hybrid.yaml @@ -24,9 +24,7 @@ params: - name: maxdischargepower default: 5000 - name: watchdog - type: duration default: 60s - advanced: true - name: timeout deprecated: true render: | diff --git a/templates/definition/meter/solarmax-maxstorage.yaml b/templates/definition/meter/solarmax-maxstorage.yaml index 5b332fade..3f8acc4bc 100644 --- a/templates/definition/meter/solarmax-maxstorage.yaml +++ b/templates/definition/meter/solarmax-maxstorage.yaml @@ -18,9 +18,7 @@ params: - preset: battery-params # battery control - name: watchdog - type: duration default: 60s - advanced: true render: | type: custom {{- if eq .usage "grid" }} diff --git a/templates/definition/meter/solax.yaml b/templates/definition/meter/solax.yaml index 9728d69a7..f83a69067 100644 --- a/templates/definition/meter/solax.yaml +++ b/templates/definition/meter/solax.yaml @@ -28,7 +28,6 @@ params: - preset: battery-params - name: defaultmode default: 0 # "SelfUse" - advanced: true render: | type: custom {{- if eq .usage "grid" }} diff --git a/templates/definition/meter/sonnenbatterie.yaml b/templates/definition/meter/sonnenbatterie.yaml index ca0f22a00..29b57f497 100644 --- a/templates/definition/meter/sonnenbatterie.yaml +++ b/templates/definition/meter/sonnenbatterie.yaml @@ -34,8 +34,6 @@ params: choice: ["self-consumption", "time-of-use"] default: self-consumption required: true - advanced: true - usages: ["battery"] - name: chargepower deprecated: true render: | diff --git a/templates/definition/meter/sonnenbatterie_eco56.yaml b/templates/definition/meter/sonnenbatterie_eco56.yaml index 03033abd4..12ec00659 100644 --- a/templates/definition/meter/sonnenbatterie_eco56.yaml +++ b/templates/definition/meter/sonnenbatterie_eco56.yaml @@ -20,7 +20,6 @@ params: default: 7979 - preset: battery-params - name: cache - advanced: true default: 5s render: | type: custom diff --git a/templates/definition/meter/sunspec-inverter-control.yaml b/templates/definition/meter/sunspec-inverter-control.yaml index 3615b35e4..5238bd443 100644 --- a/templates/definition/meter/sunspec-inverter-control.yaml +++ b/templates/definition/meter/sunspec-inverter-control.yaml @@ -11,7 +11,6 @@ params: - name: modbus choice: ["tcpip", "rs485"] - name: maxchargerate - advanced: true - preset: battery-params render: | {{- if eq .usage "battery" }} diff --git a/templates/definition/meter/tasmota.yaml b/templates/definition/meter/tasmota.yaml index 247fa31d8..23eba50ad 100644 --- a/templates/definition/meter/tasmota.yaml +++ b/templates/definition/meter/tasmota.yaml @@ -14,7 +14,6 @@ params: en: admin is default - name: password - name: channel - type: int default: 1 required: true description: diff --git a/templates/definition/meter/tesla-powerwall.yaml b/templates/definition/meter/tesla-powerwall.yaml index 1e7f5430e..cddf39003 100644 --- a/templates/definition/meter/tesla-powerwall.yaml +++ b/templates/definition/meter/tesla-powerwall.yaml @@ -37,10 +37,8 @@ params: en: optional product identifier of the energy site, use to override autodectction de: optionale Product ID dieser Energy Site, zum Übersteuern der automatischen Erkennung - name: minsoc - type: int advanced: true - name: maxsoc - type: int advanced: true - name: maxchargepower - name: maxdischargepower diff --git a/templates/definition/meter/varta.yaml b/templates/definition/meter/varta.yaml index c010a49f7..fa24dadec 100644 --- a/templates/definition/meter/varta.yaml +++ b/templates/definition/meter/varta.yaml @@ -27,10 +27,8 @@ params: - name: maxdischargepower default: 4000 - name: watchdog - type: duration default: 120s usages: ["battery"] - advanced: true render: | type: custom power: diff --git a/templates/definition/meter/victron-vrm.yaml b/templates/definition/meter/victron-vrm.yaml index 34e9df479..072a3eb8d 100644 --- a/templates/definition/meter/victron-vrm.yaml +++ b/templates/definition/meter/victron-vrm.yaml @@ -15,7 +15,6 @@ params: choice: ["battery"] - name: token required: true - mask: true description: de: VRM Token en: VRM token diff --git a/templates/definition/meter/vzlogger.yaml b/templates/definition/meter/vzlogger.yaml index 97c7ae32e..e31e9ef40 100644 --- a/templates/definition/meter/vzlogger.yaml +++ b/templates/definition/meter/vzlogger.yaml @@ -121,7 +121,6 @@ params: de: Die vzlogger Kanal uuid für Spannung in Phase 3 (OBIS Code 72.7.0) en: The vzlogger channel uuid for voltage on phase 3 (OBIS Code 72.7.0) - name: cache - advanced: true default: 1s render: | type: custom diff --git a/templates/definition/meter/zendure-solarflow-ac.yaml b/templates/definition/meter/zendure-solarflow-ac.yaml index e77289504..a74a0ed49 100644 --- a/templates/definition/meter/zendure-solarflow-ac.yaml +++ b/templates/definition/meter/zendure-solarflow-ac.yaml @@ -8,10 +8,8 @@ params: - name: usage choice: ["battery"] - name: host - required: true - preset: battery-params - name: cache - advanced: true default: 1s render: | type: custom diff --git a/templates/definition/meter/zendure-solarflow-pro.yaml b/templates/definition/meter/zendure-solarflow-pro.yaml index e2b73d783..3e39981db 100644 --- a/templates/definition/meter/zendure-solarflow-pro.yaml +++ b/templates/definition/meter/zendure-solarflow-pro.yaml @@ -13,7 +13,6 @@ params: - name: capacity default: 1.92 # kWh - name: cache - advanced: true default: 1s render: | type: custom diff --git a/templates/definition/tariff/energypriceforecast.yaml b/templates/definition/tariff/energypriceforecast.yaml index 5c9581588..0c814a001 100644 --- a/templates/definition/tariff/energypriceforecast.yaml +++ b/templates/definition/tariff/energypriceforecast.yaml @@ -17,13 +17,7 @@ params: choice: ["DE", "NL", "BE", "DK1", "DK2", "FR"] required: true - name: currency - default: EUR - type: choice - description: - en: Currency - de: Währung choice: ["EUR", "DKK"] - required: true - name: horizon default: 120 type: int diff --git a/templates/definition/tariff/esios.yaml b/templates/definition/tariff/esios.yaml index d093c4429..d8d99b8f6 100644 --- a/templates/definition/tariff/esios.yaml +++ b/templates/definition/tariff/esios.yaml @@ -25,8 +25,6 @@ params: choice: [1001, 1739] required: true - name: region - description: - generic: "Region" example: Península type: choice choice: ["Península", "Canarias", "Baleares", "Ceuta", "Melilla"] diff --git a/templates/definition/tariff/ews.yaml b/templates/definition/tariff/ews.yaml index 86b0cca18..d52bb7459 100644 --- a/templates/definition/tariff/ews.yaml +++ b/templates/definition/tariff/ews.yaml @@ -14,7 +14,6 @@ params: - name: apiKey type: string required: true - mask: true example: pub_dpa_8476c477d8a039529478ebd690d35ddd80e3308ffc render: | type: custom diff --git a/templates/definition/tariff/green-grid-compass.yaml b/templates/definition/tariff/green-grid-compass.yaml index 14d4fd89d..7233a2c2b 100644 --- a/templates/definition/tariff/green-grid-compass.yaml +++ b/templates/definition/tariff/green-grid-compass.yaml @@ -18,9 +18,7 @@ params: - name: apiKey deprecated: true - name: clientid - required: true - name: clientsecret - required: true - name: zone description: de: Zonencode diff --git a/templates/definition/tariff/nordpool.yaml b/templates/definition/tariff/nordpool.yaml index 33c3eaef2..470798c4a 100644 --- a/templates/definition/tariff/nordpool.yaml +++ b/templates/definition/tariff/nordpool.yaml @@ -41,13 +41,7 @@ params: "SYS", ] - name: currency - default: EUR - type: choice - description: - en: Currency - de: Währung choice: ["DKK", "EUR", "NOK", "PLN", "RON", "SEK"] - required: true - preset: tariff-base render: | type: custom diff --git a/templates/definition/tariff/octopus-de.yaml b/templates/definition/tariff/octopus-de.yaml index 04d661f9b..10eb1a308 100644 --- a/templates/definition/tariff/octopus-de.yaml +++ b/templates/definition/tariff/octopus-de.yaml @@ -22,11 +22,7 @@ params: - name: password type: string required: true - mask: true example: "secret" - description: - en: Password - de: Passwort help: de: "Das Passwort Ihres Octopus Energy Kontos." en: "The password of your Octopus Energy account." diff --git a/templates/definition/tariff/ostrom.yaml b/templates/definition/tariff/ostrom.yaml index 043fe00ec..94ef059cc 100644 --- a/templates/definition/tariff/ostrom.yaml +++ b/templates/definition/tariff/ostrom.yaml @@ -11,10 +11,8 @@ countries: ["DE"] params: - name: clientid example: 476c477d8a039529478ebd690d35ddd80e3308ffc49b59c65b142321aee963a4 - required: true - name: clientsecret example: 476c477d8a039529478ebd690d35ddd80e3308ffc49b59c65b142321aee963a4476c477d8a039529478ebd690d35ddd80e3308ffc49b59c65b142321aee963a4a - required: true - name: contract example: 100523456 description: diff --git a/templates/definition/tariff/stroomprijsprognose.yaml b/templates/definition/tariff/stroomprijsprognose.yaml index 82eb373ea..0ecc96b0d 100644 --- a/templates/definition/tariff/stroomprijsprognose.yaml +++ b/templates/definition/tariff/stroomprijsprognose.yaml @@ -16,13 +16,7 @@ params: choice: ["DE", "NL", "BE", "DK1", "DK2", "FR"] required: true - name: currency - default: EUR - type: choice - description: - en: Currency - de: Währung choice: ["EUR", "DKK"] - required: true - name: horizon default: 120 type: int diff --git a/templates/definition/vehicle/cardata.yaml b/templates/definition/vehicle/cardata.yaml index e025862c0..5c0b99071 100644 --- a/templates/definition/vehicle/cardata.yaml +++ b/templates/definition/vehicle/cardata.yaml @@ -57,7 +57,6 @@ params: required: true example: WBMW... - name: clientid - required: true - preset: vehicle-features - name: streaming help: diff --git a/templates/definition/vehicle/citroen.yaml b/templates/definition/vehicle/citroen.yaml index 94246c6d9..133dba01a 100644 --- a/templates/definition/vehicle/citroen.yaml +++ b/templates/definition/vehicle/citroen.yaml @@ -16,10 +16,8 @@ params: deprecated: true - name: accessToken required: true - mask: true - name: refreshToken required: true - mask: true - name: vin example: V... - name: cache diff --git a/templates/definition/vehicle/ds.yaml b/templates/definition/vehicle/ds.yaml index deef87971..978ddb97e 100644 --- a/templates/definition/vehicle/ds.yaml +++ b/templates/definition/vehicle/ds.yaml @@ -16,10 +16,8 @@ params: deprecated: true - name: accessToken required: true - mask: true - name: refreshToken required: true - mask: true - name: vin example: V... - name: cache diff --git a/templates/definition/vehicle/ford-connect-query.yaml b/templates/definition/vehicle/ford-connect-query.yaml index e327e7af6..ba35907d3 100644 --- a/templates/definition/vehicle/ford-connect-query.yaml +++ b/templates/definition/vehicle/ford-connect-query.yaml @@ -12,14 +12,12 @@ params: help: de: Einrichtung unter [developer.ford.com](https://developer.ford.com/developer-eu) en: Setup at [developer.ford.com](https://developer.ford.com/developer-eu) - required: true - name: clientsecret description: generic: FordConnect Query Client Secret help: de: Einrichtung unter [developer.ford.com](https://developer.ford.com/developer-eu) en: Setup at [developer.ford.com](https://developer.ford.com/developer-eu) - required: true - name: redirecturi description: generic: FordConnect Query Redirect URL @@ -27,7 +25,6 @@ params: de: Einrichtung unter [developer.ford.com](https://developer.ford.com/developer-eu) en: Setup at [developer.ford.com](https://developer.ford.com/developer-eu) service: auth/redirecturi - required: true - name: vin example: WF0FXX... - name: cache diff --git a/templates/definition/vehicle/ford-connect.yaml b/templates/definition/vehicle/ford-connect.yaml index 38c187152..31100c56f 100644 --- a/templates/definition/vehicle/ford-connect.yaml +++ b/templates/definition/vehicle/ford-connect.yaml @@ -13,20 +13,16 @@ params: help: de: Einrichtung unter [developer.ford.com](https://developer.ford.com) en: Setup at [developer.ford.com](https://developer.ford.com) - required: true - name: clientsecret description: generic: FordConnect API Client Secret help: de: Einrichtung unter [developer.ford.com](https://developer.ford.com) en: Setup at [developer.ford.com](https://developer.ford.com) - required: true - name: accessToken required: true - mask: true - name: refreshToken required: true - mask: true - name: vin example: WF0FXX... - name: cache diff --git a/templates/definition/vehicle/mercedes.yaml b/templates/definition/vehicle/mercedes.yaml index fc2ea3387..f90cce437 100644 --- a/templates/definition/vehicle/mercedes.yaml +++ b/templates/definition/vehicle/mercedes.yaml @@ -19,10 +19,8 @@ params: default: EMEA - name: accessToken required: true - mask: true - name: refreshToken required: true - mask: true - name: vin example: V... - name: cache diff --git a/templates/definition/vehicle/offline.yaml b/templates/definition/vehicle/offline.yaml index d7d63056c..fb3c1e898 100644 --- a/templates/definition/vehicle/offline.yaml +++ b/templates/definition/vehicle/offline.yaml @@ -13,7 +13,6 @@ params: - name: coarsecurrent advanced: true - name: welcomecharge - advanced: true render: | type: custom {{- include "vehicle-common" . }} diff --git a/templates/definition/vehicle/opel.yaml b/templates/definition/vehicle/opel.yaml index 82e7fe842..48eaa1059 100644 --- a/templates/definition/vehicle/opel.yaml +++ b/templates/definition/vehicle/opel.yaml @@ -16,10 +16,8 @@ params: deprecated: true - name: accessToken required: true - mask: true - name: refreshToken required: true - mask: true - name: vin example: V... - name: cache diff --git a/templates/definition/vehicle/peugeot.yaml b/templates/definition/vehicle/peugeot.yaml index cdc420576..403e93db4 100644 --- a/templates/definition/vehicle/peugeot.yaml +++ b/templates/definition/vehicle/peugeot.yaml @@ -16,10 +16,8 @@ params: deprecated: true - name: accessToken required: true - mask: true - name: refreshToken required: true - mask: true - name: vin example: V... - name: cache diff --git a/templates/definition/vehicle/smart.yaml b/templates/definition/vehicle/smart.yaml index 67f512a6a..b1df16b01 100644 --- a/templates/definition/vehicle/smart.yaml +++ b/templates/definition/vehicle/smart.yaml @@ -21,10 +21,8 @@ params: default: EMEA - name: accessToken required: true - mask: true - name: refreshToken required: true - mask: true - name: vin example: V... - name: cache diff --git a/templates/definition/vehicle/tesla-ble.yaml b/templates/definition/vehicle/tesla-ble.yaml index 2a355ebc7..a075461ff 100644 --- a/templates/definition/vehicle/tesla-ble.yaml +++ b/templates/definition/vehicle/tesla-ble.yaml @@ -12,7 +12,6 @@ params: - preset: vehicle-climater - name: vin required: true - example: W... help: de: Erforderlich für BLE-Verbindung en: Required for BLE connection diff --git a/templates/definition/vehicle/tesla.yaml b/templates/definition/vehicle/tesla.yaml index 1da3eae0a..9a2be0df0 100644 --- a/templates/definition/vehicle/tesla.yaml +++ b/templates/definition/vehicle/tesla.yaml @@ -39,26 +39,20 @@ params: - preset: vehicle-common - preset: vehicle-climater - name: clientId - description: - generic: Client ID help: en: from [developer.tesla.com](https://developer.tesla.com/dashboard). de: von [developer.tesla.com](https://developer.tesla.com/dashboard). - required: true - name: accessToken help: en: from [myteslamate.com](https://app.myteslamate.com/). de: von [myteslamate.com](https://app.myteslamate.com/). required: true - mask: true - name: refreshToken help: en: from [myteslamate.com](https://app.myteslamate.com/). de: von [myteslamate.com](https://app.myteslamate.com/). required: true - mask: true - name: vin - example: W... - name: control description: generic: Control diff --git a/templates/definition/vehicle/tibber.yaml b/templates/definition/vehicle/tibber.yaml index 93496406a..71f782601 100644 --- a/templates/definition/vehicle/tibber.yaml +++ b/templates/definition/vehicle/tibber.yaml @@ -18,14 +18,8 @@ params: - preset: vehicle-common - preset: vehicle-climater - name: clientid - required: true - name: clientsecret - required: true - mask: true - name: redirecturi - required: true - description: - generic: Redirect URI help: en: "Redirect URI of the evcc instance. Must match the redirect URI set in the Tibber Data API client." de: "Redirect-URI der evcc-Instanz. Muss mit der im Tibber Data API Client hinterlegten Redirect URI übereinstimmen." diff --git a/templates/definition/vehicle/tronity.yaml b/templates/definition/vehicle/tronity.yaml index 2250a6960..3ea321788 100644 --- a/templates/definition/vehicle/tronity.yaml +++ b/templates/definition/vehicle/tronity.yaml @@ -14,16 +14,13 @@ params: help: de: Einrichtung unter [app.tronity.tech](https://app.tronity.tech) en: Setup at [app.tronity.tech](https://app.tronity.tech) - required: true - name: clientsecret description: generic: Tronity API Client Secret help: de: Einrichtung unter [app.tronity.tech](https://app.tronity.tech) en: Setup at [app.tronity.tech](https://app.tronity.tech) - required: true - name: vin - example: W... - name: cache default: 15m render: | diff --git a/templates/definition/vehicle/volvo-connected.yaml b/templates/definition/vehicle/volvo-connected.yaml index ce501ad28..1b24e73e3 100644 --- a/templates/definition/vehicle/volvo-connected.yaml +++ b/templates/definition/vehicle/volvo-connected.yaml @@ -35,19 +35,14 @@ params: en: "from [Volvo Developer App](https://developer.volvocars.com/)." de: "aus [Volvo Developer App](https://developer.volvocars.com/)." - name: clientId - required: true help: en: "from [Volvo Developer App](https://developer.volvocars.com/)." de: "aus [Volvo Developer App](https://developer.volvocars.com/)." - name: clientSecret - required: true help: en: "from [Volvo Developer App](https://developer.volvocars.com/)." de: "aus [Volvo Developer App](https://developer.volvocars.com/)." - name: redirectUri - required: true - description: - generic: Redirect URI help: en: "Redirect URI of your evcc instance. Must match the redirect URI set in your Volvo Developer App." de: "Redirect-URI deiner evcc-Instanz. Muss mit der Redirect-URI übereinstimmen, die in deiner Volvo Developer App festgelegt ist." diff --git a/util/templates/defaults.yaml b/util/templates/defaults.yaml index ef3aa252a..73f3a706a 100644 --- a/util/templates/defaults.yaml +++ b/util/templates/defaults.yaml @@ -99,6 +99,7 @@ params: type: choice choice: ["1", "2", "3"] - name: connector + type: int description: en: Connector number de: Anschlussnummer @@ -287,6 +288,7 @@ params: generic: URL - name: ain private: true + required: true example: "307788992233" description: en: Actor Identification Number (AIN) @@ -312,6 +314,7 @@ params: de: Streaming Datenempfang erfolgt asynchron - name: welcomecharge type: bool + advanced: true description: en: Charge on connection de: Laden bei Verbindung @@ -344,6 +347,7 @@ params: de: Fest angeschlossenes Gerät. Keine Ladevorgänge - name: defaultmode type: int + advanced: true usages: ["battery"] description: de: Standardmodus für die aktive Batteriesteuerung @@ -408,10 +412,12 @@ params: de: Kanal type: int - name: clientid + required: true description: generic: Client ID - name: clientsecret mask: true + required: true description: generic: Client Secret - name: token @@ -432,6 +438,8 @@ params: description: generic: PIN - name: watchdog + type: duration + advanced: true description: generic: Watchdog - name: uuid @@ -512,6 +520,17 @@ params: en: Typical values are 9600, 19200, 38400, 57600, 115200 default: 9600 type: int + - name: currency + type: choice + default: EUR + required: true + description: + en: Currency + de: Währung + - name: redirecturi + required: true + description: + generic: Redirect URI presets: vehicle-base: