From 33e86628ed187b8c5aab57c4e9ace8b568af44d2 Mon Sep 17 00:00:00 2001 From: andig Date: Fri, 29 Apr 2022 17:21:59 +0200 Subject: [PATCH] Warp: fix firmware selection --- cmd/configure/helper.go | 1 + cmd/configure/main.go | 2 +- templates/definition/charger/tinkerforge-warp.yaml | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/cmd/configure/helper.go b/cmd/configure/helper.go index 2ab5719a8..5ffc1573b 100644 --- a/cmd/configure/helper.go +++ b/cmd/configure/helper.go @@ -468,6 +468,7 @@ func (c *CmdConfigure) processParams(templateItem *templates.Template, deviceCat if usageFilter != "" { additionalConfig[param.Name] = usageFilter.String() } + default: if !c.advancedMode && param.Advanced { continue diff --git a/cmd/configure/main.go b/cmd/configure/main.go index 9c3922d90..03dadf529 100644 --- a/cmd/configure/main.go +++ b/cmd/configure/main.go @@ -207,7 +207,7 @@ func (c *CmdConfigure) flowNewConfigFile() { fmt.Println(c.localizedString("File_SaveSuccess", localizeMap{"FileName": filename})) } -// configureDevices asks device specfic questions +// configureDevices asks device specific questions func (c *CmdConfigure) configureDevices(deviceCategory DeviceCategory, askAdding, askMultiple bool) []device { var devices []device diff --git a/templates/definition/charger/tinkerforge-warp.yaml b/templates/definition/charger/tinkerforge-warp.yaml index 25ce5a0c7..4ae83eafb 100644 --- a/templates/definition/charger/tinkerforge-warp.yaml +++ b/templates/definition/charger/tinkerforge-warp.yaml @@ -38,7 +38,7 @@ params: - name: timeout default: 30s render: | - type:{{ if .fw2 }} warp-fw2 {{ else }} warp {{ end }} + type: {{ if eq .fw2 "true" -}} warp-fw2 {{ else -}} warp {{ end }} broker: {{ .host }}:{{ .port }} {{- if .user }} user: {{ .user }}