discovery fixes

src/Diematic32MQTT.py

@@ -9,6 +9,10 @@
 import json
 import time,datetime
 
+
+ONLINE = 'Online'
+OFFLINE = 'Offline'
+
 class MessageBuffer:
 	def __init__(self,mqtt):
 		#logger
@@ -50,7 +54,7 @@ def intValue(parameter):
 		return (f"{parameter:d}" if parameter is not None else '');
 
 	#boiler
-	buffer.update('status','Online' if self.availability else 'Offline');
+	buffer.update('status',ONLINE if self.availability else OFFLINE);
 	buffer.update('date',self.datetime.isoformat() if self.datetime is not None else '');
 	buffer.update('lastTimeSync',self.lastTimeSync.isoformat() if self.lastTimeSync is not None else '');
 	buffer.update('type',intValue(self.type));
@@ -143,8 +147,6 @@ def haSendDiscoveryMessages(client, userdata, message):
 		hassio.addNumber('zone_B_temp_night',"Température Nuit Zone B",'zoneB/nightTemp','zoneB/nightTemp/set',5,30,0.5,"°C");
 		hassio.addNumber('zone_B_temp_antiice',"Température Antigel Zone B",'zoneB/antiiceTemp','zoneB/antiiceTemp/set',5,20,0.5,"°C");		
 
-
-
 
 def on_connect(client, userdata, flags, rc):		
 	logger.critical('Connected to MQTT broker');
@@ -326,7 +328,7 @@ def sigterm_exit(signum, frame):
 		#create HomeAssistant discovery instance
 
 		hassio=Hassio.Hassio(client,mqttTopicPrefix,mqttClientId,hassioDiscoveryPrefix);
-		hassio.availabilityInfo('status','Online','Offline');
+		hassio.availabilityInfo('status',ONLINE,OFFLINE);
 
 		#create mqtt message buffer
 		buffer=MessageBuffer(client);

src/Hassio.py

@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 
 import logging,json
-	
+
 #This class allow to interface with Home Assistant through the MQTT Discovery Protocol
 class Hassio:
 
@@ -17,6 +17,11 @@ def __init__(self,mqttClient,topicRoot,clientId,discovery_prefix):
 		self.topicRoot=topicRoot;
 		self.clientId=clientId;
 		self.discovery_prefix=discovery_prefix;
+		self.device = {
+			"identifiers": [clientId],
+			"manufacturer": "Dietrich",
+			"name": clientId
+		}
 
 	def availabilityInfo(self,shortTopic,payload_available,payload_not_available):
 		#availability info saving
@@ -42,6 +47,7 @@ def addSensor(self,object_id,name,deviceClass,shortStateTopic,valueTemplate,unit
 		payload["payload_not_available"]=self.payload_not_available;
 		if (unit_of_measurement is not None):
 			payload["unit_of_measurement"]=unit_of_measurement;
+		payload['device'] = self.device
 		#send discovery message
 		self.mqtt.publish(discoveryTopic,json.dumps(payload),1,False);
 
@@ -61,6 +67,7 @@ def addBinarySensor(self,object_id,name,deviceClass,shortStateTopic,payload_on,p
 		payload["payload_available"]=self.payload_available;
 		payload["payload_not_available"]=self.payload_not_available;
 		payload["enabled_by_default"]=False;
+		payload['device'] = self.device
 		#send discovery message
 		self.mqtt.publish(discoveryTopic,json.dumps(payload),1,False);
 
@@ -82,6 +89,7 @@ def addNumber(self,object_id,name,shortStateTopic,shortCommandTopic,min,max,step
 		payload["step"]=step;
 		if (unit_of_measurement is not None):
 			payload["unit_of_measurement"]=unit_of_measurement;
+		payload['device'] = self.device
 		#send discovery message
 		self.mqtt.publish(discoveryTopic,json.dumps(payload),1,False);
 
@@ -99,7 +107,7 @@ def addSelect(self,object_id,name,shortStateTopic,shortCommandTopic,options):
 		payload["payload_not_available"]=self.payload_not_available;
 		payload["qos"]=2;
 		payload["options"]=options;
-
+		payload['device'] = self.device
 		#send discovery message
 		self.mqtt.publish(discoveryTopic,json.dumps(payload),1,False);	
 
@@ -119,7 +127,7 @@ def addSwitch(self,object_id,name,shortStateTopic,shortCommandTopic,payload_off,
 		payload["payload_off"]=payload_off;
 		payload["payload_on"]=payload_on;		
 		payload["qos"]=2;
-
+		payload['device'] = self.device
 		#send discovery message
 		self.mqtt.publish(discoveryTopic,json.dumps(payload),1,False);