clean

Author: HotNoob

classes/transports/modbus_rtu.py

@@ -42,7 +42,7 @@ def __init__(self, settings : SectionProxy, protocolSettings : protocol_settings
 
         address : int = settings.getint("address", 0)
         self.addresses = [address]
-
+        
         # pymodbus compatability; unit was renamed to address
         if 'slave' in inspect.signature(ModbusSerialClient.read_holding_registers).parameters:
             self.pymodbus_slave_arg = 'slave'

classes/transports/mqtt.py

@@ -167,19 +167,16 @@ def write_data(self, data : dict[str, str], from_transport : transport_base):
         if info.rc == MQTT_ERR_NO_CONN:
             self.connected = False
 
-
-        identifier = from_transport.device_model + "_" + from_transport.device_serial_number
-
         if(self.json):
             # Serializing json
             json_object = json.dumps(data, indent=4)
-            self.client.publish(self.base_topic+identifier, json_object, 0, properties=self.mqtt_properties)
+            self.client.publish(self.base_topic+from_transport.device_identifier, json_object, 0, properties=self.mqtt_properties)
         else:
             for entry, val in data.items():
                 if isinstance(val, float) and self.max_precision >= 0: #apply max_precision on mqtt transport 
                     val = round(val, self.max_precision)
 
-                self.client.publish(str(self.base_topic+identifier+'/'+entry).lower(), str(val))
+                self.client.publish(str(self.base_topic+from_transport.device_identifier+'/'+entry).lower(), str(val))
 
     def client_on_message(self, client, userdata, msg):
         """ The callback for when a PUBLISH message is received from the server. """
@@ -252,13 +249,11 @@ def mqtt_discovery(self, from_transport : transport_base):
             disc_payload['name'] = clean_name
             disc_payload['unique_id'] = "hotnoob_" + from_transport.device_serial_number + "_"+clean_name
 
-            identifier = from_transport.device_model + "_" + from_transport.device_serial_number
-
             writePrefix = ""
             if from_transport.write_enabled and item.write_mode == WriteMode.WRITE:
                 writePrefix = "" #home assistant doesnt like write prefix
 
-            disc_payload['state_topic'] = self.base_topic + identifier + writePrefix+ "/"+clean_name
+            disc_payload['state_topic'] = self.base_topic + from_transport.device_identifier + writePrefix+ "/"+clean_name
 
             if item.unit:
                 disc_payload['unit_of_measurement'] = item.unit

classes/transports/transport_base.py

@@ -17,6 +17,7 @@ class transport_base:
     device_serial_number : str = ''
     device_manufacturer : str = 'hotnoob'
     device_model : str = 'hotnoob'
+    device_identifier : str = 'hotnoob'
     bridge : str = ''
     write_enabled : bool = False
     max_precision : int = 2
@@ -67,6 +68,7 @@ def __init__(self, settings : 'SectionProxy', protocolSettings : 'protocol_setti
             else:
                 self.write_enabled = settings.getboolean("write", self.write_enabled)
 
+        self.device_identifier = self.device_model + "_" + self.device_serial_number
 
 
     def init_bridge(self, from_transport : 'transport_base'):