Index: leahi_dialin/dd/modules/dialysate_pump.py
===================================================================
diff -u -re7d16bd6881619e5fc2a0bc1a7fd578a9978498e -r52aa7af16b98730ba59fc2577dbe8f73b5959775
--- leahi_dialin/dd/modules/dialysate_pump.py	(.../dialysate_pump.py)	(revision e7d16bd6881619e5fc2a0bc1a7fd578a9978498e)
+++ leahi_dialin/dd/modules/dialysate_pump.py	(.../dialysate_pump.py)	(revision 52aa7af16b98730ba59fc2577dbe8f73b5959775)
@@ -19,7 +19,7 @@
 
 from .constants import RESET, NO_RESET
 from leahi_dialin.common.msg_defs import MsgIds, MsgFieldPositions
-from leahi_dialin.common.dd_defs import DialysatePumpsEnum, DialysatePumpAttributesEnum, DDDialysatePumpsStates
+from leahi_dialin.common.dd_defs import DDDialysatePumpsEnum, DDDialysatePumpAttributesEnum, DDDialysatePumpsStates
 from leahi_dialin.protocols.CAN import DenaliMessage, DenaliChannels
 from leahi_dialin.utils.base import AbstractSubSystem, publish, DialinEnum
 from leahi_dialin.utils.checks import check_broadcast_interval_override_ms
