From b9ce2fcf8ddd69abb02a1d8c01bf5b7b67b11434 Mon Sep 17 00:00:00 2001 From: andig Date: Sat, 29 Jun 2024 16:20:05 +0200 Subject: [PATCH] chore: remove unnecessary links (#14621) --- cmd/configure/helper.go | 40 +------------------ .../definition/charger/fronius-wattpilot.yaml | 1 - templates/definition/charger/go-e-v3.yaml | 1 - templates/definition/charger/openwb.yaml | 1 - .../definition/charger/tinkerforge-warp.yaml | 1 - .../definition/charger/tinkerforge-warp3.yaml | 1 - .../definition/charger/wallbe-meter.yaml | 1 - .../charger/wallbe-pre2019-meter.yaml | 1 - .../definition/charger/wallbe-pre2019.yaml | 1 - templates/definition/charger/wallbe.yaml | 1 - .../definition/meter/tesla-powerwall.yaml | 3 -- templates/definition/vehicle/citroen.yaml | 6 --- templates/definition/vehicle/ds.yaml | 6 --- .../definition/vehicle/ford-connect.yaml | 6 --- templates/definition/vehicle/mercedes.yaml | 6 --- templates/definition/vehicle/opel.yaml | 6 --- templates/definition/vehicle/peugeot.yaml | 6 --- templates/definition/vehicle/tesla.yaml | 6 --- util/templates/types.go | 2 - 19 files changed, 1 insertion(+), 95 deletions(-) diff --git a/cmd/configure/helper.go b/cmd/configure/helper.go index 9a0bcea97..8474df914 100644 --- a/cmd/configure/helper.go +++ b/cmd/configure/helper.go @@ -123,9 +123,6 @@ func (c *CmdConfigure) processDeviceRequirements(templateItem templates.Template fmt.Println("-------------------------------------------------") fmt.Println(c.localizedString("Requirements_Title")) fmt.Println(requirementDescription) - if len(templateItem.Requirements.URI) > 0 { - fmt.Println(" " + c.localizedString("Requirements_More") + " " + templateItem.Requirements.URI) - } fmt.Println("-------------------------------------------------") } @@ -186,30 +183,6 @@ func (c *CmdConfigure) processDeviceRequirements(templateItem templates.Template return nil } -// processParamRequirements handles param requirements -func (c *CmdConfigure) processParamRequirements(param templates.Param) error { - requirementDescription := stripmd.Strip(param.Requirements.Description.String(c.lang)) - if len(requirementDescription) > 0 { - fmt.Println() - fmt.Println("-------------------------------------------------") - fmt.Println(c.localizedString("Requirements_Title")) - fmt.Println(requirementDescription) - if len(param.Requirements.URI) > 0 { - fmt.Println(" " + c.localizedString("Requirements_More") + " " + param.Requirements.URI) - } - fmt.Println("-------------------------------------------------") - } - - // check if sponsorship is required - if slices.Contains(param.Requirements.EVCC, templates.RequirementSponsorship) && c.configuration.config.SponsorToken == "" { - if err := c.askSponsortoken(true, true); err != nil { - return err - } - } - - return nil -} - func (c *CmdConfigure) askSponsortoken(required, feature bool) error { fmt.Println("-- Sponsorship -----------------------------") if required { @@ -456,28 +429,17 @@ func (c *CmdConfigure) processInputConfig(param templates.Param) string { label = langLabel } - help := param.Help.ShortString(c.lang) - if slices.Contains(param.Requirements.EVCC, templates.RequirementSponsorship) { - help = fmt.Sprintf("%s\n\n%s", help, c.localizedString("Requirements_Sponsorship_Feature_Title")) - } - value := c.askValue(question{ label: label, defaultValue: param.Default, exampleValue: param.Example, - help: help, + help: param.Help.ShortString(c.lang), valueType: param.Type, validValues: param.ValidValues, mask: param.IsMasked(), required: param.IsRequired(), }) - if param.Type == templates.TypeBool && value == "true" { - if err := c.processParamRequirements(param); err != nil { - return "false" - } - } - return value } diff --git a/templates/definition/charger/fronius-wattpilot.yaml b/templates/definition/charger/fronius-wattpilot.yaml index e47aba0ca..90f7eac34 100644 --- a/templates/definition/charger/fronius-wattpilot.yaml +++ b/templates/definition/charger/fronius-wattpilot.yaml @@ -10,7 +10,6 @@ requirements: Benötigt mindestens Firmware 36.3 oder neuer. en: | Requires firmware 36.3 or later. - uri: https://docs.evcc.io/docs/devices/chargers#fronius-wattpilot params: - name: host - name: password diff --git a/templates/definition/charger/go-e-v3.yaml b/templates/definition/charger/go-e-v3.yaml index 4b1308384..af427d079 100644 --- a/templates/definition/charger/go-e-v3.yaml +++ b/templates/definition/charger/go-e-v3.yaml @@ -19,7 +19,6 @@ requirements: For 1P/3P-Phase switching the HTTP API v2 in the charger setup needs to be activated. The “simulate unplugging” option should be activated in the Go-E app ("Car" menu item). - uri: https://docs.evcc.io/docs/devices/chargers#go-e evcc: ["sponsorship"] params: - name: host diff --git a/templates/definition/charger/openwb.yaml b/templates/definition/charger/openwb.yaml index 95b36f898..bcc1e26da 100644 --- a/templates/definition/charger/openwb.yaml +++ b/templates/definition/charger/openwb.yaml @@ -7,7 +7,6 @@ requirements: description: en: The wallbox has to be configured as loadpoint. de: Die Wallbox muss als Ladepunkt konfiguriert sein. - uri: https://docs.evcc.io/docs/devices/chargers#openwb params: - name: host - name: connector diff --git a/templates/definition/charger/tinkerforge-warp.yaml b/templates/definition/charger/tinkerforge-warp.yaml index a294e13ad..ec9375e63 100644 --- a/templates/definition/charger/tinkerforge-warp.yaml +++ b/templates/definition/charger/tinkerforge-warp.yaml @@ -13,7 +13,6 @@ requirements: description: en: WARP Firmware v2 required. Automatic phase switching requires the additional WARP Energy Manager. de: WARP Firmware v2 erforderlich. Für automatische Phasenumschaltung wird zusätzlich der WARP Energy Manager benötigt. - uri: https://docs.evcc.io/docs/devices/chargers#tinkerforge params: - preset: mqtt - name: topic diff --git a/templates/definition/charger/tinkerforge-warp3.yaml b/templates/definition/charger/tinkerforge-warp3.yaml index 2c93ef7f5..45cc88c8a 100644 --- a/templates/definition/charger/tinkerforge-warp3.yaml +++ b/templates/definition/charger/tinkerforge-warp3.yaml @@ -11,7 +11,6 @@ requirements: description: de: Die automatische Phasenumschaltung bei 1p Fahrzeugen muss deaktiviert sein. Siehe https://docs.warp-charger.com/docs/mqtt_http/api_reference/evse#evse_phase_auto_switch_warp3. en: The automatic phase switching for 1p vehicles must be deactivated. Siehe https://docs.warp-charger.com/docs/mqtt_http/api_reference/evse#evse_phase_auto_switch_warp3. - uri: https://docs.evcc.io/docs/devices/chargers#tinkerforge params: - preset: mqtt - name: topic diff --git a/templates/definition/charger/wallbe-meter.yaml b/templates/definition/charger/wallbe-meter.yaml index e76915e39..bc487678b 100644 --- a/templates/definition/charger/wallbe-meter.yaml +++ b/templates/definition/charger/wallbe-meter.yaml @@ -9,7 +9,6 @@ requirements: description: en: DIP switch 10 must be set to 'ON'. de: Im Gerät muss der DIP Schalter 10 auf 'ON' gestellt sein. - uri: https://docs.evcc.io/docs/devices/chargers#wallbe params: - name: host - name: port diff --git a/templates/definition/charger/wallbe-pre2019-meter.yaml b/templates/definition/charger/wallbe-pre2019-meter.yaml index 26c6dbd65..bd7b62ebe 100644 --- a/templates/definition/charger/wallbe-pre2019-meter.yaml +++ b/templates/definition/charger/wallbe-pre2019-meter.yaml @@ -9,7 +9,6 @@ requirements: description: en: DIP switch 10 must be set to 'ON'. de: Im Gerät muss der DIP Schalter 10 auf 'ON' gestellt sein. - uri: https://docs.evcc.io/docs/devices/chargers#eco-pro-vor-2019-mit-strommessgerät params: - name: host - name: port diff --git a/templates/definition/charger/wallbe-pre2019.yaml b/templates/definition/charger/wallbe-pre2019.yaml index 2d29e3282..568d4f131 100644 --- a/templates/definition/charger/wallbe-pre2019.yaml +++ b/templates/definition/charger/wallbe-pre2019.yaml @@ -9,7 +9,6 @@ requirements: description: en: DIP switch 10 must be set to 'ON'. de: Im Gerät muss der DIP Schalter 10 auf 'ON' gestellt sein. - uri: https://docs.evcc.io/docs/devices/chargers#eco-pro-vor-2019 params: - name: host - name: port diff --git a/templates/definition/charger/wallbe.yaml b/templates/definition/charger/wallbe.yaml index 8560d24bb..c3b044db1 100644 --- a/templates/definition/charger/wallbe.yaml +++ b/templates/definition/charger/wallbe.yaml @@ -8,7 +8,6 @@ requirements: description: en: The Wallbe must be connected using Ethernet and the DIP switch 10 must be set to 'ON'. de: Die Wallbox muss über ein Netzwerkkabel angebunden sein und im Gerät muss der DIP Schalter 10 auf 'ON' gestellt sein. - uri: https://docs.evcc.io/docs/devices/chargers#wallbe params: - name: host - name: port diff --git a/templates/definition/meter/tesla-powerwall.yaml b/templates/definition/meter/tesla-powerwall.yaml index 6c33b672b..49b8ea1cd 100644 --- a/templates/definition/meter/tesla-powerwall.yaml +++ b/templates/definition/meter/tesla-powerwall.yaml @@ -31,9 +31,6 @@ params: en: Password of the user "customer". By default this is the last 5 characters of password stated on the Tesla Gateway. de: Passwort des Benutzers "Kunde". Default sind die letzten 5 Zeichen des auf dem Tesla Gateway genannten Passworts. - name: refreshToken - help: - en: "See https://docs.evcc.io/en/docs/devices/meters#tesla-powerwall" - de: "Siehe https://docs.evcc.io/docs/devices/meters#tesla-powerwall" - name: siteId help: en: optional product identifier of the energy site, use to override autodectction diff --git a/templates/definition/vehicle/citroen.yaml b/templates/definition/vehicle/citroen.yaml index 2c180e257..9ae48764c 100644 --- a/templates/definition/vehicle/citroen.yaml +++ b/templates/definition/vehicle/citroen.yaml @@ -19,15 +19,9 @@ params: - name: accessToken required: true mask: true - help: - en: "See https://docs.evcc.io/en/docs/devices/vehicles#citroen" - de: "Siehe https://docs.evcc.io/docs/devices/vehicles#citroen" - name: refreshToken required: true mask: true - help: - en: "See https://docs.evcc.io/en/docs/devices/vehicles#citroen" - de: "Siehe https://docs.evcc.io/docs/devices/vehicles#citroen" - name: vin example: V... - name: capacity diff --git a/templates/definition/vehicle/ds.yaml b/templates/definition/vehicle/ds.yaml index 062535b36..1eed9a9c9 100644 --- a/templates/definition/vehicle/ds.yaml +++ b/templates/definition/vehicle/ds.yaml @@ -19,15 +19,9 @@ params: - name: accessToken required: true mask: true - help: - en: "See https://docs.evcc.io/en/docs/devices/vehicles#ds" - de: "Siehe https://docs.evcc.io/docs/devices/vehicles#ds" - name: refreshToken required: true mask: true - help: - en: "See https://docs.evcc.io/en/docs/devices/vehicles#ds" - de: "Siehe https://docs.evcc.io/docs/devices/vehicles#ds" - name: vin example: V... - name: capacity diff --git a/templates/definition/vehicle/ford-connect.yaml b/templates/definition/vehicle/ford-connect.yaml index 6c4b7cc8c..da0e14c4e 100644 --- a/templates/definition/vehicle/ford-connect.yaml +++ b/templates/definition/vehicle/ford-connect.yaml @@ -23,15 +23,9 @@ params: - name: accessToken required: true mask: true - help: - en: "See https://docs.evcc.io/en/docs/devices/vehicles#ford-connect" - de: "Siehe https://docs.evcc.io/docs/devices/vehicles#ford-connect" - name: refreshToken required: true mask: true - help: - en: "See https://docs.evcc.io/en/docs/devices/vehicles#ford-connect" - de: "Siehe https://docs.evcc.io/docs/devices/vehicles#ford-connect" - name: vin example: WF0FXX... - name: capacity diff --git a/templates/definition/vehicle/mercedes.yaml b/templates/definition/vehicle/mercedes.yaml index 83c960561..b2abd37fe 100644 --- a/templates/definition/vehicle/mercedes.yaml +++ b/templates/definition/vehicle/mercedes.yaml @@ -21,15 +21,9 @@ params: - name: accessToken required: true mask: true - help: - en: "See https://docs.evcc.io/en/docs/devices/vehicles#mercedes" - de: "Siehe https://docs.evcc.io/docs/devices/vehicles#mercedes" - name: refreshToken required: true mask: true - help: - en: "See https://docs.evcc.io/en/docs/devices/vehicles#mercedes" - de: "Siehe https://docs.evcc.io/docs/devices/vehicles#mercedes" - name: vin example: V... - name: capacity diff --git a/templates/definition/vehicle/opel.yaml b/templates/definition/vehicle/opel.yaml index ce7ec4dbe..5e3b9997a 100644 --- a/templates/definition/vehicle/opel.yaml +++ b/templates/definition/vehicle/opel.yaml @@ -19,15 +19,9 @@ params: - name: accessToken required: true mask: true - help: - en: "See https://docs.evcc.io/en/docs/devices/vehicles#opel" - de: "Siehe https://docs.evcc.io/docs/devices/vehicles#opel" - name: refreshToken required: true mask: true - help: - en: "See https://docs.evcc.io/en/docs/devices/vehicles#opel" - de: "Siehe https://docs.evcc.io/docs/devices/vehicles#opel" - name: vin example: V... - name: capacity diff --git a/templates/definition/vehicle/peugeot.yaml b/templates/definition/vehicle/peugeot.yaml index 98d993e62..86ee364b7 100644 --- a/templates/definition/vehicle/peugeot.yaml +++ b/templates/definition/vehicle/peugeot.yaml @@ -19,15 +19,9 @@ params: - name: accessToken required: true mask: true - help: - en: "See https://docs.evcc.io/en/docs/devices/vehicles#peugeot" - de: "Siehe https://docs.evcc.io/docs/devices/vehicles#peugeot" - name: refreshToken required: true mask: true - help: - en: "See https://docs.evcc.io/en/docs/devices/vehicles#peugeot" - de: "Siehe https://docs.evcc.io/docs/devices/vehicles#peugeot" - name: vin example: V... - name: capacity diff --git a/templates/definition/vehicle/tesla.yaml b/templates/definition/vehicle/tesla.yaml index e27caa3c6..afd25a12b 100644 --- a/templates/definition/vehicle/tesla.yaml +++ b/templates/definition/vehicle/tesla.yaml @@ -21,15 +21,9 @@ params: - name: accessToken required: true mask: true - help: - en: "See https://docs.evcc.io/en/docs/devices/vehicles#tesla" - de: "Siehe https://docs.evcc.io/docs/devices/vehicles#tesla" - name: refreshToken required: true mask: true - help: - en: "See https://docs.evcc.io/en/docs/devices/vehicles#tesla" - de: "Siehe https://docs.evcc.io/docs/devices/vehicles#tesla" - name: vin example: W... - name: capacity diff --git a/util/templates/types.go b/util/templates/types.go index 52510e1c4..8a598bb22 100644 --- a/util/templates/types.go +++ b/util/templates/types.go @@ -133,7 +133,6 @@ func (t *TextLanguage) MarshalJSON() (out []byte, err error) { type Requirements struct { EVCC []string // EVCC requirements, e.g. sponsorship Description TextLanguage // Description of requirements, e.g. how the device needs to be prepared - URI string // URI to a webpage with more details about the preparation requirements } // Linked Template @@ -175,7 +174,6 @@ type Param struct { ValidValues []string `json:",omitempty"` // list of valid values the user can provide Choice []string `json:",omitempty"` // defines a set of choices, e.g. "grid", "pv", "battery", "charge" for "usage" AllInOne *bool `json:"-"` // defines if the defined usages can all be present in a single device - Requirements Requirements `json:"-"` // requirements for this param to be usable, only supported via Type "bool" // TODO move somewhere else should not be part of the param definition Baudrate int `json:",omitempty"` // device specific default for modbus RS485 baudrate