Index: leahi_dialin/common/dd_defs.py
===================================================================
diff -u -r7a7b289d28b91a8cf9ddbd6d5db542abaee9721f -r8ef0478470000c7e0de4dc05440521c955e18107
--- leahi_dialin/common/dd_defs.py	(.../dd_defs.py)	(revision 7a7b289d28b91a8cf9ddbd6d5db542abaee9721f)
+++ leahi_dialin/common/dd_defs.py	(.../dd_defs.py)	(revision 8ef0478470000c7e0de4dc05440521c955e18107)
@@ -502,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
@@ -996,18 +997,8 @@
     'CANCELLATION_MODE_WATER': ['water'],
     'NUM_OF_CANCELLATION_MODES': [],
 }
-@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': [],
-}
+
 @unique
 class DDSubstitutionPumpAttributes(DialinEnum):
     TARGET_SPEED                        = 0                     # Target RPM Substitution Pump Attribute
@@ -1024,3 +1015,17 @@
     '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