Index: leahi_dialin/common/dd_defs.py
===================================================================
diff -u -r27cd8e0e7b47617083e8c12f73306f0ba648e687 -r47f0a02ea1c25f2d9b3f9e7a0f3ac722d4f53a7b
--- leahi_dialin/common/dd_defs.py	(.../dd_defs.py)	(revision 27cd8e0e7b47617083e8c12f73306f0ba648e687)
+++ leahi_dialin/common/dd_defs.py	(.../dd_defs.py)	(revision 47f0a02ea1c25f2d9b3f9e7a0f3ac722d4f53a7b)
@@ -450,7 +450,18 @@
     'NUM_OF_PISTON_PUMPS': [],
 }
 
+@unique
+class DDSubstitutionPumpNames(DialinEnum):
+    D92_PUMP            = 0                                     # HDF Substitution pump
+    NUM_OF_SUB_PUMPS    = 1                                     # Number of substituion pumps
 
+DDSubstitutionPumpNames._str_list = {
+    # Official Name :       Accepted strings
+    'D92_PUMP': ['d92', 'sub pump'],
+    'NUM_OF_SUB_PUMPS': [],
+}
+
+
 @unique
 class DDPressureSensorNames(DialinEnum):
     D9_PRES                 = 0                                 # Hydraulics outlet pressure (PHo/Pn)
@@ -491,13 +502,14 @@
     D28_AVG_TEMP        = 14                                    # D28 Filtered value
     D30_AVG_TEMP        = 15                                    # D30 Filtered value
     D78_AVG_TEMP        = 16                                    # D78 Filtered value
-    D9_TEMP             = 17                                    # D9 Pressure sensor temperature value
-    D66_TEMP            = 18                                    # D66 Pressure sensor temperature value
-    D51_TEMP            = 19                                    # D51 Pressure sensor temperature value
-    D18_TEMP            = 20                                    # D18 Pressure sensor temperature value
-    D41_TEMP            = 21                                    # D41 Pressure sensor temperature value
-    D87_TEMP            = 22                                    # D87 Pressure sensor temperature value
-    NUM_OF_TEMP_SENSORS = 23                                    # Number of Temperature Sensors
+    D1_AVG_TEMP         = 17                                    # D1 Filtered value
+    D9_TEMP             = 18                                    # D9 Pressure sensor temperature value
+    D66_TEMP            = 19                                    # D66 Pressure sensor temperature value
+    D51_TEMP            = 20                                    # D51 Pressure sensor temperature value
+    D18_TEMP            = 21                                    # D18 Pressure sensor temperature value
+    D41_TEMP            = 22                                    # D41 Pressure sensor temperature value
+    D87_TEMP            = 23                                    # D87 Pressure sensor temperature value
+    NUM_OF_TEMP_SENSORS = 24                                    # Number of Temperature Sensors
 
     # Aliases
     FIRST_PRESSURE_SENSOR       = D9_TEMP
@@ -985,3 +997,35 @@
     'CANCELLATION_MODE_WATER': ['water'],
     'NUM_OF_CANCELLATION_MODES': [],
 }
+
+
+@unique
+class DDSubstitutionPumpAttributes(DialinEnum):
+    TARGET_SPEED                        = 0                     # Target RPM Substitution Pump Attribute
+    CURRENT_SPEED                       = 1                     # Current Speed Substitution Pump Attribute
+    STATE                               = 2                     # State to command Substitution Pump Attribute
+    MEASURED_SPEED                      = 3                     # Measured Speed Substitution Pump Attribute
+    NUM_OF_DIALYSATE_PUMP_ATTRIBUTES    = 4                     # Number of Substitution Pump Attributes
+
+DDSubstitutionPumpAttributes._str_list = {
+    # Official Name :       Accepted strings
+    'TARGET_SPEED': ['target rp,'],
+    'CURRENT_SPEED': ['current speed'],
+    'STATE': ['state'],
+    'MEASURED_SPEED': ['measured speed'],
+    'NUM_OF_DIALYSATE_PUMP_ATTRIBUTES': [],
+}
+
+
+@unique
+class DDConductivityResistanceAttributes(DialinEnum):
+    RAW_RESISTANCE                      = 0                     # Raw Conductivity resistance Attribute
+    RTD_RESISTANCE                      = 1                     # raw RTD resistance Attribute
+    NUM_OF_RESISTANCE_ATTRIBUTES        = 2                     # Number of conductivity sensor Attributes
+
+DDConductivityResistanceAttributes._str_list = {
+    # Official Name :       Accepted strings
+    'RAW_RESISTANCE': ['cond resistance,'],
+    'RTD_RESISTANCE': ['rtd resistance'],
+    'NUM_OF_RESISTANCE_ATTRIBUTES': [],
+}
\ No newline at end of file