Index: leahi_dialin/dd/modules/conductivity_sensors.py
===================================================================
diff -u -r3f4937e339925dde0b95f08e49969f8983c5cba4 -rba415df9f8e76d6b0f21e8f69ba99346e42f7b09
--- leahi_dialin/dd/modules/conductivity_sensors.py	(.../conductivity_sensors.py)	(revision 3f4937e339925dde0b95f08e49969f8983c5cba4)
+++ leahi_dialin/dd/modules/conductivity_sensors.py	(.../conductivity_sensors.py)	(revision ba415df9f8e76d6b0f21e8f69ba99346e42f7b09)
@@ -60,10 +60,6 @@
                                                                        function = self._handler_conductivity_cal_sync)
 
         self.dd_conductivity_timestamp = 0.0                    #: The timestamp of the last conductivity message
-        self.dd_conductivity_cal_timestamp = 0.0                #: The timestamp of the last calibration response message
-        self.dd_conductivity_version_timestamp =  0.0           #: The timestamp of the last version response message
-
-        #: The Conductivity Sensors data in dictionary format
         self.dd_conductivity = {
             dd_enum_repository.DDConductivitySensorNames.D17_COND.name: {
                 dd_enum_repository.DDConductivityResistanceAttributes.CONDUCTIVITY.name: 0.0,
@@ -97,6 +93,26 @@
             },
         }
 
+        self.dd_conductivity_cal_timestamp = 0.0                #: The timestamp of the last calibration response message
+        self.dd_conductivity_version_timestamp =  0.0           #: The timestamp of the last version response message
+
+
+
+# ============================================================ Properties ============================================================
+    @property
+    def dd_conductivity(self) -> dict:
+        """
+        The Conductivity data
+        """
+        return self._conductivity
+
+    @dd_conductivity.setter
+    def dd_conductivity(self, value):
+        self._conductivity = value
+
+
+
+# ============================================================ Handlers ============================================================
     @publish(["msg_id_dd_conductivity_data", "dd_conductivity", "dd_conductivity_timestamp"])
     def _handler_conductivity_sensors_sync(self, message, timestamp=0.0):
         """
@@ -106,31 +122,29 @@
         @param message:  published DD conductivity sensor data message
         @return: None
         """
