Index: AlarmDefs.h
===================================================================
diff -u -r8b7e3df1cef94f8a9a05edf0e1367053cb1a32f0 -ra34269da0845ea2365fda021d8bb9c43a8075ef7
--- AlarmDefs.h	(.../AlarmDefs.h)	(revision 8b7e3df1cef94f8a9a05edf0e1367053cb1a32f0)
+++ AlarmDefs.h	(.../AlarmDefs.h)	(revision a34269da0845ea2365fda021d8bb9c43a8075ef7)
@@ -1072,24 +1072,29 @@
     { 799, ALARM_ID_HD_BATTERY_PACK_ERROR_DETECTED },
     { 799, ALARM_ID_DG_RESERVOIR_LEAK_TIMEOUT },
     { 799, ALARM_ID_HD_SYRINGE_PUMP_SYRINGE_REMOVED },
-    { 799, ALARM_ID_INLET_WATER_CONDUCTIVITY_IN_HIGH_RANGE },
-    { 799, ALARM_ID_INLET_WATER_CONDUCTIVITY_IN_LOW_RANGE },
-    { 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 },
     { 799, ALARM_ID_PRE_TREATMENT_WET_LC_TEST_FAILURE },
     { 799, ALARM_ID_PRE_TREATMENT_WET_FLOW_TEST_FAILURE },
     { 799, ALARM_ID_HD_DIALYSATE_TEMP_ABOVE_TARGET_TEMP },
     { 799, ALARM_ID_HD_DIALYSATE_TEMP_BELOW_TARGET_TEMP },
-    { 799, ALARM_ID_INLET_WATER_PRESSURE_IN_HIGH_RANGE },
-    { 799, ALARM_ID_DG_CHEM_DISINFECT_FLUSH_REMOVE_ACID },
-    { 799, ALARM_ID_DG_CHEM_DISINFECT_INSERT_ACID },
+    { 799, ALARM_ID_UI_POST_FAILURE_WIFI },
+    { 799, ALARM_ID_UI_POST_FAILURE_BLUETOOTH },
+    { 799, ALARM_ID_UI_POST_FAILURE_CLOUDSYNC },
+    { 799, ALARM_ID_UI_POST_FAILURE_ETHERNET },
+    { 799, ALARM_ID_UI_POST_FAILURE_SOUND },
     { 800, ALARM_ID_BLOOD_SITTING_WARNING },
     { 801, ALARM_ID_END_OF_TREATMENT_ALARM },
     { 802, ALARM_ID_PRIME_COMPLETED_MEDIUM },
     { 803, ALARM_ID_TREATMENT_STOPPED_BY_USER },
+    { 899, ALARM_ID_INLET_WATER_CONDUCTIVITY_IN_HIGH_RANGE },
+    { 899, ALARM_ID_INLET_WATER_CONDUCTIVITY_IN_LOW_RANGE },
+    { 899, ALARM_ID_INLET_WATER_TEMPERATURE_IN_LOW_RANGE },
+    { 899, ALARM_ID_INLET_WATER_TEMPERATURE_IN_HIGH_RANGE },
+    { 899, ALARM_ID_INLET_WATER_PRESSURE_IN_LOW_RANGE },
+    { 899, ALARM_ID_INLET_WATER_PRESSURE_IN_HIGH_RANGE },
+    { 899, ALARM_ID_DG_CHEM_DISINFECT_FLUSH_REMOVE_ACID },
+    { 899, ALARM_ID_DG_CHEM_DISINFECT_INSERT_ACID },
     { 899, ALARM_ID_SALINE_BOLUS_VOLUME_CHECK_FAILURE },
     { 899, ALARM_ID_RINSEBACK_VOLUME_CHECK_FAILURE },
     { 899, ALARM_ID_END_TREATMENT_TIMEOUT_ALARM },
@@ -1116,11 +1121,6 @@
     { 999, ALARM_ID_NO_CARTRIDGE_LOADED },
     { 999, ALARM_ID_CARTRIDGE_REMOVAL_FAILURE },
     { 999, ALARM_ID_HD_SYRINGE_PUMP_SYRINGE_EMPTY },
-    { 999, ALARM_ID_UI_POST_FAILURE_WIFI },
-    { 999, ALARM_ID_UI_POST_FAILURE_BLUETOOTH },
-    { 999, ALARM_ID_UI_POST_FAILURE_CLOUDSYNC },
-    { 999, ALARM_ID_UI_POST_FAILURE_ETHERNET },
-    { 999, ALARM_ID_UI_POST_FAILURE_SOUND },
     { 999, ALARM_ID_DG_ACID_BOTTLE_LOW_VOLUME },
     { 999, ALARM_ID_DG_BICARB_BOTTLE_LOW_VOLUME },
     { 999, ALARM_ID_HD_DISINFECT_FLUSH },