Index: AlarmDefs.h
===================================================================
diff -u -r695c7040f8ab80fdd06825c6233d3a2a8706d1cc -r0b8a815b0e6c7c0ec76fe0f3ef32facd0bf48e93
--- AlarmDefs.h	(.../AlarmDefs.h)	(revision 695c7040f8ab80fdd06825c6233d3a2a8706d1cc)
+++ AlarmDefs.h	(.../AlarmDefs.h)	(revision 0b8a815b0e6c7c0ec76fe0f3ef32facd0bf48e93)
@@ -612,7 +612,7 @@
     { ALARM_PRIORITY_HIGH,   150,  FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, TRUE , FALSE, TRUE , TRUE , FALSE, FALSE, TRUE , TRUE , TRUE , TRUE , ALARM_ID_HD_BLOOD_LEAK_DETECTED                              },
     { ALARM_PRIORITY_HIGH,   200,  FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, TRUE , ALARM_ID_HD_VENOUS_PRESSURE_LOW                              },
     { ALARM_PRIORITY_HIGH,    12,  FALSE, FALSE, TRUE , TRUE , FALSE, TRUE , TRUE , FALSE, FALSE, TRUE , FALSE, FALSE, TRUE , TRUE , FALSE, TRUE , ALARM_ID_HD_VENOUS_BUBBLE_DETECTED,                          },
-    { ALARM_PRIORITY_MEDIUM, 698,  FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, TRUE , FALSE, TRUE , TRUE , FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, ALARM_ID_HD_BLOOD_LEAK_RECOVERING_PLEASE_WAIT,               },
+    { ALARM_PRIORITY_MEDIUM, 301,  FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, TRUE , FALSE, TRUE , TRUE , FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, ALARM_ID_HD_BLOOD_LEAK_RECOVERING_PLEASE_WAIT,               },
     { ALARM_PRIORITY_HIGH,   201,  FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, TRUE , ALARM_ID_HD_VENOUS_PRESSURE_HIGH                             },
     { ALARM_PRIORITY_HIGH,   202,  FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, TRUE , ALARM_ID_HD_ARTERIAL_PRESSURE_LOW                            },
     { ALARM_PRIORITY_HIGH,   203,  FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, TRUE , ALARM_ID_HD_ARTERIAL_PRESSURE_HIGH                           },
@@ -630,7 +630,7 @@
     { ALARM_PRIORITY_MEDIUM, 603,  FALSE, FALSE, TRUE , TRUE , FALSE, TRUE , TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_DG_CLEANING_MODE_INLET_WATER_COND_TOO_HIGH          },
     { ALARM_PRIORITY_MEDIUM, 410,  FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , ALARM_ID_DG_ACID_CONDUCTIVITY_OUT_OF_RANGE                   },
     { ALARM_PRIORITY_HIGH,     2,  FALSE, TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_DG_RTC_OR_TIMER_ACCURACY_FAILURE                    },
-    { ALARM_PRIORITY_MEDIUM, 699,  FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, ALARM_ID_DG_CREATING_DIALYSATE_PLEASE_WAIT                   },
+    { ALARM_PRIORITY_MEDIUM, 421,  FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, ALARM_ID_DG_CREATING_DIALYSATE_PLEASE_WAIT                   },
     { ALARM_PRIORITY_MEDIUM, 601,  FALSE, FALSE, TRUE , TRUE , FALSE, TRUE , TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_DG_CLEANING_MODE_INLET_WATER_TEMP_TOO_HIGH          },
     { ALARM_PRIORITY_HIGH,    10,  TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_WATCHDOG_EXPIRED                                 },
     //   Priority            Rank  Fault DGFault Stops  ClrIm  NoClr  NoRes  NoRin  NoEnd  BlkRB  BlkET  BTSRB  BTSET  NoBRcr NoDRcr ClrOnly TxLog  ID
@@ -1046,6 +1046,7 @@
     { 291, ALARM_ID_HD_END_TREATMENT_TIMEOUT_ALARM },
     { 292, ALARM_ID_HD_PRIME_COMPLETED_HIGH },
     { 300, ALARM_ID_HD_TREATMENT_STOPPED_BY_USER },
+    { 301, ALARM_ID_HD_BLOOD_LEAK_RECOVERING_PLEASE_WAIT },
     { 400, ALARM_ID_HD_DIAL_IN_FLOW_CHECK_FAILURE },
     { 401, ALARM_ID_HD_DIALYSATE_TEMP_ABOVE_SAFETY_TEMP },
     { 401, ALARM_ID_HD_DIALYSATE_TEMP_ABOVE_TARGET_TEMP },
@@ -1057,6 +1058,7 @@
     { 420, ALARM_ID_DG_FILL_CONDUCTIVITY_OUT_OF_RANGE },
     { 421, ALARM_ID_HD_ACTIVE_RESERVOIR_RECIRCULATION_OUT_OF_RANGE },
     { 421, ALARM_ID_HD_ACTIVE_RESERVOIR_WEIGHT_OUT_OF_RANGE },
+    { 421, ALARM_ID_DG_CREATING_DIALYSATE_PLEASE_WAIT },
     { 430, ALARM_ID_DG_INLET_WATER_PRESSURE_IN_HIGH_RANGE },
     { 431, ALARM_ID_DG_INLET_WATER_PRESSURE_IN_LOW_RANGE },
     { 432, ALARM_ID_DG_INLET_WATER_TEMPERATURE_IN_HIGH_RANGE },
@@ -1090,8 +1092,6 @@
     { 604, ALARM_ID_DG_CLEANING_MODE_INLET_WATER_COND_TOO_LOW },
     { 605, ALARM_ID_DG_CLEANING_MODE_INLET_WATER_PRESSURE_TOO_HIGH },
     { 606, ALARM_ID_DG_CLEANING_MODE_INLET_WATER_PRESSURE_TOO_LOW },
-    { 698, ALARM_ID_HD_BLOOD_LEAK_RECOVERING_PLEASE_WAIT },
-    { 699, ALARM_ID_DG_CREATING_DIALYSATE_PLEASE_WAIT },
     { 700, ALARM_ID_HD_BP_OCCLUSION_SELF_TEST_FAILURE },
     { 700, ALARM_ID_HD_ARTERIAL_PRESSURE_SELF_TEST_FAILURE },
     { 700, ALARM_ID_HD_VENOUS_PRESSURE_SELF_TEST_FAILURE },