From db1d1d074c093e8791a385498d4f0c04a0e4c345 Mon Sep 17 00:00:00 2001 From: andig Date: Mon, 12 Jan 2026 12:20:46 +0100 Subject: [PATCH] Templates: remove unmaintained allinone/linked templates (BC) (#26635) --- .../definition/meter/alpha-ess-smile.yaml | 1 - templates/definition/meter/batterx.yaml | 1 - templates/definition/meter/bosch-bpt.yaml | 1 - .../definition/meter/deye-hybrid-3p.yaml | 1 - .../definition/meter/deye-hybrid-hp3.yaml | 1 - templates/definition/meter/e3dc-modbus.yaml | 1 - templates/definition/meter/e3dc-rscp.yaml | 1 - .../definition/meter/ecoflow-powerocean.yaml | 1 - templates/definition/meter/fronius-gen24.yaml | 1 - .../definition/meter/fronius-solarapi-v1.yaml | 1 - .../definition/meter/fronius-vertoplus.yaml | 1 - templates/definition/meter/goodwe-wifi.yaml | 1 - .../definition/meter/hager-flow-modbus.yaml | 1 - templates/definition/meter/huawei-emma.yaml | 1 - .../definition/meter/huawei-smartlogger.yaml | 1 - .../definition/meter/huawei-sun2000.yaml | 1 - .../definition/meter/kostal-piko-hybrid.yaml | 1 - .../definition/meter/kostal-piko-mp-plus.yaml | 6 ---- .../meter/kostal-plenticore-gen2.yaml | 7 ---- .../definition/meter/kostal-plenticore.yaml | 7 ---- .../definition/meter/lg-ess-home-15.yaml | 1 - .../definition/meter/lg-ess-home-8-10.yaml | 1 - .../definition/meter/openems-modbus.yaml | 1 - templates/definition/meter/openems.yaml | 1 - templates/definition/meter/plexlog.yaml | 1 - templates/definition/meter/powerdog.yaml | 1 - .../definition/meter/qcells-hybrid-cloud.yaml | 1 - templates/definition/meter/rct-power.yaml | 1 - templates/definition/meter/senec-home.yaml | 1 - .../definition/meter/siemens-junelight.yaml | 1 - templates/definition/meter/sigenergy.yaml | 1 - .../definition/meter/sma-datamanager.yaml | 1 - .../definition/meter/sma-homemanager.yaml | 20 ----------- templates/definition/meter/sma-hybrid.yaml | 1 - templates/definition/meter/sma-webbox.yaml | 1 - .../definition/meter/solaredge-hybrid.yaml | 1 - .../definition/meter/solaredge-inverter.yaml | 1 - templates/definition/meter/solarlog.yaml | 1 - .../definition/meter/solarmax-maxstorage.yaml | 1 - .../definition/meter/solarwatt-flex.yaml | 1 - .../meter/solarwatt-myreserve-matrix.yaml | 1 - templates/definition/meter/solarwatt.yaml | 1 - .../definition/meter/solax-hybrid-cloud.yaml | 1 - templates/definition/meter/solax.yaml | 1 - .../definition/meter/solis-hybrid-s.yaml | 1 - templates/definition/meter/solis-hybrid.yaml | 1 - .../definition/meter/sonnenbatterie.yaml | 1 - .../definition/meter/sungrow-hybrid.yaml | 1 - .../definition/meter/sungrow-inverter.yaml | 1 - .../definition/meter/sunspec-hybrid.yaml | 1 - .../definition/meter/tesla-powerwall.yaml | 1 - templates/definition/meter/varta.yaml | 1 - .../definition/meter/victron-energy.yaml | 1 - .../definition/meter/wattsonic-gen3.yaml | 1 - templates/definition/meter/wattsonic.yaml | 1 - util/templates/template.go | 6 ---- util/templates/types.go | 34 ++++++------------- 57 files changed, 10 insertions(+), 121 deletions(-) diff --git a/templates/definition/meter/alpha-ess-smile.yaml b/templates/definition/meter/alpha-ess-smile.yaml index 9117a849f..ce44329d1 100644 --- a/templates/definition/meter/alpha-ess-smile.yaml +++ b/templates/definition/meter/alpha-ess-smile.yaml @@ -13,7 +13,6 @@ requirements: params: - name: usage choice: ["grid", "pv", "battery"] - allinone: true - name: modbus choice: ["rs485", "tcpip"] baudrate: 9600 diff --git a/templates/definition/meter/batterx.yaml b/templates/definition/meter/batterx.yaml index eaea8c5ff..37a6be211 100644 --- a/templates/definition/meter/batterx.yaml +++ b/templates/definition/meter/batterx.yaml @@ -7,7 +7,6 @@ capabilities: ["battery-control"] params: - name: usage choice: ["grid", "pv", "battery"] - allinone: true - name: host - name: port default: 80 diff --git a/templates/definition/meter/bosch-bpt.yaml b/templates/definition/meter/bosch-bpt.yaml index a3fdefe12..3b77178f4 100644 --- a/templates/definition/meter/bosch-bpt.yaml +++ b/templates/definition/meter/bosch-bpt.yaml @@ -10,7 +10,6 @@ requirements: params: - name: usage choice: ["grid", "pv", "battery"] - allinone: true - name: uri - preset: battery-params render: | diff --git a/templates/definition/meter/deye-hybrid-3p.yaml b/templates/definition/meter/deye-hybrid-3p.yaml index 6ef2be65d..179daef24 100644 --- a/templates/definition/meter/deye-hybrid-3p.yaml +++ b/templates/definition/meter/deye-hybrid-3p.yaml @@ -11,7 +11,6 @@ capabilities: ["battery-control"] params: - name: usage choice: ["grid", "pv", "battery"] - allinone: true - name: modbus choice: ["rs485", "tcpip"] baudrate: 9600 diff --git a/templates/definition/meter/deye-hybrid-hp3.yaml b/templates/definition/meter/deye-hybrid-hp3.yaml index 7fdcc279f..ad955861d 100644 --- a/templates/definition/meter/deye-hybrid-hp3.yaml +++ b/templates/definition/meter/deye-hybrid-hp3.yaml @@ -10,7 +10,6 @@ capabilities: ["battery-control"] params: - name: usage choice: ["grid", "pv", "battery"] - allinone: true - name: modbus choice: ["rs485", "tcpip"] baudrate: 9600 diff --git a/templates/definition/meter/e3dc-modbus.yaml b/templates/definition/meter/e3dc-modbus.yaml index c2f22c950..dbf566017 100644 --- a/templates/definition/meter/e3dc-modbus.yaml +++ b/templates/definition/meter/e3dc-modbus.yaml @@ -5,7 +5,6 @@ products: params: - name: usage choice: ["grid", "pv", "battery"] - allinone: true - name: host - name: port default: 502 diff --git a/templates/definition/meter/e3dc-rscp.yaml b/templates/definition/meter/e3dc-rscp.yaml index 5159c9ff5..8163716cc 100644 --- a/templates/definition/meter/e3dc-rscp.yaml +++ b/templates/definition/meter/e3dc-rscp.yaml @@ -15,7 +15,6 @@ requirements: params: - name: usage choice: ["grid", "pv", "battery"] - allinone: true - name: host - name: port default: 5033 diff --git a/templates/definition/meter/ecoflow-powerocean.yaml b/templates/definition/meter/ecoflow-powerocean.yaml index b524cc24c..f697be437 100644 --- a/templates/definition/meter/ecoflow-powerocean.yaml +++ b/templates/definition/meter/ecoflow-powerocean.yaml @@ -22,7 +22,6 @@ requirements: params: - name: usage choice: ["grid", "pv", "battery"] - allinone: true - name: accesskey required: true description: diff --git a/templates/definition/meter/fronius-gen24.yaml b/templates/definition/meter/fronius-gen24.yaml index deb527965..6a97859c1 100644 --- a/templates/definition/meter/fronius-gen24.yaml +++ b/templates/definition/meter/fronius-gen24.yaml @@ -16,7 +16,6 @@ requirements: params: - name: usage choice: ["grid", "pv", "battery"] - allinone: true - name: host - name: port default: 502 diff --git a/templates/definition/meter/fronius-solarapi-v1.yaml b/templates/definition/meter/fronius-solarapi-v1.yaml index 0232717d4..d620889eb 100644 --- a/templates/definition/meter/fronius-solarapi-v1.yaml +++ b/templates/definition/meter/fronius-solarapi-v1.yaml @@ -21,7 +21,6 @@ requirements: params: - name: usage choice: ["grid", "pv", "battery"] - allinone: true - name: host - name: user default: customer diff --git a/templates/definition/meter/fronius-vertoplus.yaml b/templates/definition/meter/fronius-vertoplus.yaml index 2ad36f31c..77cca6b3e 100644 --- a/templates/definition/meter/fronius-vertoplus.yaml +++ b/templates/definition/meter/fronius-vertoplus.yaml @@ -7,7 +7,6 @@ capabilities: ["battery-control"] params: - name: usage choice: ["grid", "pv", "battery"] - allinone: true - name: host - name: port default: 502 diff --git a/templates/definition/meter/goodwe-wifi.yaml b/templates/definition/meter/goodwe-wifi.yaml index 65256ac77..21a063d2d 100644 --- a/templates/definition/meter/goodwe-wifi.yaml +++ b/templates/definition/meter/goodwe-wifi.yaml @@ -10,7 +10,6 @@ requirements: params: - name: usage choice: ["grid", "pv", "battery"] - allinone: true - name: uri description: en: IP address or hostname diff --git a/templates/definition/meter/hager-flow-modbus.yaml b/templates/definition/meter/hager-flow-modbus.yaml index 886bcb165..42ff8a376 100644 --- a/templates/definition/meter/hager-flow-modbus.yaml +++ b/templates/definition/meter/hager-flow-modbus.yaml @@ -19,7 +19,6 @@ requirements: params: - name: usage choice: ["grid", "pv", "battery"] - allinone: true - name: host - name: port default: 502 diff --git a/templates/definition/meter/huawei-emma.yaml b/templates/definition/meter/huawei-emma.yaml index c9171d69b..b4374ee93 100644 --- a/templates/definition/meter/huawei-emma.yaml +++ b/templates/definition/meter/huawei-emma.yaml @@ -6,7 +6,6 @@ products: params: - name: usage choice: ["grid", "pv", "battery"] - allinone: true - name: modbus choice: ["tcpip"] - preset: battery-params diff --git a/templates/definition/meter/huawei-smartlogger.yaml b/templates/definition/meter/huawei-smartlogger.yaml index 5eedae0b1..2b2758915 100644 --- a/templates/definition/meter/huawei-smartlogger.yaml +++ b/templates/definition/meter/huawei-smartlogger.yaml @@ -7,7 +7,6 @@ capabilities: ["battery-control"] params: - name: usage choice: ["grid", "pv", "battery"] - allinone: true - name: storageunit type: int default: 1 diff --git a/templates/definition/meter/huawei-sun2000.yaml b/templates/definition/meter/huawei-sun2000.yaml index d09e98e41..36a5feaa5 100644 --- a/templates/definition/meter/huawei-sun2000.yaml +++ b/templates/definition/meter/huawei-sun2000.yaml @@ -18,7 +18,6 @@ requirements: params: - name: usage choice: ["grid", "pv", "battery"] - allinone: true - name: modbus choice: ["rs485", "tcpip"] - name: timeout diff --git a/templates/definition/meter/kostal-piko-hybrid.yaml b/templates/definition/meter/kostal-piko-hybrid.yaml index d69becf9e..bd34c8882 100644 --- a/templates/definition/meter/kostal-piko-hybrid.yaml +++ b/templates/definition/meter/kostal-piko-hybrid.yaml @@ -7,7 +7,6 @@ products: params: - name: usage choice: ["grid", "pv", "battery"] - allinone: true - name: host - preset: battery-params render: | diff --git a/templates/definition/meter/kostal-piko-mp-plus.yaml b/templates/definition/meter/kostal-piko-mp-plus.yaml index ed70d3d80..a279ba79b 100644 --- a/templates/definition/meter/kostal-piko-mp-plus.yaml +++ b/templates/definition/meter/kostal-piko-mp-plus.yaml @@ -6,12 +6,6 @@ products: - brand: Steca description: generic: coolcept fleX -linked: - - template: kostal-ksem-inverter - usage: grid - - template: kostal-ksem - usage: grid - excludetemplate: kostal-ksem-inverter params: - name: usage choice: ["pv"] diff --git a/templates/definition/meter/kostal-plenticore-gen2.yaml b/templates/definition/meter/kostal-plenticore-gen2.yaml index 976447073..841d7fe7f 100644 --- a/templates/definition/meter/kostal-plenticore-gen2.yaml +++ b/templates/definition/meter/kostal-plenticore-gen2.yaml @@ -5,12 +5,6 @@ products: de: Plenticore Hybrid, inkl. Netzladung der Hausbatterie en: Plenticore Hybrid, incl. grid charging of the house battery capabilities: ["battery-control"] -linked: - - template: kostal-ksem-inverter - usage: grid - - template: kostal-ksem - usage: grid - excludetemplate: kostal-ksem-inverter covers: ["kostal-plenticore-hw0200"] requirements: description: @@ -25,7 +19,6 @@ requirements: params: - name: usage choice: ["pv", "battery"] - allinone: true - name: modbus choice: ["tcpip"] id: 71 diff --git a/templates/definition/meter/kostal-plenticore.yaml b/templates/definition/meter/kostal-plenticore.yaml index 79d935b6d..e9c030bbf 100644 --- a/templates/definition/meter/kostal-plenticore.yaml +++ b/templates/definition/meter/kostal-plenticore.yaml @@ -4,12 +4,6 @@ products: description: generic: Plenticore Hybrid capabilities: ["battery-control"] -linked: - - template: kostal-ksem-inverter - usage: grid - - template: kostal-ksem - usage: grid - excludetemplate: kostal-ksem-inverter requirements: description: de: | @@ -21,7 +15,6 @@ requirements: params: - name: usage choice: ["pv", "battery"] - allinone: true - name: modbus choice: ["tcpip"] id: 71 diff --git a/templates/definition/meter/lg-ess-home-15.yaml b/templates/definition/meter/lg-ess-home-15.yaml index 6ab7cbc54..571ae13df 100644 --- a/templates/definition/meter/lg-ess-home-15.yaml +++ b/templates/definition/meter/lg-ess-home-15.yaml @@ -7,7 +7,6 @@ capabilities: ["battery-control"] params: - name: usage choice: ["grid", "pv", "battery"] - allinone: true - name: host - name: password help: diff --git a/templates/definition/meter/lg-ess-home-8-10.yaml b/templates/definition/meter/lg-ess-home-8-10.yaml index 2cc663627..aae196d12 100644 --- a/templates/definition/meter/lg-ess-home-8-10.yaml +++ b/templates/definition/meter/lg-ess-home-8-10.yaml @@ -13,7 +13,6 @@ requirements: params: - name: usage choice: ["grid", "pv", "battery"] - allinone: true - name: host - name: password help: diff --git a/templates/definition/meter/openems-modbus.yaml b/templates/definition/meter/openems-modbus.yaml index ead55a0e0..ae55022bc 100644 --- a/templates/definition/meter/openems-modbus.yaml +++ b/templates/definition/meter/openems-modbus.yaml @@ -28,7 +28,6 @@ requirements: params: - name: usage choice: ["grid", "pv", "battery"] - allinone: true - name: modbus choice: ["tcpip"] default: "tcpip" diff --git a/templates/definition/meter/openems.yaml b/templates/definition/meter/openems.yaml index 3035de440..065e72d9e 100644 --- a/templates/definition/meter/openems.yaml +++ b/templates/definition/meter/openems.yaml @@ -28,7 +28,6 @@ requirements: params: - name: usage choice: ["grid", "pv", "battery"] - allinone: true - name: host - name: password mask: true diff --git a/templates/definition/meter/plexlog.yaml b/templates/definition/meter/plexlog.yaml index 1801c6e35..f2513717f 100644 --- a/templates/definition/meter/plexlog.yaml +++ b/templates/definition/meter/plexlog.yaml @@ -11,7 +11,6 @@ requirements: params: - name: usage choice: ["grid", "pv", "battery"] - allinone: true - name: modbus choice: ["tcpip"] id: 1 diff --git a/templates/definition/meter/powerdog.yaml b/templates/definition/meter/powerdog.yaml index 78a707912..f40d2b482 100644 --- a/templates/definition/meter/powerdog.yaml +++ b/templates/definition/meter/powerdog.yaml @@ -5,7 +5,6 @@ products: params: - name: usage choice: ["grid", "pv"] - allinone: true - name: modbus choice: ["tcpip"] render: | diff --git a/templates/definition/meter/qcells-hybrid-cloud.yaml b/templates/definition/meter/qcells-hybrid-cloud.yaml index c8575d28b..dd233491e 100644 --- a/templates/definition/meter/qcells-hybrid-cloud.yaml +++ b/templates/definition/meter/qcells-hybrid-cloud.yaml @@ -17,7 +17,6 @@ requirements: params: - name: usage choice: ["grid", "pv", "battery"] - allinone: true - name: region description: de: Region diff --git a/templates/definition/meter/rct-power.yaml b/templates/definition/meter/rct-power.yaml index 48ee69913..f562f93fd 100644 --- a/templates/definition/meter/rct-power.yaml +++ b/templates/definition/meter/rct-power.yaml @@ -9,7 +9,6 @@ requirements: params: - name: usage choice: ["grid", "pv", "battery"] - allinone: true - name: host - name: externalpower type: bool diff --git a/templates/definition/meter/senec-home.yaml b/templates/definition/meter/senec-home.yaml index 5127f8b5b..a66623a1e 100644 --- a/templates/definition/meter/senec-home.yaml +++ b/templates/definition/meter/senec-home.yaml @@ -11,7 +11,6 @@ capabilities: ["battery-control"] params: - name: usage choice: ["grid", "pv", "battery"] - allinone: true - name: host - name: schema - preset: battery-params diff --git a/templates/definition/meter/siemens-junelight.yaml b/templates/definition/meter/siemens-junelight.yaml index 3688ff307..8b2d12597 100644 --- a/templates/definition/meter/siemens-junelight.yaml +++ b/templates/definition/meter/siemens-junelight.yaml @@ -12,7 +12,6 @@ requirements: params: - name: usage choice: ["grid", "pv", "battery"] - allinone: true - name: modbus choice: ["tcpip"] - preset: battery-params diff --git a/templates/definition/meter/sigenergy.yaml b/templates/definition/meter/sigenergy.yaml index 6ae4555a0..e229bf2bc 100644 --- a/templates/definition/meter/sigenergy.yaml +++ b/templates/definition/meter/sigenergy.yaml @@ -11,7 +11,6 @@ requirements: params: - name: usage choice: ["grid", "pv", "battery"] - allinone: true - name: host - name: port default: 502 diff --git a/templates/definition/meter/sma-datamanager.yaml b/templates/definition/meter/sma-datamanager.yaml index 53217f58b..586142920 100644 --- a/templates/definition/meter/sma-datamanager.yaml +++ b/templates/definition/meter/sma-datamanager.yaml @@ -11,7 +11,6 @@ requirements: params: - name: usage choice: ["grid", "pv", "battery"] - allinone: true - name: modbus choice: ["tcpip"] id: 2 diff --git a/templates/definition/meter/sma-homemanager.yaml b/templates/definition/meter/sma-homemanager.yaml index 3bdbaead6..76d89df1e 100644 --- a/templates/definition/meter/sma-homemanager.yaml +++ b/templates/definition/meter/sma-homemanager.yaml @@ -6,26 +6,6 @@ products: capabilities: ["smahems"] requirements: evcc: ["skiptest"] -linked: - - template: sma-energy-meter - usage: pv - - template: sma-hybrid - usage: pv - multiple: true - excludetemplate: sma-energy-meter - - template: sma-inverter - usage: pv - multiple: true - excludetemplate: sma-energy-meter - - template: sma-hybrid - usage: battery - multiple: true - - template: sma-inverter-speedwire - usage: battery - multiple: true - - template: sma-inverter-modbus - usage: battery - multiple: true params: - name: usage choice: ["grid"] diff --git a/templates/definition/meter/sma-hybrid.yaml b/templates/definition/meter/sma-hybrid.yaml index 3d64b3a43..fbd992181 100644 --- a/templates/definition/meter/sma-hybrid.yaml +++ b/templates/definition/meter/sma-hybrid.yaml @@ -12,7 +12,6 @@ requirements: params: - name: usage choice: ["pv", "battery", "grid"] - allinone: true - name: modbus choice: ["tcpip"] port: 502 diff --git a/templates/definition/meter/sma-webbox.yaml b/templates/definition/meter/sma-webbox.yaml index 76892c3a8..b31b29a08 100644 --- a/templates/definition/meter/sma-webbox.yaml +++ b/templates/definition/meter/sma-webbox.yaml @@ -6,7 +6,6 @@ products: params: - name: usage choice: ["pv"] - allinone: true - name: modbus choice: ["tcpip"] port: 502 diff --git a/templates/definition/meter/solaredge-hybrid.yaml b/templates/definition/meter/solaredge-hybrid.yaml index 0ea5d1bbe..ceabc3c0f 100644 --- a/templates/definition/meter/solaredge-hybrid.yaml +++ b/templates/definition/meter/solaredge-hybrid.yaml @@ -15,7 +15,6 @@ requirements: params: - name: usage choice: ["grid", "pv", "battery"] - allinone: true - name: modbus choice: ["tcpip", "rs485"] id: 1 diff --git a/templates/definition/meter/solaredge-inverter.yaml b/templates/definition/meter/solaredge-inverter.yaml index fba5924b7..80ca77480 100644 --- a/templates/definition/meter/solaredge-inverter.yaml +++ b/templates/definition/meter/solaredge-inverter.yaml @@ -11,7 +11,6 @@ requirements: params: - name: usage choice: ["grid", "pv"] - allinone: true - name: modbus choice: ["tcpip", "rs485"] id: 1 diff --git a/templates/definition/meter/solarlog.yaml b/templates/definition/meter/solarlog.yaml index 0491f54b0..cae9462f6 100644 --- a/templates/definition/meter/solarlog.yaml +++ b/templates/definition/meter/solarlog.yaml @@ -13,7 +13,6 @@ requirements: params: - name: usage choice: ["grid", "pv"] - allinone: true - name: host - name: port default: 502 diff --git a/templates/definition/meter/solarmax-maxstorage.yaml b/templates/definition/meter/solarmax-maxstorage.yaml index 147b4893e..5b332fade 100644 --- a/templates/definition/meter/solarmax-maxstorage.yaml +++ b/templates/definition/meter/solarmax-maxstorage.yaml @@ -11,7 +11,6 @@ requirements: params: - name: usage choice: ["grid", "pv", "battery"] - allinone: true - name: modbus choice: ["tcpip"] id: 1 diff --git a/templates/definition/meter/solarwatt-flex.yaml b/templates/definition/meter/solarwatt-flex.yaml index 6c1fd2063..aa538a2b4 100644 --- a/templates/definition/meter/solarwatt-flex.yaml +++ b/templates/definition/meter/solarwatt-flex.yaml @@ -13,7 +13,6 @@ requirements: params: - name: usage choice: ["grid", "pv", "battery"] - allinone: true - name: host - preset: battery-params render: | diff --git a/templates/definition/meter/solarwatt-myreserve-matrix.yaml b/templates/definition/meter/solarwatt-myreserve-matrix.yaml index bf90318a7..53f74a548 100644 --- a/templates/definition/meter/solarwatt-myreserve-matrix.yaml +++ b/templates/definition/meter/solarwatt-myreserve-matrix.yaml @@ -6,7 +6,6 @@ products: params: - name: usage choice: ["grid", "pv", "battery"] - allinone: true - name: host - name: port default: 8080 diff --git a/templates/definition/meter/solarwatt.yaml b/templates/definition/meter/solarwatt.yaml index 0d40a092f..df7a3a940 100644 --- a/templates/definition/meter/solarwatt.yaml +++ b/templates/definition/meter/solarwatt.yaml @@ -13,7 +13,6 @@ products: params: - name: usage choice: ["grid", "pv", "battery"] - allinone: true - name: host - preset: battery-params render: | diff --git a/templates/definition/meter/solax-hybrid-cloud.yaml b/templates/definition/meter/solax-hybrid-cloud.yaml index 8cbff6135..25675741e 100644 --- a/templates/definition/meter/solax-hybrid-cloud.yaml +++ b/templates/definition/meter/solax-hybrid-cloud.yaml @@ -17,7 +17,6 @@ requirements: params: - name: usage choice: ["grid", "pv", "battery"] - allinone: true - name: tokenid required: true description: diff --git a/templates/definition/meter/solax.yaml b/templates/definition/meter/solax.yaml index 700e1d62a..78680903c 100644 --- a/templates/definition/meter/solax.yaml +++ b/templates/definition/meter/solax.yaml @@ -11,7 +11,6 @@ capabilities: ["battery-control"] params: - name: usage choice: ["grid", "pv", "battery"] - allinone: true - name: modbus choice: ["rs485", "tcpip"] baudrate: 19200 diff --git a/templates/definition/meter/solis-hybrid-s.yaml b/templates/definition/meter/solis-hybrid-s.yaml index db89d3bae..2fb65f59e 100644 --- a/templates/definition/meter/solis-hybrid-s.yaml +++ b/templates/definition/meter/solis-hybrid-s.yaml @@ -23,7 +23,6 @@ requirements: params: - name: usage choice: ["grid", "pv", "battery"] - allinone: true - name: modbus choice: ["rs485"] baudrate: 9600 diff --git a/templates/definition/meter/solis-hybrid.yaml b/templates/definition/meter/solis-hybrid.yaml index c3e666cd9..275a13cb5 100644 --- a/templates/definition/meter/solis-hybrid.yaml +++ b/templates/definition/meter/solis-hybrid.yaml @@ -6,7 +6,6 @@ products: params: - name: usage choice: ["grid", "pv", "battery"] - allinone: true - name: modbus choice: ["rs485"] baudrate: 9600 diff --git a/templates/definition/meter/sonnenbatterie.yaml b/templates/definition/meter/sonnenbatterie.yaml index 7ae4031a7..95e350fd1 100644 --- a/templates/definition/meter/sonnenbatterie.yaml +++ b/templates/definition/meter/sonnenbatterie.yaml @@ -18,7 +18,6 @@ requirements: params: - name: usage choice: ["grid", "pv", "battery"] - allinone: true - name: host - name: port default: 8080 diff --git a/templates/definition/meter/sungrow-hybrid.yaml b/templates/definition/meter/sungrow-hybrid.yaml index 35f3eccd0..947e6a310 100644 --- a/templates/definition/meter/sungrow-hybrid.yaml +++ b/templates/definition/meter/sungrow-hybrid.yaml @@ -12,7 +12,6 @@ requirements: params: - name: usage choice: ["grid", "pv", "battery"] - allinone: true - name: modbus choice: ["rs485", "tcpip"] baudrate: 9600 diff --git a/templates/definition/meter/sungrow-inverter.yaml b/templates/definition/meter/sungrow-inverter.yaml index df452681f..32cb98120 100644 --- a/templates/definition/meter/sungrow-inverter.yaml +++ b/templates/definition/meter/sungrow-inverter.yaml @@ -6,7 +6,6 @@ products: params: - name: usage choice: ["grid", "pv"] - allinone: true - name: modbus choice: ["rs485", "tcpip"] baudrate: 9600 diff --git a/templates/definition/meter/sunspec-hybrid.yaml b/templates/definition/meter/sunspec-hybrid.yaml index dd61ab64f..316654d0e 100644 --- a/templates/definition/meter/sunspec-hybrid.yaml +++ b/templates/definition/meter/sunspec-hybrid.yaml @@ -8,7 +8,6 @@ group: generic params: - name: usage choice: ["grid", "pv", "battery"] - allinone: true - name: modbus choice: ["tcpip", "rs485"] - name: maxacpower diff --git a/templates/definition/meter/tesla-powerwall.yaml b/templates/definition/meter/tesla-powerwall.yaml index e06408916..1e7f5430e 100644 --- a/templates/definition/meter/tesla-powerwall.yaml +++ b/templates/definition/meter/tesla-powerwall.yaml @@ -23,7 +23,6 @@ requirements: params: - name: usage choice: ["grid", "pv", "battery"] - allinone: true - name: host - name: password required: true diff --git a/templates/definition/meter/varta.yaml b/templates/definition/meter/varta.yaml index 9f9ec44ad..420cc2a6f 100644 --- a/templates/definition/meter/varta.yaml +++ b/templates/definition/meter/varta.yaml @@ -20,7 +20,6 @@ requirements: params: - name: usage choice: ["grid", "pv", "battery"] - allinone: true - name: host - name: port default: 502 diff --git a/templates/definition/meter/victron-energy.yaml b/templates/definition/meter/victron-energy.yaml index 93e1b99aa..5142acb4a 100644 --- a/templates/definition/meter/victron-energy.yaml +++ b/templates/definition/meter/victron-energy.yaml @@ -11,7 +11,6 @@ capabilities: ["battery-control"] params: - name: usage choice: ["grid", "pv", "battery"] - allinone: true - name: host - name: port default: 502 diff --git a/templates/definition/meter/wattsonic-gen3.yaml b/templates/definition/meter/wattsonic-gen3.yaml index 9f6efb052..0b49ac807 100644 --- a/templates/definition/meter/wattsonic-gen3.yaml +++ b/templates/definition/meter/wattsonic-gen3.yaml @@ -7,7 +7,6 @@ capabilities: ["battery-control"] params: - name: usage choice: ["grid", "pv", "battery"] - allinone: true - name: modbus choice: ["rs485"] port: 502 diff --git a/templates/definition/meter/wattsonic.yaml b/templates/definition/meter/wattsonic.yaml index 9907a5a8d..454b97c73 100644 --- a/templates/definition/meter/wattsonic.yaml +++ b/templates/definition/meter/wattsonic.yaml @@ -9,7 +9,6 @@ capabilities: ["battery-control"] params: - name: usage choice: ["grid", "pv", "battery"] - allinone: true - name: modbus choice: ["rs485"] port: 502 diff --git a/util/templates/template.go b/util/templates/template.go index 6c43ca441..31f0243f4 100644 --- a/util/templates/template.go +++ b/util/templates/template.go @@ -22,12 +22,6 @@ type Template struct { titles []string } -// GuidedSetupEnabled returns true if there are linked templates or >1 usage -func (t *Template) GuidedSetupEnabled() bool { - _, p := t.ParamByName(ParamUsage) - return len(t.Linked) > 0 || (len(p.Choice) > 1 && p.IsAllInOne()) -} - // UpdateParamWithDefaults adds default values to specific param name entries func (t *Template) UpdateParamsWithDefaults() error { for i, p := range t.Params { diff --git a/util/templates/types.go b/util/templates/types.go index 5e55b4acf..1e32a537c 100644 --- a/util/templates/types.go +++ b/util/templates/types.go @@ -163,14 +163,6 @@ type Requirements struct { Description TextLanguage // Description of requirements, e.g. how the device needs to be prepared } -// Linked Template -type LinkedTemplate struct { - Template string - Usage string // usage: "grid", "pv", "battery" - Multiple bool // if true, multiple instances of this template can be added - ExcludeTemplate string // only consider this if no device of the named linked template was added -} - // Param is a proxy template parameter // Params can be defined: // 1. in the template: uses entries in 4. for default properties and values, can be overwritten here @@ -201,7 +193,6 @@ type Param struct { Type ParamType // string representation of the value type, "string" is default Choice []string `json:",omitempty"` // defines a set of choices, e.g. "grid", "pv", "battery", "charge" for "usage" Service string `json:",omitempty"` // defines a service to provide choices - AllInOne bool `json:"-"` // defines if the defined usages can all be present in a single device // TODO move somewhere else should not be part of the param definition Baudrate int `json:",omitempty"` // device specific default for modbus RS485 baudrate @@ -251,10 +242,6 @@ func (p *Param) IsDeprecated() bool { return p.Deprecated } -func (p *Param) IsAllInOne() bool { - return p.AllInOne -} - // yamlQuote quotes strings for yaml if they would otherwise by modified by the unmarshaler func (p *Param) yamlQuote(value string) string { if p.Type != TypeString { @@ -301,15 +288,14 @@ func (c CountryCode) IsValid() bool { // TemplateDefinition contains properties of a device template type TemplateDefinition struct { Template string - Deprecated bool `json:"-"` - Auth map[string]any `json:",omitempty"` // OAuth parameters (if required) - Group string `json:",omitempty"` // the group this template belongs to, references groupList entries - Covers []string `json:",omitempty"` // list of covered outdated template names - Products []Product `json:",omitempty"` // list of products this template is compatible with - Capabilities []string `json:",omitempty"` - Countries []CountryCode `json:",omitempty"` // list of countries supported by this template - Requirements Requirements `json:",omitempty"` - Linked []LinkedTemplate `json:",omitempty"` // list of templates that should be processed as part of the guided setup - Params []Param `json:",omitempty"` - Render string `json:"-"` // rendering template + Deprecated bool `json:"-"` + Auth map[string]any `json:",omitempty"` // OAuth parameters (if required) + Group string `json:",omitempty"` // the group this template belongs to, references groupList entries + Covers []string `json:",omitempty"` // list of covered outdated template names + Products []Product `json:",omitempty"` // list of products this template is compatible with + Capabilities []string `json:",omitempty"` + Countries []CountryCode `json:",omitempty"` // list of countries supported by this template + Requirements Requirements `json:",omitempty"` + Params []Param `json:",omitempty"` + Render string `json:"-"` // rendering template }