Index: AlarmDefs.h
===================================================================
diff -u -r68e9e9b93dd3b57d5a0f426b9c83241d15e46692 -r92049543063d271a94ab29974400329e5e36ea11
--- AlarmDefs.h	(.../AlarmDefs.h)	(revision 68e9e9b93dd3b57d5a0f426b9c83241d15e46692)
+++ AlarmDefs.h	(.../AlarmDefs.h)	(revision 92049543063d271a94ab29974400329e5e36ea11)
@@ -185,14 +185,14 @@
     ALARM_ID_DIALYSATE_CONDUCTIVITY_FAULT = 147,                            ///< DG dialysate generation conductivity fault alarm
     ALARM_ID_INLET_WATER_HIGH_TEMPERATURE = 148,                            ///< Inlet water temperature too high
     ALARM_ID_INLET_WATER_LOW_TEMPERATURE = 149,                             ///< Inlet water temperature too low
-    ALARM_ID_INLET_WATER_CONDUCTIVITY_IN_WARNING_RANGE = 150,               ///< Inlet water conductivity is in warning range
+    ALARM_ID_INLET_WATER_HIGH_CONDUCTIVITY = 150,                           ///< Inlet water conductivity too high
     ALARM_ID_INLET_WATER_LOW_CONDUCTIVITY = 151,                            ///< Inlet water conductivity too low
     ALARM_ID_INLET_WATER_LOW_PRESSURE = 152,                                ///< Inlet water pressure too low
     ALARM_ID_PRIME_COMPLETED_HIGH = 153,                                    ///< HD prime completed high priority alarm
     ALARM_ID_NVDATA_EEPROM_OPS_FAILURE = 154,                               ///< EEPROM operations (read, write, erase) failure
     ALARM_ID_HD_SW_CONFIG_RECORD_INVALID_CRC = 155,                         ///< DG software configuration record invalid CRC
     ALARM_ID_NVDATA_HW_USAGE_DATA_CRC_ERROR = 156,                          ///< HW usage data (treatment time in HD and total consumed water in DG) failure
-    ALARM_ID_INLET_WATER_TEMPERATURE_OUT_OF_RANGE = 157,                    ///< Inlet water temperature is not within specified range
+    ALARM_ID____AVAILABLE_23 = 157,                                         ///< This alarm ID is available for use
     ALARM_ID____AVAILABLE_24 = 158,                                         ///< This alarm ID is available for use
     ALARM_ID_DIAL_IN_PUMP_FLOW_VS_MOTOR_SPEED_CHECK = 159,                  ///< Dialysate inlet pump failed flow vs. motor speed check.
     ALARM_ID_BLOOD_PUMP_ROTOR_SPEED_TOO_HIGH = 160,                         ///< Blood pump rotor speed too high
@@ -595,17 +595,17 @@
     { ALARM_PRIORITY_HIGH,    22,  FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE,  ALARM_ID_ACID_CONDUCTIVITY_OUT_OF_RANGE,                   0,              ALARM_ID_NO_ALARM },
     { ALARM_PRIORITY_HIGH,    23,  FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE,  ALARM_ID_DIALYSATE_CONDUCTIVITY_OUT_OF_RANGE,              0,              ALARM_ID_NO_ALARM },
     { ALARM_PRIORITY_HIGH,    24,  FALSE, FALSE, TRUE , TRUE,  TRUE,  TRUE,  TRUE,  TRUE,  TRUE,  TRUE,  FALSE, TRUE,  ALARM_ID_DIALYSATE_CONDUCTIVITY_FAULT,                     0,              ALARM_ID_NO_ALARM },
-    { ALARM_PRIORITY_LOW,     26,  FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE,  ALARM_ID_INLET_WATER_HIGH_TEMPERATURE,                     0,              ALARM_ID_NO_ALARM },
-    { ALARM_PRIORITY_LOW,     28,  FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE,  ALARM_ID_INLET_WATER_LOW_TEMPERATURE,                      0,              ALARM_ID_NO_ALARM },
+    { ALARM_PRIORITY_HIGH,    26,  FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE,  ALARM_ID_INLET_WATER_HIGH_TEMPERATURE,                     0,              ALARM_ID_NO_ALARM },
+    { ALARM_PRIORITY_HIGH,    28,  FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE,  ALARM_ID_INLET_WATER_LOW_TEMPERATURE,                      0,              ALARM_ID_NO_ALARM },
     //   Priority            Rank  Fault DGFault Stops  ClrIm  NoClr  NoRes  NoRin  NoEnd  NoNew  NoRcr  UsrAck TxLog  ID                                                        Escalate In     Escalate To
