Index: AlarmDefs.h
===================================================================
diff -u -r7e1f5060de4db62fe91d0d5d0e3289262f4c6ed1 -r2f61cff62979091f04f7e914b550d9ca30a2e3b8
--- AlarmDefs.h	(.../AlarmDefs.h)	(revision 7e1f5060de4db62fe91d0d5d0e3289262f4c6ed1)
+++ AlarmDefs.h	(.../AlarmDefs.h)	(revision 2f61cff62979091f04f7e914b550d9ca30a2e3b8)
@@ -82,6 +82,8 @@
     ALARM_ID_DIAL_OUT_PUMP_MOTOR_SPEED_CHECK = 57,                  ///< Dialysate outlet pump failed motor speed check.  Measured vs. commanded.
     ALARM_ID_BLOOD_PUMP_ROTOR_SPEED_TOO_HIGH = 58,                  ///< Blood pump rotor speed too high.
     ALARM_ID_INLET_WATER_TEMPERATURE_OUT_OF_RANGE = 59,             ///< Intel water temperature out of range
+    ALARM_ID_INLET_WATER_LOW_CONDUCITIVY = 60,                      ///< Intel water conductivity too low
+    ALARM_ID_INLET_WATER_HIGH_CONDUCITIVY = 61,                     ///< Intel water conductivity too high
     NUM_OF_ALARM_IDS                                                ///< Total # of alarms.
 };
 /// Type for alarm list enumeration.
Index: MsgDefs.h
===================================================================
diff -u -r85a02379bdc9795998875f5531dd8c6124fe001a -r2f61cff62979091f04f7e914b550d9ca30a2e3b8
--- MsgDefs.h	(.../MsgDefs.h)	(revision 85a02379bdc9795998875f5531dd8c6124fe001a)
+++ MsgDefs.h	(.../MsgDefs.h)	(revision 2f61cff62979091f04f7e914b550d9ca30a2e3b8)
@@ -71,6 +71,7 @@
     MSG_ID_USER_UF_SETTINGS_CHANGE_CONFIRMATION_RESPONSE = 0x2E,        ///< HD response to user selection of ultrafiltration settings change option selection.
     MSG_ID_DG_START_STOP_HEAT_DISINFECT = 0x2F,                         ///< HD request to start or stop DG heat disinfection.
     MSG_ID_SALINE_BOLUS_DATA = 0x30,                                    ///< HD broadcast of saline bolus data.
+    MSG_ID_DG_CONDUCTIVITY_DATA = 0x31,                                 ///< DG broadcast of the conductivity sensors data
 #ifdef EMC_TEST_BUILD
     MSG_ID_CAN_ERROR_COUNT = 0x999,  // test code in support of EMC testing
 #endif
@@ -138,6 +139,8 @@
     MSG_ID_TEMPERATURE_SENSORS_PUBLISH_INTERVAL_OVERRIDE = 0xA012,      ///< Temperature sensors data publish override
     MSG_ID_HEATERS_PUBLISH_INTERVAL_ORVERRIDE = 0xA013,                 ///< Heaters data publish override
     MSG_ID_DG_SAFETY_SHUTDOWN_OVERRIDE = 0xA014,                        ///< DG safety shutdown override request.
+    MSG_ID_CONDUCTIVITY_OVERRIDE = 0xA015,                              ///< Conductivity sensor override request.
+    MSG_ID_CONDUCTIVITY_PUBLISH_INTERVAL_OVERRIDE = 0xA016,             ///< Conductivity sensors data publish override
 
     MSG_ID_HD_DEBUG_EVENT = 0xFFF1,                                     ///< HD debug event text to be logged in event log.
     MSG_ID_DG_DEBUG_EVENT = 0xFFF2,                                     ///< DG debug event text to be logged in event log.