Index: leahi_dialin/dd/modules/dialysate_pump.py
===================================================================
diff -u -r3f4937e339925dde0b95f08e49969f8983c5cba4 -reca9e15bc984af2b7f59eb38f3836ca354ee1251
--- leahi_dialin/dd/modules/dialysate_pump.py	(.../dialysate_pump.py)	(revision 3f4937e339925dde0b95f08e49969f8983c5cba4)
+++ leahi_dialin/dd/modules/dialysate_pump.py	(.../dialysate_pump.py)	(revision eca9e15bc984af2b7f59eb38f3836ca354ee1251)
@@ -51,8 +51,6 @@
                                                                        function = self._handler_dialysate_pumps_sync)
 
         self.dd_dialysate_pump_timestamp = 0                    #: The timestamp of the latest message
-
-        #: The Dialysate Pumps data in dictionary format
         self.dd_dialysate_pumps = {
             dd_enum_repository.DDDialysatePumpNames.D12_PUMP.name: {
                 dd_enum_repository.DDDialysatePumpAttributes.TARGET_RPM.name: 0.0,
@@ -81,6 +79,22 @@
         }
 
 
+
+# ============================================================ Properties ============================================================
+    @property
+    def dd_dialysate_pumps(self) -> dict:
+        """
+        The Dialysate Pumps data
+        """
+        return self._dialysate_pumps
+
+    @dd_dialysate_pumps.setter
+    def dd_dialysate_pumps(self, value):
+        self._dialysate_pumps = value
+
+
+
+# ============================================================ Handlers ============================================================
     @publish(["msg_id_dd_dialysate_pumps_data", "dd_dialysate_pumps", "dd_dialysate_pump_timestamp",])
     def _handler_dialysate_pumps_sync(self, message, timestamp=0.0):
         """
@@ -90,34 +104,34 @@
         @param message:  published dialysate pumps' data message
         @return: None
         """
-        sensor_list =[]
-        sensor_list.append((dd_enum_repository.DDDialysatePumpNames.D12_PUMP.name, dd_enum_repository.DDDialysatePumpAttributes.TARGET_RPM.name,               DataTypes.F32))
-        sensor_list.append((dd_enum_repository.DDDialysatePumpNames.D48_PUMP.name, dd_enum_repository.DDDialysatePumpAttributes.TARGET_RPM.name,               DataTypes.F32))
-        sensor_list.append((dd_enum_repository.DDDialysatePumpNames.D12_PUMP.name, dd_enum_repository.DDDialysatePumpAttributes.MEASURED_SPEED.name,           DataTypes.F32))
-        sensor_list.append((dd_enum_repository.DDDialysatePumpNames.D48_PUMP.name, dd_enum_repository.DDDialysatePumpAttributes.MEASURED_SPEED.name,           DataTypes.F32))
-        sensor_list.append((dd_enum_repository.DDDialysatePumpNames.D12_PUMP.name, dd_enum_repository.DDDialysatePumpAttributes.CURRENT_SPEED.name,            DataTypes.F32))
-        sensor_list.append((dd_enum_repository.DDDialysatePumpNames.D48_PUMP.name, dd_enum_repository.DDDialysatePumpAttributes.CURRENT_SPEED.name,            DataTypes.F32))
-        sensor_list.append((dd_enum_repository.DDDialysatePumpNames.D12_PUMP.name, dd_enum_repository.DDDialysatePumpAttributes.STATE.name,                    DataTypes.U32))
-        sensor_list.append((dd_enum_repository.DDDialysatePumpNames.D48_PUMP.name, dd_enum_repository.DDDialysatePumpAttributes.STATE.name,                    DataTypes.U32))
-        sensor_list.append((dd_enum_repository.DDDialysatePumpNames.D12_PUMP.name, dd_enum_repository.DDDialysatePumpAttributes.TARGET_PRESSURE.name,          DataTypes.F32))
-        sensor_list.append((dd_enum_repository.DDDialysatePumpNames.D48_PUMP.name, dd_enum_repository.DDDialysatePumpAttributes.TARGET_PRESSURE.name,          DataTypes.F32))
-        sensor_list.append((dd_enum_repository.DDDialysatePumpNames.D12_PUMP.name, dd_enum_repository.DDDialysatePumpAttributes.MEASURED_PRESSURE.name,        DataTypes.F32))
-        sensor_list.append((dd_enum_repository.DDDialysatePumpNames.D48_PUMP.name, dd_enum_repository.DDDialysatePumpAttributes.MEASURED_PRESSURE.name,        DataTypes.F32))
-        sensor_list.append((dd_enum_repository.DDDialysatePumpNames.D12_PUMP.name, dd_enum_repository.DDDialysatePumpAttributes.MEASURED_CURRENT.name,         DataTypes.F32))
-        sensor_list.append((dd_enum_repository.DDDialysatePumpNames.D48_PUMP.name, dd_enum_repository.DDDialysatePumpAttributes.MEASURED_CURRENT.name,         DataTypes.F32))
-        sensor_list.append((dd_enum_repository.DDDialysatePumpNames.D12_PUMP.name, dd_enum_repository.DDDialysatePumpAttributes.CONTROL.name,                  DataTypes.U32))
-        sensor_list.append((dd_enum_repository.DDDialysatePumpNames.D48_PUMP.name, dd_enum_repository.DDDialysatePumpAttributes.CONTROL.name,                  DataTypes.U32))
-        sensor_list.append((dd_enum_repository.DDDialysatePumpNames.D12_PUMP.name, dd_enum_repository.DDDialysatePumpAttributes.DIRECTION_ERROR_COUNT.name,    DataTypes.U32))
-        sensor_list.append((dd_enum_repository.DDDialysatePumpNames.D48_PUMP.name, dd_enum_repository.DDDialysatePumpAttributes.DIRECTION_ERROR_COUNT.name,    DataTypes.U32))
-        sensor_list.append((dd_enum_repository.DDDialysatePumpNames.D12_PUMP.name, dd_enum_repository.DDDialysatePumpAttributes.MEASURED_DIRECTION.name,       DataTypes.U32))
-        sensor_list.append((dd_enum_repository.DDDialysatePumpNames.D48_PUMP.name, dd_enum_repository.DDDialysatePumpAttributes.MEASURED_DIRECTION.name,       DataTypes.U32))
+        msg_list =[]
+        msg_list.append((self.dd_dialysate_pumps, dd_enum_repository.DDDialysatePumpNames.D12_PUMP.name, dd_enum_repository.DDDialysatePumpAttributes.TARGET_RPM.name,               DataTypes.F32))
+        msg_list.append((self.dd_dialysate_pumps, dd_enum_repository.DDDialysatePumpNames.D48_PUMP.name, dd_enum_repository.DDDialysatePumpAttributes.TARGET_RPM.name,               DataTypes.F32))
+        msg_list.append((self.dd_dialysate_pumps, dd_enum_repository.DDDialysatePumpNames.D12_PUMP.name, dd_enum_repository.DDDialysatePumpAttributes.MEASURED_SPEED.name,           DataTypes.F32))
+        msg_list.append((self.dd_dialysate_pumps, dd_enum_repository.DDDialysatePumpNames.D48_PUMP.name, dd_enum_repository.DDDialysatePumpAttributes.MEASURED_SPEED.name,           DataTypes.F32))
+        msg_list.append((self.dd_dialysate_pumps, dd_enum_repository.DDDialysatePumpNames.D12_PUMP.name, dd_enum_repository.DDDialysatePumpAttributes.CURRENT_SPEED.name,            DataTypes.F32))
+        msg_list.append((self.dd_dialysate_pumps, dd_enum_repository.DDDialysatePumpNames.D48_PUMP.name, dd_enum_repository.DDDialysatePumpAttributes.CURRENT_SPEED.name,            DataTypes.F32))
+        msg_list.append((self.dd_dialysate_pumps, dd_enum_repository.DDDialysatePumpNames.D12_PUMP.name, dd_enum_repository.DDDialysatePumpAttributes.STATE.name,                    DataTypes.U32))
+        msg_list.append((self.dd_dialysate_pumps, dd_enum_repository.DDDialysatePumpNames.D48_PUMP.name, dd_enum_repository.DDDialysatePumpAttributes.STATE.name,                    DataTypes.U32))
+        msg_list.append((self.dd_dialysate_pumps, dd_enum_repository.DDDialysatePumpNames.D12_PUMP.name, dd_enum_repository.DDDialysatePumpAttributes.TARGET_PRESSURE.name,          DataTypes.F32))
+        msg_list.append((self.dd_dialysate_pumps, dd_enum_repository.DDDialysatePumpNames.D48_PUMP.name, dd_enum_repository.DDDialysatePumpAttributes.TARGET_PRESSURE.name,          DataTypes.F32))
+        msg_list.append((self.dd_dialysate_pumps, dd_enum_repository.DDDialysatePumpNames.D12_PUMP.name, dd_enum_repository.DDDialysatePumpAttributes.MEASURED_PRESSURE.name,        DataTypes.F32))
+        msg_list.append((self.dd_dialysate_pumps, dd_enum_repository.DDDialysatePumpNames.D48_PUMP.name, dd_enum_repository.DDDialysatePumpAttributes.MEASURED_PRESSURE.name,        DataTypes.F32))
+        msg_list.append((self.dd_dialysate_pumps, dd_enum_repository.DDDialysatePumpNames.D12_PUMP.name, dd_enum_repository.DDDialysatePumpAttributes.MEASURED_CURRENT.name,         DataTypes.F32))
+        msg_list.append((self.dd_dialysate_pumps, dd_enum_repository.DDDialysatePumpNames.D48_PUMP.name, dd_enum_repository.DDDialysatePumpAttributes.MEASURED_CURRENT.name,         DataTypes.F32))
+        msg_list.append((self.dd_dialysate_pumps, dd_enum_repository.DDDialysatePumpNames.D12_PUMP.name, dd_enum_repository.DDDialysatePumpAttributes.CONTROL.name,                  DataTypes.U32))
+        msg_list.append((self.dd_dialysate_pumps, dd_enum_repository.DDDialysatePumpNames.D48_PUMP.name, dd_enum_repository.DDDialysatePumpAttributes.CONTROL.name,                  DataTypes.U32))
+        msg_list.append((self.dd_dialysate_pumps, dd_enum_repository.DDDialysatePumpNames.D12_PUMP.name, dd_enum_repository.DDDialysatePumpAttributes.DIRECTION_ERROR_COUNT.name,    DataTypes.U32))
+        msg_list.append((self.dd_dialysate_pumps, dd_enum_repository.DDDialysatePumpNames.D48_PUMP.name, dd_enum_repository.DDDialysatePumpAttributes.DIRECTION_ERROR_COUNT.name,    DataTypes.U32))
+        msg_list.append((self.dd_dialysate_pumps, dd_enum_repository.DDDialysatePumpNames.D12_PUMP.name, dd_enum_repository.DDDialysatePumpAttributes.MEASURED_DIRECTION.name,       DataTypes.U32))
+        msg_list.append((self.dd_dialysate_pumps, dd_enum_repository.DDDialysatePumpNames.D48_PUMP.name, dd_enum_repository.DDDialysatePumpAttributes.MEASURED_DIRECTION.name,       DataTypes.U32))
 
-        self.process_into_vars(dict_to_update = self.dd_dialysate_pumps,
-                               decoder_list = sensor_list,
-                               message = message)
+        self.process_into_vars(decoder_list = msg_list, message = message)
         self.dd_dialysate_pump_timestamp = timestamp
 
 
+
+# ============================================================ Overrides and Requests ============================================================
     def cmd_dialysate_pump_broadcast_interval_override(self, ms: int, reset: int = NO_RESET) -> int:
         """
         Constructs and sends the dialysate pump data broadcast interval override command