Index: AlarmDefs.h
===================================================================
diff -u -r00bad3d2f75d68414fd36cf2b5cb0e9cee2a0abc -ra4d8988757c6b50b83de8accb642ac0d42574f11
--- AlarmDefs.h	(.../AlarmDefs.h)	(revision 00bad3d2f75d68414fd36cf2b5cb0e9cee2a0abc)
+++ AlarmDefs.h	(.../AlarmDefs.h)	(revision a4d8988757c6b50b83de8accb642ac0d42574f11)
@@ -542,7 +542,7 @@
     { ALARM_PRIORITY_HIGH,     3,  FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_DG_PRESSURE_OUT_OF_RANGE,                         0,              ALARM_ID_NO_ALARM },
     { ALARM_PRIORITY_HIGH,     3,  FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_DG_WATCHDOG_EXPIRED,                              0,              ALARM_ID_NO_ALARM },
     { ALARM_PRIORITY_MEDIUM, 799,  FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, ALARM_ID_INLET_WATER_TEMPERATURE_IN_HIGH_RANGE,            0,              ALARM_ID_NO_ALARM },
-    { ALARM_PRIORITY_HIGH,     3,  FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE,  FALSE, ALARM_ID_FILL_CONDUCTIVITY_OUT_OF_RANGE,                   0,              ALARM_ID_NO_ALARM },
+    { ALARM_PRIORITY_HIGH,   799,  FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, ALARM_ID_FILL_CONDUCTIVITY_OUT_OF_RANGE,                   0,              ALARM_ID_NO_ALARM },
     { ALARM_PRIORITY_HIGH,     3,  TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_BATTERY_COMM_FAULT,                            0,              ALARM_ID_NO_ALARM },
     { ALARM_PRIORITY_HIGH,     3,  TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_SYRINGE_PUMP_STALL,                            0,              ALARM_ID_NO_ALARM },
     //   Priority            Rank  Fault DGFault Stops  ClrIm  NoClr  NoRes  NoRin  NoEnd  NoRcr ClrOnly TxLog  ID                                                        Escalate In     Escalate To
@@ -593,9 +593,9 @@
     { ALARM_PRIORITY_HIGH,     3,  FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, TRUE,  ALARM_ID_DG_DIALYSATE_TEMPERATURE_SENSORS_OUT_OF_RANGE,    0,              ALARM_ID_NO_ALARM },
     { ALARM_PRIORITY_LOW,     21,  FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE,  ALARM_ID_DG_SW_CONFIG_RECORD_INVALID_CRC,                  0,              ALARM_ID_NO_ALARM },
     { ALARM_PRIORITY_HIGH,     3,  FALSE, TRUE , TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE,  ALARM_ID_ACID_CONDUCTIVITY_OUT_OF_RANGE,                   0,              ALARM_ID_NO_ALARM },
-    { ALARM_PRIORITY_HIGH,     1,  FALSE, TRUE , TRUE , TRUE , TRUE,  TRUE,  TRUE,  TRUE,  TRUE , FALSE, TRUE,  ALARM_ID_DG_RTC_OR_TIMER_ACCURACY_FAILURE,                 0,              ALARM_ID_NO_ALARM },
-    { ALARM_PRIORITY_HIGH,    24,  FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE,  TRUE,  TRUE, FALSE, ALARM_ID_CREATING_DIALYSATE_PLEASE_WAIT,                   0,              ALARM_ID_NO_ALARM },
-    { ALARM_PRIORITY_HIGH,     3,  FALSE, TRUE , TRUE ,  TRUE,  TRUE,  TRUE,  TRUE,  TRUE,  TRUE, FALSE, FALSE, ALARM_ID_INLET_WATER_HIGH_TEMPERATURE,                     0,              ALARM_ID_NO_ALARM },
+    { ALARM_PRIORITY_HIGH,     1,  FALSE, TRUE , TRUE , TRUE , TRUE,  TRUE,  TRUE,  TRUE , TRUE , FALSE, TRUE,  ALARM_ID_DG_RTC_OR_TIMER_ACCURACY_FAILURE,                 0,              ALARM_ID_NO_ALARM },
+    { ALARM_PRIORITY_HIGH,   799,  FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, ALARM_ID_CREATING_DIALYSATE_PLEASE_WAIT,                   0,              ALARM_ID_NO_ALARM },
+    { ALARM_PRIORITY_HIGH,     3,  FALSE, TRUE , TRUE ,  TRUE,  TRUE,  TRUE,  TRUE,  TRUE, TRUE , FALSE, FALSE, ALARM_ID_INLET_WATER_HIGH_TEMPERATURE,                     0,              ALARM_ID_NO_ALARM },
     { ALARM_PRIORITY_HIGH,     3,  TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_WATCHDOG_EXPIRED,                                  0,              ALARM_ID_NO_ALARM },
     //   Priority            Rank  Fault DGFault Stops  ClrIm  NoClr  NoRes  NoRin  NoEnd  NoRcr ClrOnly TxLog  ID                                                        Escalate In     Escalate To
     { ALARM_PRIORITY_MEDIUM, 799,  FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , ALARM_ID_INLET_WATER_CONDUCTIVITY_IN_HIGH_RANGE,           0,              ALARM_ID_NO_ALARM },
@@ -858,7 +858,6 @@
     {   3, ALARM_ID_DG_OUTLET_PRIMARY_CONDUCTIVITY_OUT_OF_RANGE },
     {   3, ALARM_ID_DG_PRESSURE_OUT_OF_RANGE },
     {   3, ALARM_ID_DG_WATCHDOG_EXPIRED },
-    {   3, ALARM_ID_FILL_CONDUCTIVITY_OUT_OF_RANGE },
     {   3, ALARM_ID_HD_BATTERY_COMM_FAULT },
     {   3, ALARM_ID_HD_SYRINGE_PUMP_STALL },
     {   3, ALARM_ID_HD_NO_CART_SELF_TEST_TIMEOUT },
@@ -957,7 +956,6 @@
     {  20, ALARM_ID_AIR_TRAP_FILL_DURING_TREATMENT },
     {  21, ALARM_ID_OCCLUSION_BLOOD_PUMP },
     {  21, ALARM_ID_DG_SW_CONFIG_RECORD_INVALID_CRC },
-    {  24, ALARM_ID_CREATING_DIALYSATE_PLEASE_WAIT },
     {  36, ALARM_ID_PRIME_COMPLETED_HIGH },
     { 799, ALARM_ID_NVDATA_EEPROM_OPS_FAILURE },
     { 799, ALARM_ID_HD_SW_CONFIG_RECORD_INVALID_CRC },
@@ -992,6 +990,8 @@
     { 799, ALARM_ID_INLET_WATER_TEMPERATURE_IN_LOW_RANGE },
     { 799, ALARM_ID_INLET_WATER_TEMPERATURE_IN_HIGH_RANGE },
     { 799, ALARM_ID_INLET_WATER_PRESSURE_IN_LOW_RANGE },
+    { 799, ALARM_ID_FILL_CONDUCTIVITY_OUT_OF_RANGE },
+    { 799, ALARM_ID_CREATING_DIALYSATE_PLEASE_WAIT },
     { 800, ALARM_ID_BLOOD_SITTING_WARNING },
     { 801, ALARM_ID_END_OF_TREATMENT_ALARM },
     { 802, ALARM_ID_PRIME_COMPLETED_MEDIUM },