Index: DGDefs.h
===================================================================
diff -u -r00a994bd6c814621838f6b1d63f7419469cc6c4f -r664b6566e13e0fff722440d536205f21a7383438
--- DGDefs.h	(.../DGDefs.h)	(revision 00a994bd6c814621838f6b1d63f7419469cc6c4f)
+++ DGDefs.h	(.../DGDefs.h)	(revision 664b6566e13e0fff722440d536205f21a7383438)
@@ -8,7 +8,7 @@
 * @file    DGDefs.h
 *
 * @author  (last)      Dara Navaei
-* @date    (last)      03-Feb-2023
+* @date    (last)      14-Feb-2023
 *
 * @author  (original)  Sean Nash
 * @date    (original)  29-May-2020
@@ -343,6 +343,18 @@
 } MODE_HEAT_DISINFECT_DATA_T;
 #endif
 
+/// Cancellation paths
+typedef enum Cancellation_modes
+{
+    CANCELLATION_MODE_NONE = 0,                                 ///< Cancellation mode none.
+    CANCELLATION_MODE_BASIC,                                    ///< Cancellation mode basic.
+    CANCELLATION_MODE_HOT,                                      ///< Cancellation mode hot.
+    CANCELLATION_MODE_COLD,                                     ///< Cancellation mode cold.
+    CANCELLATION_MODE_CHEMICAL,                                 ///< Cancellation mode chemical.
+    CANCELLATION_MODE_WATER,                                    ///< Cancellation mode water.
+    NUM_OF_CANCELLATION_MODES                                   ///< Number of cancellation modes.
+} CANCELLATION_MODE_T;
+
 /**@}*/
 
 /**
@@ -353,11 +365,19 @@
 /// Enumeration of heat disinfect active cool mode states.
 enum DG_Heat_Cool_States
 {
-    DG_HEAT_DISINFECT_ACTIVE_COOL_STATE_START = 0,               ///< Heat disinfect active cool, start mode state
-    DG_HEAT_DISINFECT_ACTIVE_COOL_STATE_COOL_DOWN_RO_FILTER,     ///< Heat disinfect active cool, cool down RO filter state
-    DG_HEAT_DISINFECT_ACTIVE_COOL_STATE_CANCEL_BASIC_PATH,       ///< Heat disinfect active cool, cancel mode basic path state
-    DG_HEAT_DISINFECT_ACTIVE_COOL_STATE_COMPLETE,                ///< Heat disinfect active cool, complete state
-    NUM_OF_DG_HEAT_DISINFECT_ACTIVE_COOL_STATES                  ///< Number of heat disinfect mode states
+    DG_HEAT_DISINFECT_ACTIVE_COOL_STATE_START = 0,                   ///< Heat disinfect active cool, start mode state.
+    DG_HEAT_DISINFECT_ACITVE_COOL_MIX_DRAIN_R1_STATE,                ///< Heat disinfect active cool, mix drain R1 state.
+    DG_HEAT_DISINFECT_ACTIVE_COOL_MIX_DRAIN_R2_STATE,                ///< Heat disinfect active cool, mix drain R2 state.
+    DG_HEAT_DISINFECT_ACTIVE_COOL_FILL_R1_STATE,                     ///< Heat disinfect active cool, fill R1 state.
+    DG_HEAT_DISINFECT_ACTIVE_COOL_FILL_R2_STATE,                     ///< Heat disinfect active cool, fill R2 state.
+    DG_HEAT_DISINFECT_ACTIVE_COOL_DRAIN_R2_FILL_R1_TO_R2_STATE,      ///< Heat disinfect active cool, drain R2 fill R1 to R2 state.
+    DG_HEAT_DISINFECT_ACTIVE_COOL_DRAIN_R1_FILL_R2_TO_R1_STATE,      ///< Heat disinfect active cool, drain R1 fill R2 to R1 state.
+    DG_HEAT_DISINFECT_ACTIVE_COOL_DRAIN_R1_STATE,                    ///< Heat disinfect active cool, drain R1 state.
+    DG_HEAT_DISINFECT_ACTIVE_COOL_DRAIN_R2_STATE,                    ///< Heat disinfect active cool, drain R2 state.
+    DG_HEAT_DISINFECT_ACTIVE_COOL_CANCEL_WATER_PATH_STATE,           ///< Heat disinfect active cool, cancel water path state.
+    DG_HEAT_DISINFECT_ACTIVE_COOL_CANCEL_BASIC_PATH_STATE,           ///< Heat disinfect active cool, cancel basic path state.
+    DG_HEAT_DISINFECT_ACTIVE_COOL_STATE_COMPLETE,                    ///< Heat disinfect active cool, complete state.
+    NUM_OF_DG_HEAT_DISINFECT_ACTIVE_COOL_STATES                      ///< Number of heat disinfect mode states.
 };
 typedef enum DG_Heat_Cool_States DG_HEAT_DISINFECT_ACTIVE_COOL_STATE_T;          ///< Type for DG heat disinfect active cool states enumeration
 
@@ -611,6 +631,8 @@
     DG_EVENT_SW_CONFIG_UPDATE,                                          ///< DG new software configuration has been updated
     DG_EVENT_SCHEDULED_RUNS_UPDATE,                                     ///< DG new scheduled runs information has been updated
     DG_EVENT_HEATERS_INFO_UPDATE,                                       ///< DG new heaters information has been updated
+    DG_EVENT_AVG_DIALYSATE_FILL_COND_VALUES,                            ///< DG average dialysate fill conductivity values
+    DG_EVENT_RESERVOIR_FILL_VALUES,                                     ///< DG reservoir fill values
     NUM_OF_DG_EVENT_IDS                                                 ///< Total number of DG events
 };
 typedef enum DG_Event_List DG_EVENT_ID_T;                               ///< Type for DG event list enumeration
@@ -637,13 +659,12 @@
 /**@}*/
 
 #ifndef _RELEASE_
-///Nelson lab disinfect efficacy support
+// Nelson lab disinfect efficacy support
 typedef enum Nelson_States
 {
     NELSON_NONE = 0,                                                    // Nelson none.
     NELSON_INOCULATE,                                                   // Nelson inoculate.
     NELSON_HEAT_DISINFECT,                                              // Nelson heat disinfect.
-    NELSON_POS_CONTROL_CHEM_DISINFECT,                                  // Nelson positive control chemical disinfect.
     NELSON_POS_CONTROL_HEAT_DISINFECT,                                  // Nelson positive control heat disinfect.
     NELSON_CHEM_DISINFECT,                                              // Nelson chemical disinfect.
     NELSON_DRAIN_SAMPLES,                                               // Nelson drain sample.