@@ -50,29 +50,29 @@
                                                                        self._handler_dialysate_pumps_sync)
 
         self.dd_dialysate_pumps = {
-            DialysatePumpsEnum.D12_PUMP.name: {
-                DialysatePumpAttributesEnum.TARGET_RPM.name: 0.0,
-                DialysatePumpAttributesEnum.MEASURED_SPEED.name: 0.0,
-                DialysatePumpAttributesEnum.CURRENT_SPEED.name: 0.0,
-                DialysatePumpAttributesEnum.STATE.name: 0.0,
-                DialysatePumpAttributesEnum.TARGET_PRESSURE.name: 0.0,
-                DialysatePumpAttributesEnum.MEASURED_PRESSURE.name: 0.0,
-                DialysatePumpAttributesEnum.MEASURED_CURRENT.name: 0.0,
-                DialysatePumpAttributesEnum.CONTROL.name: 0.0,
-                DialysatePumpAttributesEnum.DIRECTION_ERROR_COUNT.name: 0.0,
-                DialysatePumpAttributesEnum.MEASURED_DIRECTION.name: 0.0
+            DDDialysatePumpsEnum.D12_PUMP.name: {
+                DDDialysatePumpAttributesEnum.TARGET_RPM.name: 0.0,
+                DDDialysatePumpAttributesEnum.MEASURED_SPEED.name: 0.0,
+                DDDialysatePumpAttributesEnum.CURRENT_SPEED.name: 0.0,
+                DDDialysatePumpAttributesEnum.STATE.name: 0.0,
+                DDDialysatePumpAttributesEnum.TARGET_PRESSURE.name: 0.0,
+                DDDialysatePumpAttributesEnum.MEASURED_PRESSURE.name: 0.0,
+                DDDialysatePumpAttributesEnum.MEASURED_CURRENT.name: 0.0,
+                DDDialysatePumpAttributesEnum.CONTROL.name: 0.0,
+                DDDialysatePumpAttributesEnum.DIRECTION_ERROR_COUNT.name: 0.0,
+                DDDialysatePumpAttributesEnum.MEASURED_DIRECTION.name: 0.0
             },
-            DialysatePumpsEnum.D48_PUMP.name: {
-                DialysatePumpAttributesEnum.TARGET_RPM.name: 0.0,
-                DialysatePumpAttributesEnum.MEASURED_SPEED.name: 0.0,
-                DialysatePumpAttributesEnum.CURRENT_SPEED.name: 0.0,
-                DialysatePumpAttributesEnum.STATE.name: 0.0,
-                DialysatePumpAttributesEnum.TARGET_PRESSURE.name: 0.0,
-                DialysatePumpAttributesEnum.MEASURED_PRESSURE.name: 0.0,
-                DialysatePumpAttributesEnum.MEASURED_CURRENT.name: 0.0,
-                DialysatePumpAttributesEnum.CONTROL.name: 0.0,
-                DialysatePumpAttributesEnum.DIRECTION_ERROR_COUNT.name: 0.0,
-                DialysatePumpAttributesEnum.MEASURED_DIRECTION.name: 0.0
+            DDDialysatePumpsEnum.D48_PUMP.name: {
+                DDDialysatePumpAttributesEnum.TARGET_RPM.name: 0.0,
+                DDDialysatePumpAttributesEnum.MEASURED_SPEED.name: 0.0,
+                DDDialysatePumpAttributesEnum.CURRENT_SPEED.name: 0.0,
+                DDDialysatePumpAttributesEnum.STATE.name: 0.0,
+                DDDialysatePumpAttributesEnum.TARGET_PRESSURE.name: 0.0,
+                DDDialysatePumpAttributesEnum.MEASURED_PRESSURE.name: 0.0,
+                DDDialysatePumpAttributesEnum.MEASURED_CURRENT.name: 0.0,
+                DDDialysatePumpAttributesEnum.CONTROL.name: 0.0,
+                DDDialysatePumpAttributesEnum.DIRECTION_ERROR_COUNT.name: 0.0,
+                DDDialysatePumpAttributesEnum.MEASURED_DIRECTION.name: 0.0
             }
         }
 
@@ -88,54 +88,54 @@
         @return: None
         """
 
-        self.dd_dialysate_pumps[DialysatePumpsEnum.D12_PUMP.name][DialysatePumpAttributesEnum.TARGET_RPM.name] = (
+        self.dd_dialysate_pumps[DDDialysatePumpsEnum.D12_PUMP.name][DDDialysatePumpAttributesEnum.TARGET_RPM.name] = (
             struct.unpack('f', bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_1:MsgFieldPositions.END_POS_FIELD_1])))[0]
-        self.dd_dialysate_pumps[DialysatePumpsEnum.D48_PUMP.name][DialysatePumpAttributesEnum.TARGET_RPM.name] = (
+        self.dd_dialysate_pumps[DDDialysatePumpsEnum.D48_PUMP.name][DDDialysatePumpAttributesEnum.TARGET_RPM.name] = (
             struct.unpack('f', bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_2:MsgFieldPositions.END_POS_FIELD_2])))[0]
 
-        self.dd_dialysate_pumps[DialysatePumpsEnum.D12_PUMP.name][DialysatePumpAttributesEnum.MEASURED_SPEED.name] = (
+        self.dd_dialysate_pumps[DDDialysatePumpsEnum.D12_PUMP.name][DDDialysatePumpAttributesEnum.MEASURED_SPEED.name] = (
             struct.unpack('f', bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_3:MsgFieldPositions.END_POS_FIELD_3])))[0]
-        self.dd_dialysate_pumps[DialysatePumpsEnum.D48_PUMP.name][DialysatePumpAttributesEnum.MEASURED_SPEED.name] = (
+        self.dd_dialysate_pumps[DDDialysatePumpsEnum.D48_PUMP.name][DDDialysatePumpAttributesEnum.MEASURED_SPEED.name] = (
             struct.unpack('f', bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_4:MsgFieldPositions.END_POS_FIELD_4])))[0]
 
-        self.dd_dialysate_pumps[DialysatePumpsEnum.D12_PUMP.name][DialysatePumpAttributesEnum.CURRENT_SPEED.name] = (
+        self.dd_dialysate_pumps[DDDialysatePumpsEnum.D12_PUMP.name][DDDialysatePumpAttributesEnum.CURRENT_SPEED.name] = (
             struct.unpack('f', bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_5:MsgFieldPositions.END_POS_FIELD_5])))[0]
-        self.dd_dialysate_pumps[DialysatePumpsEnum.D48_PUMP.name][DialysatePumpAttributesEnum.CURRENT_SPEED.name] = (
+        self.dd_dialysate_pumps[DDDialysatePumpsEnum.D48_PUMP.name][DDDialysatePumpAttributesEnum.CURRENT_SPEED.name] = (
             struct.unpack('f', bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_6:MsgFieldPositions.END_POS_FIELD_6])))[0]
 
-        self.dd_dialysate_pumps[DialysatePumpsEnum.D12_PUMP.name][DialysatePumpAttributesEnum.STATE.name] = (
+        self.dd_dialysate_pumps[DDDialysatePumpsEnum.D12_PUMP.name][DDDialysatePumpAttributesEnum.STATE.name] = (
             struct.unpack('i', bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_7:MsgFieldPositions.END_POS_FIELD_7])))[0]
-        self.dd_dialysate_pumps[DialysatePumpsEnum.D48_PUMP.name][DialysatePumpAttributesEnum.STATE.name] = (
+        self.dd_dialysate_pumps[DDDialysatePumpsEnum.D48_PUMP.name][DDDialysatePumpAttributesEnum.STATE.name] = (
             struct.unpack('i', bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_8:MsgFieldPositions.END_POS_FIELD_8])))[0]
 
-        self.dd_dialysate_pumps[DialysatePumpsEnum.D12_PUMP.name][DialysatePumpAttributesEnum.TARGET_PRESSURE.name] = (
+        self.dd_dialysate_pumps[DDDialysatePumpsEnum.D12_PUMP.name][DDDialysatePumpAttributesEnum.TARGET_PRESSURE.name] = (
             struct.unpack('f', bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_9:MsgFieldPositions.END_POS_FIELD_9])))[0]
-        self.dd_dialysate_pumps[DialysatePumpsEnum.D48_PUMP.name][DialysatePumpAttributesEnum.TARGET_PRESSURE.name] = (
+        self.dd_dialysate_pumps[DDDialysatePumpsEnum.D48_PUMP.name][DDDialysatePumpAttributesEnum.TARGET_PRESSURE.name] = (
             struct.unpack('f', bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_10:MsgFieldPositions.END_POS_FIELD_10])))[0]
 
-        self.dd_dialysate_pumps[DialysatePumpsEnum.D12_PUMP.name][DialysatePumpAttributesEnum.MEASURED_PRESSURE.name] = (
+        self.dd_dialysate_pumps[DDDialysatePumpsEnum.D12_PUMP.name][DDDialysatePumpAttributesEnum.MEASURED_PRESSURE.name] = (
             struct.unpack('f', bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_11:MsgFieldPositions.END_POS_FIELD_11])))[0]
-        self.dd_dialysate_pumps[DialysatePumpsEnum.D48_PUMP.name][DialysatePumpAttributesEnum.MEASURED_PRESSURE.name] = (
+        self.dd_dialysate_pumps[DDDialysatePumpsEnum.D48_PUMP.name][DDDialysatePumpAttributesEnum.MEASURED_PRESSURE.name] = (
             struct.unpack('f', bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_12:MsgFieldPositions.END_POS_FIELD_12])))[0]
 
-        self.dd_dialysate_pumps[DialysatePumpsEnum.D12_PUMP.name][DialysatePumpAttributesEnum.MEASURED_CURRENT.name] = (
+        self.dd_dialysate_pumps[DDDialysatePumpsEnum.D12_PUMP.name][DDDialysatePumpAttributesEnum.MEASURED_CURRENT.name] = (
             struct.unpack('f', bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_13:MsgFieldPositions.END_POS_FIELD_13])))[0]
-        self.dd_dialysate_pumps[DialysatePumpsEnum.D48_PUMP.name][DialysatePumpAttributesEnum.MEASURED_CURRENT.name] = (
+        self.dd_dialysate_pumps[DDDialysatePumpsEnum.D48_PUMP.name][DDDialysatePumpAttributesEnum.MEASURED_CURRENT.name] = (
             struct.unpack('f', bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_14:MsgFieldPositions.END_POS_FIELD_14])))[0]
 
-        self.dd_dialysate_pumps[DialysatePumpsEnum.D12_PUMP.name][DialysatePumpAttributesEnum.CONTROL.name] = (
+        self.dd_dialysate_pumps[DDDialysatePumpsEnum.D12_PUMP.name][DDDialysatePumpAttributesEnum.CONTROL.name] = (
             struct.unpack('i', bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_15:MsgFieldPositions.END_POS_FIELD_15])))[0]
-        self.dd_dialysate_pumps[DialysatePumpsEnum.D48_PUMP.name][DialysatePumpAttributesEnum.CONTROL.name] = (
+        self.dd_dialysate_pumps[DDDialysatePumpsEnum.D48_PUMP.name][DDDialysatePumpAttributesEnum.CONTROL.name] = (
             struct.unpack('i', bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_16:MsgFieldPositions.END_POS_FIELD_16])))[0]
 
-        self.dd_dialysate_pumps[DialysatePumpsEnum.D12_PUMP.name][DialysatePumpAttributesEnum.DIRECTION_ERROR_COUNT.name] = (
+        self.dd_dialysate_pumps[DDDialysatePumpsEnum.D12_PUMP.name][DDDialysatePumpAttributesEnum.DIRECTION_ERROR_COUNT.name] = (
             struct.unpack('i', bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_17:MsgFieldPositions.END_POS_FIELD_17])))[0]
-        self.dd_dialysate_pumps[DialysatePumpsEnum.D48_PUMP.name][DialysatePumpAttributesEnum.DIRECTION_ERROR_COUNT.name] = (
+        self.dd_dialysate_pumps[DDDialysatePumpsEnum.D48_PUMP.name][DDDialysatePumpAttributesEnum.DIRECTION_ERROR_COUNT.name] = (
             struct.unpack('i', bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_18:MsgFieldPositions.END_POS_FIELD_18])))[0]
 
-        self.dd_dialysate_pumps[DialysatePumpsEnum.D12_PUMP.name][DialysatePumpAttributesEnum.MEASURED_DIRECTION.name] = (
+        self.dd_dialysate_pumps[DDDialysatePumpsEnum.D12_PUMP.name][DDDialysatePumpAttributesEnum.MEASURED_DIRECTION.name] = (
             struct.unpack('i', bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_19:MsgFieldPositions.END_POS_FIELD_19])))[0]
-        self.dd_dialysate_pumps[DialysatePumpsEnum.D48_PUMP.name][DialysatePumpAttributesEnum.MEASURED_DIRECTION.name] = (
+        self.dd_dialysate_pumps[DDDialysatePumpsEnum.D48_PUMP.name][DDDialysatePumpAttributesEnum.MEASURED_DIRECTION.name] = (
             struct.unpack('i', bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_20:MsgFieldPositions.END_POS_FIELD_20])))[0]
 
         self.dd_dialysate_pump_timestamp = timestamp