Index: leahi_dialin/common/dd_defs.py
===================================================================
diff -u -r465679409a5fe6f6007ddffca1fd3e89ead9d9c4 -r5994adea1a1022175f9cc4e6dacfa02de3fc45a0
--- leahi_dialin/common/dd_defs.py	(.../dd_defs.py)	(revision 465679409a5fe6f6007ddffca1fd3e89ead9d9c4)
+++ leahi_dialin/common/dd_defs.py	(.../dd_defs.py)	(revision 5994adea1a1022175f9cc4e6dacfa02de3fc45a0)
@@ -329,8 +329,13 @@
     DD_EVENT_BLOOD_LEAK_ZEROING_REQUEST                     = 10            # DD blood leak zeroing request
     DD_EVENT_BLOOD_LEAK_ZEROING_REQUIRED                    = 11            # DD blood leak zeroing required
     DD_EVENT_BLOOD_LEAK_NUM_OF_SET_POINT_CHECK_FAILURES     = 12            # DD blood leak number of setpoint check failures
-    DD_EVENT_BLOOD_LEAK_SELF_TEST_RESULT                    = 13            # DD blood leak self test result
-    NUM_OF_DD_EVENT_IDS                                     = 14            # Total number of DD events
+    DD_EVENT_CPU_RAM_ERROR_STATUS                           = 13            # DD CPU RAM error
+    DD_EVENT_BLOOD_LEAK_SELF_TEST_RESULT                    = 14            # DD blood leak self test result
+    DD_EVENT_BC_SWITCH_ONLY_MODE_CHANGE                     = 15            # DD Balancing Chamber Switching Only status event
+    DD_EVENT_BC_FILL_STATE_CHANGE                           = 16            # Balancing chamber state switch event
+    DD_EVENT_HEATER_STATE_CHANGE                            = 17            # DD heater state change event
+    DD_EVENT_DRY_BICART_STATE_CHANGE                        = 18            # DD Dry Bicart State change event
+    NUM_OF_DD_EVENT_IDS                                     = 19            # Total number of DD events
     
 DDEventList._str_list = {
     # Official Name :       Accepted strings
@@ -347,6 +352,11 @@
     'DD_EVENT_BLOOD_LEAK_ZEROING_REQUIRED': ['blood leak zeroing required'],
     'DD_EVENT_BLOOD_LEAK_NUM_OF_SET_POINT_CHECK_FAILURES': ['blood leak check failed'],
     'DD_EVENT_BLOOD_LEAK_SELF_TEST_RESULT': ['blood leak self test'],
+    'DD_EVENT_CPU_RAM_ERROR_STATUS': ['cpu ram error status', 'cpu error status', 'ram error status', 'memory error status'],
+    'DD_EVENT_BC_SWITCH_ONLY_MODE_CHANGE': ['bc switch only change'],
+    'DD_EVENT_BC_FILL_STATE_CHANGE': ['bc state change'],
+    'DD_EVENT_HEATER_STATE_CHANGE': ['heater state change'],
+    'DD_EVENT_DRY_BICART_STATE_CHANGE': ['dry bicart state change'],
     'NUM_OF_DD_EVENT_IDS': [],
 }
 
@@ -521,7 +531,7 @@
 
 DDTemperatureSensorNames._str_list = {
     # Official Name :       Accepted strings
-    'D16_TEMP': ['d1'],
+    'D1_TEMP': ['d1'],
     'D78_TEMP': ['d78'],
     'D4_TEMP': ['d4'],
     'D50_TEMP': ['d50'],
@@ -537,6 +547,7 @@
     'D99_AVG_TEMP': ['d99 avg', 'd99 average'],
     'D28_AVG_TEMP': ['d28 avg', 'd28 average'],
     'D30_AVG_TEMP': ['d39 avg', 'd39 average'],
+    'D1_AVG_TEMP': ['d1 avg', 'd1 average'],
     'D9_TEMP': ['d9'],
     'D66_TEMP': ['d66'],
     'D51_TEMP': ['d51'],
@@ -998,6 +1009,7 @@
     'NUM_OF_CANCELLATION_MODES': [],
 }
 
+
 @unique
 class DDSubstitutionPumpAttributes(DialinEnum):
     TARGET_SPEED                        = 0                     # Target RPM Substitution Pump Attribute
@@ -1014,3 +1026,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