Index: AlarmDefs.h
===================================================================
diff -u -r7e1f5060de4db62fe91d0d5d0e3289262f4c6ed1 -r9aa512200939748404936f730e9b4027de78640d
--- AlarmDefs.h	(.../AlarmDefs.h)	(revision 7e1f5060de4db62fe91d0d5d0e3289262f4c6ed1)
+++ AlarmDefs.h	(.../AlarmDefs.h)	(revision 9aa512200939748404936f730e9b4027de78640d)
@@ -23,7 +23,7 @@
 enum Alarm_List
 {
     ALARM_ID_NO_ALARM = 0,                                          ///< Indication for when no alarms is a possible situation.
-    ALARM_ID_SOFTWARE_FAULT = 1,                                    ///< Software fault.  Software found itself in an unexpected state.
+    ALARM_ID_HD_SOFTWARE_FAULT = 1,                                 ///< HD Software fault.  Software found itself in an unexpected state.
     ALARM_ID_STUCK_BUTTON_TEST_FAILED = 2,                          ///< Stuck button POST failure.  Stop or Off button detected to be pressed for at least 1 second during test shortly after power up.
     ALARM_ID_FPGA_POST_TEST_FAILED = 3,                             ///< FPGA POST failure.
     ALARM_ID_WATCHDOG_POST_TEST_FAILED = 4,                         ///< Watchdog POST failure.
@@ -81,7 +81,11 @@
     ALARM_ID_DIAL_IN_PUMP_MOTOR_SPEED_CHECK = 56,                   ///< Dialysate inlet pump failed motor speed check.  Measured vs. commanded.
     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_TEMPERATURE_OUT_OF_RANGE = 59,             ///< Inlet water temperature out of range.
+    ALARM_ID_INLET_WATER_LOW_CONDUCTIVITY = 60,                     ///< Inlet water conductivity too low.
+    ALARM_ID_INLET_WATER_HIGH_CONDUCTIVITY = 61,                    ///< Inlet water conductivity too high.
+    ALARM_ID_DG_SOFTWARE_FAULT = 62,                                ///< DG software fault.  Software found itself in an unexpected state.
+    ALARM_ID_CONDUCTIVITY_SENSOR_FAULT = 63,                        ///< Conductivity sensor fault.
     NUM_OF_ALARM_IDS                                                ///< Total # of alarms.
 };
 /// Type for alarm list enumeration.