Fixed some issues
Some checks failed
Build and Push Docker Image / build-and-push (push) Has been cancelled
Build and Push Docker Image / testing (1.24.x, ubuntu-latest) (push) Has been cancelled

This commit is contained in:
2025-06-06 17:42:26 -04:00
parent 118ee684ee
commit c4e9007d87

View File

@ -311,7 +311,7 @@ func (s *MySubaruClient) mySubaruConfigToMQTTHassioConfig(v *mysubaru.Vehicle) [
for n, d := range v.Doors { for n, d := range v.Doors {
// homeassistant/sensor/mysubaru/VIN-NUMBER-HERE/door_frontleft_status/config // homeassistant/sensor/mysubaru/VIN-NUMBER-HERE/door_frontleft_status/config
position := d.Position + ` ` + d.SubPosition position := d.Position + ` ` + d.SubPosition
hassioConfig[s.config.Hassio.Topics.Discovery+`/sensor/`+v.Vin+`/`+n+`_status/config`] = `{` + device + origin + topic + `"name":"Door ` + position + ` Status","uniq_id":"` + v.Vin + `_` + n + `_status","obj_id":"` + obj_id_prefix + n + `_status","ic":"mdi:car-door","json_attr_t":"mysubarumq/` + v.Vin + `/doors/attr","json_attr_tpl":"{{value_json.` + n + `}}","stat_t":"mysubarumq/` + v.Vin + `/doors/state","val_tpl":"{{value_json.` + n + `}}"}` hassioConfig[s.config.Hassio.Topics.Discovery+`/sensor/`+v.Vin+`/`+n+`_status/config`] = `{` + device + origin + topic + `"name":"Door ` + position + ` Status","uniq_id":"` + v.Vin + `_` + n + `_status","obj_id":"` + obj_id_prefix + n + `_status","ic":"mdi:car-door","stat_t":"mysubarumq/` + v.Vin + `/doors/state","val_tpl":"{{value_json.` + n + `}}","json_attr_t":"mysubarumq/` + v.Vin + `/doors/` + n + `/attr"}`
} }
for n, w := range v.Windows { for n, w := range v.Windows {
// homeassistant/sensor/mysubaru/VIN-NUMBER-HERE/window_frontleft/config // homeassistant/sensor/mysubaru/VIN-NUMBER-HERE/window_frontleft/config
@ -379,22 +379,22 @@ func (s *MySubaruClient) mySubaruStatusToMQTTMessage(v *mysubaru.Vehicle) []*bus
// Doors // Doors
doors := `{` doors := `{`
locks := `{` // locks := `{`
dq := len(v.Doors) dq := len(v.Doors)
dc := 1 dc := 1
for n, d := range v.Doors { for n, d := range v.Doors {
doors = doors + `"` + n + `":"` + d.Status + `"` doors = doors + `"` + n + `":"` + d.Status + `"`
locks = locks + `"` + n + `":"` + d.Lock + `"` // locks = locks + `"` + n + `":"` + d.Lock + `"`
if dc != dq { if dc != dq {
doors = doors + `,` doors = doors + `,`
locks = locks + `,` // locks = locks + `,`
} }
dc++ dc++
} }
doors = doors + `}` doors = doors + `}`
locks = locks + `}` // locks = locks + `}`
state[`mysubarumq/`+v.Vin+`/doors/state`] = doors state[`mysubarumq/`+v.Vin+`/doors/state`] = doors
state[`mysubarumq/`+v.Vin+`/doors/attr`] = locks // state[`mysubarumq/`+v.Vin+`/doors/attr`] = locks
// Windows // Windows
windows := `{` windows := `{`