Index: AlarmDefs.h
===================================================================
diff -u -rd8678680589c49e902d8ab0282de729d52978cb7 -ra1162deed63c9b2d4b5f756495ebc0aea09b0ef0
--- AlarmDefs.h	(.../AlarmDefs.h)	(revision d8678680589c49e902d8ab0282de729d52978cb7)
+++ AlarmDefs.h	(.../AlarmDefs.h)	(revision a1162deed63c9b2d4b5f756495ebc0aea09b0ef0)
@@ -129,8 +129,8 @@
     ALARM_ID_ARTERIAL_PRESSURE_SENSOR_FAULT = 91,                   ///< FPGA reports failure reading arterial pressure sensor
     ALARM_ID_VENOUS_PRESSURE_SENSOR_FAULT = 92,                     ///< FPGA reports failure reading venous pressure sensor
     ALARM_ID_UV_REACTOR_NOT_HEALTHY = 93,                           ///< UV reactor not healthy (either inlet or outlet)
-    ALARM_ID_POST_ACID_CONDUCTIVITY_OUT_OF_RANGE = 94,              ///< Post-acid concentrate conductivity out of range
-    ALARM_ID_POST_BICARB_CONDUCTIVITY_OUT_OF_RANGE = 95,            ///< Post-bicarb concentrate conductivity out of range
+    ALARM_ID_ACID_CONDUCTIVITY_OUT_OF_RANGE = 94,                   ///< Concentrate conductivity after adding acid out of range alarm
+    ALARM_ID_BICARB_CONDUCTIVITY_OUT_OF_RANGE = 95,                 ///< Concentrate conductivity after adding bicarb out of range alarm
     ALARM_ID_RO_PUMP_FLOW_RATE_OUT_OF_RANGE = 96,                   ///< RO pump flow rate out of range
     ALARM_ID_DG_THERMISTORS_TEMPERATURE_OUT_OF_RANGE = 97,          ///< DG thermistors/sensors temperature out of range
     ALARM_ID_DG_FAN_RPM_OUT_OF_RANGE = 98,                          ///< DG fan RPM out of range
@@ -181,6 +181,7 @@
     ALARM_ID_NVDATAMGMT_INDIVIDUAL_RECORD_TIME_INVALID = 143,       ///< DG/HD NV data management individual record time invalid
     ALARM_ID_HD_AC_POWER_LOST = 144,                                ///< HD AC power lost alarm
     ALARM_ID_DG_RESTARTED_FAULT = 145,                              ///< HD reports DG restarted fault
+    ALARM_ID_DIALYSATE_CONDUCTIVITY_OUT_OF_RANGE = 146,             ///< Dialysate conductivity out of range
     NUM_OF_ALARM_IDS                                                ///< Total number of alarms
 };
 typedef enum Alarm_List ALARM_ID_T;                                 ///< Type for alarm list enumeration
@@ -432,6 +433,7 @@
     { ALARM_PRIORITY_HIGH,     4,   0,              ALARM_ID_NO_ALARM,              TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE }, // ALARM_ID_NVDATAMGMT_INDIVIDUAL_RECORD_TIME_INVALID
     { ALARM_PRIORITY_HIGH,    15,   0,              ALARM_ID_NO_ALARM,              FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE  }, // ALARM_ID_HD_AC_POWER_LOST
     { ALARM_PRIORITY_HIGH,     4,   0,              ALARM_ID_NO_ALARM,              TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE }, // ALARM_ID_DG_RESTARTED_FAULT
+    { ALARM_PRIORITY_LOW,     30,   0,              ALARM_ID_NO_ALARM,              FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE }, // ALARM_ID_DIALYSATE_CONDUCTIVITY_OUT_OF_RANGE
     // Priority              Rank   Escalate In     Escalate To                     Fault  Stops  ClrIm  NoClr  NoRes  NoRin  NoEnd  NoNew  NoRcr  UsrAck
 };