-        sensor_list =[]
-        sensor_list.append((dd_enum_repository.DDConductivitySensorNames.D17_COND.name, dd_enum_repository.DDConductivityResistanceAttributes.CONDUCTIVITY.name, DataTypes.F32))
-        sensor_list.append((dd_enum_repository.DDConductivitySensorNames.D27_COND.name, dd_enum_repository.DDConductivityResistanceAttributes.CONDUCTIVITY.name, DataTypes.F32))
-        sensor_list.append((dd_enum_repository.DDConductivitySensorNames.D29_COND.name, dd_enum_repository.DDConductivityResistanceAttributes.CONDUCTIVITY.name, DataTypes.F32))
-        sensor_list.append((dd_enum_repository.DDConductivitySensorNames.D43_COND.name, dd_enum_repository.DDConductivityResistanceAttributes.CONDUCTIVITY.name, DataTypes.F32))
-        sensor_list.append((dd_enum_repository.DDConductivitySensorNames.D74_COND.name, dd_enum_repository.DDConductivityResistanceAttributes.CONDUCTIVITY.name, DataTypes.F32))
-        sensor_list.append((dd_enum_repository.DDConductivitySensorNames.D17_COND.name, dd_enum_repository.DDConductivityResistanceAttributes.CONDUCTIVITY_RESISTANCE.name,     DataTypes.F32))
-        sensor_list.append((dd_enum_repository.DDConductivitySensorNames.D27_COND.name, dd_enum_repository.DDConductivityResistanceAttributes.CONDUCTIVITY_RESISTANCE.name,     DataTypes.F32))
-        sensor_list.append((dd_enum_repository.DDConductivitySensorNames.D29_COND.name, dd_enum_repository.DDConductivityResistanceAttributes.CONDUCTIVITY_RESISTANCE.name,     DataTypes.F32))
-        sensor_list.append((dd_enum_repository.DDConductivitySensorNames.D43_COND.name, dd_enum_repository.DDConductivityResistanceAttributes.CONDUCTIVITY_RESISTANCE.name,     DataTypes.F32))
-        sensor_list.append((dd_enum_repository.DDConductivitySensorNames.D74_COND.name, dd_enum_repository.DDConductivityResistanceAttributes.CONDUCTIVITY_RESISTANCE.name,     DataTypes.F32))
-        sensor_list.append((dd_enum_repository.DDConductivitySensorNames.D17_COND.name, dd_enum_repository.DDConductivityResistanceAttributes.RTD_RESISTANCE.name,     DataTypes.F32))
-        sensor_list.append((dd_enum_repository.DDConductivitySensorNames.D27_COND.name, dd_enum_repository.DDConductivityResistanceAttributes.RTD_RESISTANCE.name,     DataTypes.F32))
-        sensor_list.append((dd_enum_repository.DDConductivitySensorNames.D29_COND.name, dd_enum_repository.DDConductivityResistanceAttributes.RTD_RESISTANCE.name,     DataTypes.F32))
-        sensor_list.append((dd_enum_repository.DDConductivitySensorNames.D43_COND.name, dd_enum_repository.DDConductivityResistanceAttributes.RTD_RESISTANCE.name,     DataTypes.F32))
-        sensor_list.append((dd_enum_repository.DDConductivitySensorNames.D74_COND.name, dd_enum_repository.DDConductivityResistanceAttributes.RTD_RESISTANCE.name,     DataTypes.F32))
-        sensor_list.append((dd_enum_repository.DDConductivitySensorNames.D17_COND.name, dd_enum_repository.DDConductivityResistanceAttributes.UNCOMPENSATED_COND.name,     DataTypes.F32))
-        sensor_list.append((dd_enum_repository.DDConductivitySensorNames.D27_COND.name, dd_enum_repository.DDConductivityResistanceAttributes.UNCOMPENSATED_COND.name,     DataTypes.F32))
-        sensor_list.append((dd_enum_repository.DDConductivitySensorNames.D29_COND.name, dd_enum_repository.DDConductivityResistanceAttributes.UNCOMPENSATED_COND.name,     DataTypes.F32))
-        sensor_list.append((dd_enum_repository.DDConductivitySensorNames.D43_COND.name, dd_enum_repository.DDConductivityResistanceAttributes.UNCOMPENSATED_COND.name,     DataTypes.F32))
-        sensor_list.append((dd_enum_repository.DDConductivitySensorNames.D74_COND.name, dd_enum_repository.DDConductivityResistanceAttributes.UNCOMPENSATED_COND.name,     DataTypes.F32))
+        msg_list =[]
+        msg_list.append((self.dd_conductivity, dd_enum_repository.DDConductivitySensorNames.D27_COND.name, dd_enum_repository.DDConductivityResistanceAttributes.CONDUCTIVITY.name,             DataTypes.F32))
+        msg_list.append((self.dd_conductivity, dd_enum_repository.DDConductivitySensorNames.D17_COND.name, dd_enum_repository.DDConductivityResistanceAttributes.CONDUCTIVITY.name,             DataTypes.F32))
+        msg_list.append((self.dd_conductivity, dd_enum_repository.DDConductivitySensorNames.D29_COND.name, dd_enum_repository.DDConductivityResistanceAttributes.CONDUCTIVITY.name,             DataTypes.F32))
+        msg_list.append((self.dd_conductivity, dd_enum_repository.DDConductivitySensorNames.D43_COND.name, dd_enum_repository.DDConductivityResistanceAttributes.CONDUCTIVITY.name,             DataTypes.F32))
+        msg_list.append((self.dd_conductivity, dd_enum_repository.DDConductivitySensorNames.D74_COND.name, dd_enum_repository.DDConductivityResistanceAttributes.CONDUCTIVITY.name,             DataTypes.F32))
+        msg_list.append((self.dd_conductivity, dd_enum_repository.DDConductivitySensorNames.D17_COND.name, dd_enum_repository.DDConductivityResistanceAttributes.CONDUCTIVITY_RESISTANCE.name,  DataTypes.F32))
+        msg_list.append((self.dd_conductivity, dd_enum_repository.DDConductivitySensorNames.D27_COND.name, dd_enum_repository.DDConductivityResistanceAttributes.CONDUCTIVITY_RESISTANCE.name,  DataTypes.F32))
+        msg_list.append((self.dd_conductivity, dd_enum_repository.DDConductivitySensorNames.D29_COND.name, dd_enum_repository.DDConductivityResistanceAttributes.CONDUCTIVITY_RESISTANCE.name,  DataTypes.F32))
+        msg_list.append((self.dd_conductivity, dd_enum_repository.DDConductivitySensorNames.D43_COND.name, dd_enum_repository.DDConductivityResistanceAttributes.CONDUCTIVITY_RESISTANCE.name,  DataTypes.F32))
+        msg_list.append((self.dd_conductivity, dd_enum_repository.DDConductivitySensorNames.D74_COND.name, dd_enum_repository.DDConductivityResistanceAttributes.CONDUCTIVITY_RESISTANCE.name,  DataTypes.F32))
+        msg_list.append((self.dd_conductivity, dd_enum_repository.DDConductivitySensorNames.D17_COND.name, dd_enum_repository.DDConductivityResistanceAttributes.RTD_RESISTANCE.name,           DataTypes.F32))
+        msg_list.append((self.dd_conductivity, dd_enum_repository.DDConductivitySensorNames.D27_COND.name, dd_enum_repository.DDConductivityResistanceAttributes.RTD_RESISTANCE.name,           DataTypes.F32))
+        msg_list.append((self.dd_conductivity, dd_enum_repository.DDConductivitySensorNames.D29_COND.name, dd_enum_repository.DDConductivityResistanceAttributes.RTD_RESISTANCE.name,           DataTypes.F32))
+        msg_list.append((self.dd_conductivity, dd_enum_repository.DDConductivitySensorNames.D43_COND.name, dd_enum_repository.DDConductivityResistanceAttributes.RTD_RESISTANCE.name,           DataTypes.F32))
+        msg_list.append((self.dd_conductivity, dd_enum_repository.DDConductivitySensorNames.D74_COND.name, dd_enum_repository.DDConductivityResistanceAttributes.RTD_RESISTANCE.name,           DataTypes.F32))
+        msg_list.append((self.dd_conductivity, dd_enum_repository.DDConductivitySensorNames.D17_COND.name, dd_enum_repository.DDConductivityResistanceAttributes.UNCOMPENSATED_COND.name,       DataTypes.F32))
+        msg_list.append((self.dd_conductivity, dd_enum_repository.DDConductivitySensorNames.D27_COND.name, dd_enum_repository.DDConductivityResistanceAttributes.UNCOMPENSATED_COND.name,       DataTypes.F32))
+        msg_list.append((self.dd_conductivity, dd_enum_repository.DDConductivitySensorNames.D29_COND.name, dd_enum_repository.DDConductivityResistanceAttributes.UNCOMPENSATED_COND.name,       DataTypes.F32))
+        msg_list.append((self.dd_conductivity, dd_enum_repository.DDConductivitySensorNames.D43_COND.name, dd_enum_repository.DDConductivityResistanceAttributes.UNCOMPENSATED_COND.name,       DataTypes.F32))
+        msg_list.append((self.dd_conductivity, dd_enum_repository.DDConductivitySensorNames.D74_COND.name, dd_enum_repository.DDConductivityResistanceAttributes.UNCOMPENSATED_COND.name,       DataTypes.F32))
 
