diff --git a/workers/mysubaru.go b/workers/mysubaru.go index 16a4dee..8845201 100644 --- a/workers/mysubaru.go +++ b/workers/mysubaru.go @@ -311,7 +311,7 @@ func (s *MySubaruClient) mySubaruConfigToMQTTHassioConfig(v *mysubaru.Vehicle) [ for n, d := range v.Doors { // homeassistant/sensor/mysubaru/VIN-NUMBER-HERE/door_frontleft_status/config 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 { // homeassistant/sensor/mysubaru/VIN-NUMBER-HERE/window_frontleft/config @@ -379,22 +379,22 @@ func (s *MySubaruClient) mySubaruStatusToMQTTMessage(v *mysubaru.Vehicle) []*bus // Doors doors := `{` - locks := `{` + // locks := `{` dq := len(v.Doors) dc := 1 for n, d := range v.Doors { doors = doors + `"` + n + `":"` + d.Status + `"` - locks = locks + `"` + n + `":"` + d.Lock + `"` + // locks = locks + `"` + n + `":"` + d.Lock + `"` if dc != dq { doors = doors + `,` - locks = locks + `,` + // locks = locks + `,` } dc++ } doors = doors + `}` - locks = locks + `}` + // locks = locks + `}` state[`mysubarumq/`+v.Vin+`/doors/state`] = doors - state[`mysubarumq/`+v.Vin+`/doors/attr`] = locks + // state[`mysubarumq/`+v.Vin+`/doors/attr`] = locks // Windows windows := `{`