Index: DGDefs.h
===================================================================
diff -u -rf8a1d053f7f7ecd6f85c2b9adf07aab97e2e2535 -r8439ed29c90fdbdd61928a03d56efc3e4d3f3429
--- DGDefs.h	(.../DGDefs.h)	(revision f8a1d053f7f7ecd6f85c2b9adf07aab97e2e2535)
+++ DGDefs.h	(.../DGDefs.h)	(revision 8439ed29c90fdbdd61928a03d56efc3e4d3f3429)
@@ -198,13 +198,26 @@
 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,                           ///< Heat disinfect, drain R1 state
+    DG_HEAT_DISINFECT_STATE_DRAIN_R2,                           ///< Heat disinfect, drain R2 state
+    DG_HEAT_DISINFECT_STATE_FLUSH_DRAIN,                        ///< Heat disinfect, flush drain state
+    DG_HEAT_DISINFECT_STATE_FLUSH_CIRCULATION,                  ///< Heat disinfect, flush circulation state
+    DG_HEAT_DISINFECT_STATE_FLUSH_R1_AND_R2,                    ///< Heat disinfect, flush R1 and R2
+    DG_HEAT_DISINFECT_STATE_FLUSH_R2_AND_DRAIN_R1,              ///< Heat disinfect, flush R2 and drain R1
+    DG_HEAT_DISINFECT_STATE_FLUSH_DRAIN_R2,                     ///< Heat disinfect, flush drain R2
+    DG_HEAT_DISINFECT_STATE_FLUSH_DRAIN_R1,                     ///< Heat disinfect, flush drain R1
+    DG_HEAT_DISINFECT_STATE_FILL_WITH_WATER,                    ///< Heat disinfect, fill with water
+    DG_HEAT_DISINFECT_STATE_DISINFECT_R1_TO_R2,                 ///< Heat disinfect, disinfect R1 to R2
+    DG_HEAT_DISINFECT_STATE_FILL_R2_WITH_HOT_WATER,             ///< Heat disinfect, fill R2 with hot water
+    DG_HEAT_DISINFECT_STATE_DISINFECT_R2_TO_R1,                 ///< Heat disinfect, disinfect R2 to R1
+    DG_HEAT_DISINFECT_STATE_MIX_DRAIN_R1,                       ///< Heat disinfect, mix drain R1
+    DG_HEAT_DISINFECT_STATE_MIX_DRAIN_R2,                       ///< Heat disinfect, mix drain R2
+    DG_HEAT_DISINFECT_STATE_RINSE_R1_TO_R2,                     ///< Heat disinfect, rinse R1 to R2
+    DG_HEAT_DISINFECT_STATE_RINSE_R2_TO_R1_AND_DRAIN_R1,        ///< Heat disinfect, rinse R2 to R1 and drain R1
+    DG_HEAT_DISINFECT_STATE_RINSE_CIRCULATION,                  ///< Heat disinfect, rinse circulation
+    DG_HEAT_DISINFECT_STATE_CANCEL_MODE_BASIC_PATH,             ///< Heat disinfect, cancel mode basic path
+    DG_HEAT_DISINFECT_STATE_CANCEL_MODE_COLD_WATER_PATH,        ///< Heat disinfect, cancel mode cold water path
+    DG_HEAT_DISINFECT_STATE_CANCEL_MODE_HOT_WATER_PATH,         ///< Heat disinfect, cancel mode hot water path
     DG_HEAT_DISINFECT_STATE_COMPLETE,                           ///< Heat disinfect, complete
     NUM_OF_DG_HEAT_DISINFECT_STATES                             ///< Number of heat disinfect mode states
 };