Index: AlarmDefs.h
===================================================================
diff -u -ra4c93b4175ef9649287785bafe29e1e5bba217ea -r4c7a4ff3e12d336d11845a49784e4811815e1389
--- AlarmDefs.h	(.../AlarmDefs.h)	(revision a4c93b4175ef9649287785bafe29e1e5bba217ea)
+++ AlarmDefs.h	(.../AlarmDefs.h)	(revision 4c7a4ff3e12d336d11845a49784e4811815e1389)
@@ -53,6 +53,13 @@
     ALARM_ID_HD_DIALYSATE_FLOW_INVALID_CALIBRATION,                 ///< HD dialysate flow invalid calibration
     ALARM_ID_HD_ALARM_AUDIO_SELF_TEST_FAILURE,                      ///< HD alarm audio failed POST
     ALARM_ID_HD_UI_POST_FAILED,                                     ///< HD UI POST failed
+    ALARM_ID_DG_PRESSURE_SENSORS_INVALID_CAL_RECORD,                ///< DG load cells invalid calibration record
+    ALARM_ID_DG_FLOW_SENSORS_INVALID_CAL_RECORD,                    ///< DG flow sensors invalid calibration record
+    ALARM_ID_DG_COND_SENSORS_INVALID_CAL_RECORD,                    ///< DG conductivity sensors invalid calibration record
+    ALARM_ID_DG_DRAIN_LINE_VOLUME_INVALID_CAL_RECORD,               ///< DG drain line volume invalid calibration record
+    ALARM_ID_DG_RESERVOIRS_INVALID_CAL_RECORD,                      ///< DG reservoirs invalid calibration record
+    ALARM_ID_DG_ACID_CONCENTRATE_INVALID_CAL_RECORD,                ///< DG acid concentrate calibration record
+    ALARM_ID_DG_BICARB_CONCENTRATE_INVALID_CAL_RECORD,              ///< DG bicarb concentrate calibration record
     ALARM_ID_HD_SOFTWARE_FAULT,                                     ///< HD Software fault. Software found itself in an unexpected state
     ALARM_ID_BLOOD_PUMP_MC_CURRENT_CHECK,                           ///< Blood pump failed motor controller current check.  Too high when pump should be off or out of range when pump should be running
     ALARM_ID_BLOOD_PUMP_OFF_CHECK,                                  ///< Blood pump failed motor off check.  Measured speed while commanded off
@@ -266,13 +273,6 @@
     ALARM_ID_DG_CHEM_DISINFECT_TARGET_TEMP_TIMEOUT,                 ///< DG chemical disinfect could not reach to target temperature
     ALARM_ID_DG_CHEM_DISINFECT_INLET_PRES_AND_TEMP_SNSRS_OUT,       ///< DG chemical disinfect inlet pressure and temperature sensors out of range
     ALARM_ID_DG_CHEM_DISINFECT_INLET_COND_AND_TEMP_OUT,             ///< DG chemical disinfect inlet conductivity and temperature out of range
-    ALARM_ID_DG_PRESSURE_SENSORS_INVALID_CAL_RECORD,                ///< DG load cells invalid calibration record
-    ALARM_ID_DG_FLOW_SENSORS_INVALID_CAL_RECORD,                    ///< DG flow sensors invalid calibration record
-    ALARM_ID_DG_COND_SENSORS_INVALID_CAL_RECORD,                    ///< DG conductivity sensors invalid calibration record
-    ALARM_ID_DG_DRAIN_LINE_VOLUME_INVALID_CAL_RECORD,               ///< DG drain line volume invalid calibration record
-    ALARM_ID_DG_RESERVOIRS_INVALID_CAL_RECORD,                      ///< DG reservoirs invalid calibration record
-    ALARM_ID_DG_ACID_CONCENTRATE_INVALID_CAL_RECORD,                ///< DG acid concentrate calibration record
-    ALARM_ID_DG_BICARB_CONCENTRATE_INVALID_CAL_RECORD,              ///< DG bicarb concentrate calibration record
     NUM_OF_ALARM_IDS                                                ///< Total number of alarms
 };
 typedef enum Alarm_List ALARM_ID_T;                                 ///< Type for alarm list enumeration