-    { ALARM_PRIORITY_LOW,     30,  FALSE, FALSE, FALSE, TRUE,  FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE,  ALARM_ID_INLET_WATER_CONDUCTIVITY_IN_WARNING_RANGE,        0,              ALARM_ID_NO_ALARM },
-    { ALARM_PRIORITY_HIGH,    32,  FALSE, FALSE, TRUE , TRUE,  FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE,  ALARM_ID_INLET_WATER_LOW_CONDUCTIVITY,                     0,              ALARM_ID_NO_ALARM },
+    { ALARM_PRIORITY_HIGH,    30,  FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE,  ALARM_ID_INLET_WATER_HIGH_CONDUCTIVITY,                    0,              ALARM_ID_NO_ALARM },
+    { ALARM_PRIORITY_HIGH,    32,  FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE,  ALARM_ID_INLET_WATER_LOW_CONDUCTIVITY,                     0,              ALARM_ID_NO_ALARM },
     { ALARM_PRIORITY_HIGH,    34,  FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE,  ALARM_ID_INLET_WATER_LOW_PRESSURE,                         0,              ALARM_ID_NO_ALARM },
     { ALARM_PRIORITY_HIGH,    36,  FALSE, FALSE, FALSE, TRUE,  FALSE, TRUE,  TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, ALARM_ID_PRIME_COMPLETED_HIGH,                             0,              ALARM_ID_NO_ALARM },
     { ALARM_PRIORITY_HIGH,   799,  FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, ALARM_ID_NVDATA_EEPROM_OPS_FAILURE,                        0,              ALARM_ID_NO_ALARM },
     { ALARM_PRIORITY_LOW,    799,  FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE,  ALARM_ID_HD_SW_CONFIG_RECORD_INVALID_CRC,                  0,              ALARM_ID_NO_ALARM },
     { ALARM_PRIORITY_HIGH,   799,  FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, ALARM_ID_NVDATA_HW_USAGE_DATA_CRC_ERROR,                   0,              ALARM_ID_NO_ALARM },
-    { ALARM_PRIORITY_HIGH,   799,  FALSE, FALSE, TRUE , TRUE , TRUE,  TRUE,  TRUE,  TRUE,  TRUE,  TRUE , FALSE, FALSE, ALARM_ID_INLET_WATER_TEMPERATURE_OUT_OF_RANGE,             0,              ALARM_ID_NO_ALARM },
+    { ALARM_PRIORITY_HIGH,   799,  FALSE, FALSE, TRUE , TRUE , TRUE,  TRUE,  TRUE,  TRUE,  TRUE,  TRUE , FALSE, FALSE, ALARM_ID____AVAILABLE_23,                                  0,              ALARM_ID_NO_ALARM },
     { ALARM_PRIORITY_HIGH,   799,  FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, ALARM_ID____AVAILABLE_24,                                  0,              ALARM_ID_NO_ALARM },
     { ALARM_PRIORITY_HIGH,   799,  FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, ALARM_ID_DIAL_IN_PUMP_FLOW_VS_MOTOR_SPEED_CHECK,           0,              ALARM_ID_NO_ALARM },
     { ALARM_PRIORITY_HIGH,   799,  FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, ALARM_ID_BLOOD_PUMP_ROTOR_SPEED_TOO_HIGH,                  0,              ALARM_ID_NO_ALARM },
@@ -926,14 +926,14 @@
     {  24, ALARM_ID_DIALYSATE_CONDUCTIVITY_FAULT },
     {  26, ALARM_ID_INLET_WATER_HIGH_TEMPERATURE },
     {  28, ALARM_ID_INLET_WATER_LOW_TEMPERATURE },
-    {  30, ALARM_ID_INLET_WATER_CONDUCTIVITY_IN_WARNING_RANGE },
+    {  30, ALARM_ID_INLET_WATER_HIGH_CONDUCTIVITY },
     {  32, ALARM_ID_INLET_WATER_LOW_CONDUCTIVITY },
     {  34, ALARM_ID_INLET_WATER_LOW_PRESSURE },
     {  36, ALARM_ID_PRIME_COMPLETED_HIGH },
     { 799, ALARM_ID_NVDATA_EEPROM_OPS_FAILURE },
     { 799, ALARM_ID_HD_SW_CONFIG_RECORD_INVALID_CRC },
     { 799, ALARM_ID_NVDATA_HW_USAGE_DATA_CRC_ERROR },
-    { 799, ALARM_ID_INLET_WATER_TEMPERATURE_OUT_OF_RANGE },
+    { 799, ALARM_ID____AVAILABLE_23 },
     { 799, ALARM_ID____AVAILABLE_24 },
     { 799, ALARM_ID_DIAL_IN_PUMP_FLOW_VS_MOTOR_SPEED_CHECK },
     { 799, ALARM_ID_BLOOD_PUMP_ROTOR_SPEED_TOO_HIGH },