Merge pull request #109 from jjok/fix/always-use-device-name

gfwilliams · web-flow · commit 9c9b817d8445 · 2023-04-21T08:27:34.000+01:00
Advertise with device name, if configured
diff --git a/lib/discovery.js b/lib/discovery.js
@@ -166,8 +166,8 @@ async function onDiscovery(peripheral) {
 
         if (config.homeassistant) homeassistant.configDiscovery(decoded, dev, peripheral, d.uuid);
         for (var k in decoded) {
-          if (config.mqtt_advertise) mqtt.send(config.mqtt_prefix + "/advertise/" + id + "/" + k, JSON.stringify(decoded[k]));
-          if (config.mqtt_format_decoded_key_topic) mqtt.send(config.mqtt_prefix + "/" + k + "/" + id, JSON.stringify(decoded[k]));
+          if (config.mqtt_advertise) mqtt.send(config.mqtt_prefix + "/advertise/" + dev.name + "/" + k, JSON.stringify(decoded[k]));
+          if (config.mqtt_format_decoded_key_topic) mqtt.send(config.mqtt_prefix + "/" + k + "/" + dev.name, JSON.stringify(decoded[k]));
         }
 
         if (config.mqtt_format_json) {

Original file line number	Diff line number	Diff line change
`@@ -166,8 +166,8 @@ async function onDiscovery(peripheral) {`
`166`	`166`
`167`	`167`	`if (config.homeassistant) homeassistant.configDiscovery(decoded, dev, peripheral, d.uuid);`
`168`	`168`	`for (var k in decoded) {`
`169`		`- if (config.mqtt_advertise) mqtt.send(config.mqtt_prefix + "/advertise/" + id + "/" + k, JSON.stringify(decoded[k]));`
`170`		`- if (config.mqtt_format_decoded_key_topic) mqtt.send(config.mqtt_prefix + "/" + k + "/" + id, JSON.stringify(decoded[k]));`
	`169`	`+ if (config.mqtt_advertise) mqtt.send(config.mqtt_prefix + "/advertise/" + dev.name + "/" + k, JSON.stringify(decoded[k]));`
	`170`	`+ if (config.mqtt_format_decoded_key_topic) mqtt.send(config.mqtt_prefix + "/" + k + "/" + dev.name, JSON.stringify(decoded[k]));`
`171`	`171`	`}`
`172`	`172`
`173`	`173`	`if (config.mqtt_format_json) {`