Index: AlarmDefs.h
===================================================================
diff -u -r43bcdbff752f578fe33ff30ec5cf912454a1b685 -r2000f0a9248fe1a24976aa437c8dfcd35487627e
--- AlarmDefs.h	(.../AlarmDefs.h)	(revision 43bcdbff752f578fe33ff30ec5cf912454a1b685)
+++ AlarmDefs.h	(.../AlarmDefs.h)	(revision 2000f0a9248fe1a24976aa437c8dfcd35487627e)
@@ -135,14 +135,17 @@
     ALARM_ID_DG_DIALYSATE_FILL_OUT_OF_TIME = 99,                    ///< DG dialysate fill runs out of time
     ALARM_ID_CP1_SPEED_CONTROL_ERROR = 100,                         ///< DG concentrate pump CP1 speed control error
     ALARM_ID_CP2_SPEED_CONTROL_ERROR = 101,                         ///< DG concentrate pump CP2 speed control error
-    ALARM_ID_FLOW_RATE_OUT_OF_RANGE = 102,                          ///< DG flow rate out of range
+    ALARM_ID_FLOW_RATE_OUT_OF_UPPER_RANGE = 102,                    ///< DG flow rate out of upper range
     ALARM_ID_RO_PUMP_PRESSURE_OUT_OF_RANGE = 103,                   ///< DG RO pump pressure out of range
     ALARM_ID_DRAIN_PUMP_RPM_OUT_OF_RANGE = 104,                     ///< DG drain pump RPM out of range
     ALARM_ID_DG_HEATERS_NEGATIVE_COLD_JUNCTION_TEMPERATURE = 105,   ///< DG heaters cold junction temperature out of range
     ALARM_ID_DG_HEATERS_FAULT = 106,                                ///< DG heaters fault
     ALARM_ID_END_OF_DIALYSIS_TREATMENT_WARNING = 107,               ///< HD end of treatment warning
     ALARM_ID_END_OF_DIALYSIS_TREATMENT_ALARM = 108,                 ///< HD end of treatment alarm (user not acting to end treatment)
     ALARM_ID_END_OF_DIALYSIS_TREATMENT_ALARM_HIGH = 109,            ///< HD end of treatment alarm (high priority - user still not acting to end treatment)
+    ALARM_ID_DG_HEAT_DISINFECT_CYCLE_FAILED = 110,                  ///< DG heat disinfect cycle failed
+    ALARM_ID_RO_PUMP_RAMP_UP_TO_FLOW_TIMEOUT = 111,                 ///< DG RO pump ramp up to target flow time out
+    ALARM_ID_FLOW_RATE_OUT_OF_LOWER_RANGE = 112,                    ///< DG flow rate out of lower range
     NUM_OF_ALARM_IDS                                                ///< Total number of alarms
 };
 typedef enum Alarm_List ALARM_ID_T;                                 ///< Type for alarm list enumeration
Index: DGDefs.h
===================================================================
diff -u -rf8a1d053f7f7ecd6f85c2b9adf07aab97e2e2535 -r2000f0a9248fe1a24976aa437c8dfcd35487627e
--- DGDefs.h	(.../DGDefs.h)	(revision f8a1d053f7f7ecd6f85c2b9adf07aab97e2e2535)
+++ DGDefs.h	(.../DGDefs.h)	(revision 2000f0a9248fe1a24976aa437c8dfcd35487627e)
@@ -198,13 +198,23 @@
 enum DG_Heat_States
 {
     DG_HEAT_DISINFECT_STATE_START = 0,                          ///< Heat disinfect, start mode state
-    DG_HEAT_DISINFECT_STATE_EVACUATE_DIALYSATE_FILL_WITH_WATER, ///< Heat disinfect, evacuate dialysate and fill with water
-    DG_HEAT_DISINFECT_STATE_HEAT_WATER,                         ///< Heat disinfect, heater the stored water
-    DG_HEAT_DISINFECT_STATE_DISINFECT_RECIRC_PATH,              ///< Heat disinfect, heat disinfect recirculation path
-    DG_HEAT_DISINFECT_STATE_DISINFECT_R1_TO_R2,                 ///< Heat disinfect, heat disinfect reservoir 1 to 2
-    DG_HEAT_DISINFECT_STATE_DISINFECT_R2_TO_R1,                 ///< Heat disinfect, heat disinfect reservoir 2 to 1
-    DG_HEAT_DISINFECT_STATE_DISINFECT_DRAIN_PATH,               ///< Heat disinfect, heat disinfect drain path
-    DG_HEAT_DISINFECT_STATE_FILL_WITH_WATER_DEPRIME_RESERVOIRS, ///< Heat disinfect, fill with water and de-prime the reservoirs
+    DG_HEAT_DISINFECT_STATE_DRAIN_R1,
+    DG_HEAT_DISINFECT_STATE_DRAIN_R2,
+    DG_HEAT_DISINFECT_STATE_FLUSH_DRAIN,
+    DG_HEAT_DISINFECT_STATE_FLUSH_CIRCULATION,
+    DG_HEAT_DISINFECT_STATE_FLUSH_R1_AND_R2,
+    DG_HEAT_DISINFECT_STATE_FLUSH_R2_AND_DRAIN_R1,
+    DG_HEAT_DISINFECT_STATE_FLUSH_DRAIN_R2,
+    DG_HEAT_DISINFECT_STATE_FLUSH_DRAIN_R1,
+    DG_HEAT_DISINFECT_STATE_FILL_WITH_WATER,
+    DG_HEAT_DISINFECT_STATE_DISINFECT_R1_TO_R2,
+    DG_HEAT_DISINFECT_STATE_FILL_R2_WITH_HOT_WATER,
+    DG_HEAT_DISINFECT_STATE_DISINFECT_R2_TO_R1,
+    DG_HEAT_DISINFECT_STATE_MIX_DRAIN_R1,
+    DG_HEAT_DISINFECT_STATE_MIX_DRAIN_R2,
+    DG_HEAT_DISINFECT_STATE_RINSE_R1_TO_R2,
+    DG_HEAT_DISINFECT_STATE_RINSE_R2_TO_R1_AND_DRAIN_R1,
+    DG_HEAT_DISINFECT_STATE_RINSE_CIRCULATION,
     DG_HEAT_DISINFECT_STATE_COMPLETE,                           ///< Heat disinfect, complete
     NUM_OF_DG_HEAT_DISINFECT_STATES                             ///< Number of heat disinfect mode states
 };