-        self.process_into_vars(dict_to_update = self.dd_conductivity,
-                               decoder_list = sensor_list,
-                               message = message)
+        self.process_into_vars(decoder_list = msg_list, message = message)
         self.dd_conductivity_timestamp = timestamp
 
     @publish(["msg_id_dd_conductivity_version_data", "dd_conductivity_resistance", "dd_conductivity_version_timestamp"])
@@ -143,6 +157,7 @@
         #TODO: complete response handler
         self.dd_conductivity_version_timestamp = timestamp
 
+
     @publish(["msg_id_dd_conductivity_cal_data", "dd_conductivity_resistance", "dd_conductivity_cal_timestamp"])
     def _handler_conductivity_cal_sync(self, message, timestamp=0.0):
         """
@@ -153,6 +168,9 @@
         #TODO: complete response handler
         self.dd_conductivity_cal_timestamp = timestamp
 
+
+
+# ============================================================ Overrides and Requests ============================================================
     def cmd_conductivity_sensor_data_broadcast_interval_override(self, ms: int, reset: int = NO_RESET) -> int:
         """
         Constructs and sends the conductivity sensor data broadcast interval override command
@@ -382,4 +400,4 @@
                              entity_name = 'DD Conductivity Calibration Request',
                              override_text = 'N/A',
                              logger = self.logger,
-                             can_interface = self.can_interface)
\ No newline at end of file
+                             can_interface = self.can_interface)