Index: DGDefs.h
===================================================================
diff -u -red99101f153fb2e6139f9be116cda8b46082406e -r6d64b9cc811713e4f5103d0771b2187d99990dad
--- DGDefs.h	(.../DGDefs.h)	(revision ed99101f153fb2e6139f9be116cda8b46082406e)
+++ DGDefs.h	(.../DGDefs.h)	(revision 6d64b9cc811713e4f5103d0771b2187d99990dad)
@@ -7,8 +7,8 @@
 *
 * @file    DGDefs.h
 *
-* @author  (last)      Michael Garthwaite
-* @date    (last)      16-May-2023
+* @author  (last)      Dara Navaei
+* @date    (last)      31-May-2023
 *
 * @author  (original)  Sean Nash
 * @date    (original)  29-May-2020
@@ -41,6 +41,7 @@
     DG_MODE_CHEM,                       ///< Chemical Disinfect mode
     DG_MODE_CHFL,                       ///< Chemical Disinfect Flush mode
     DG_MODE_HCOL,                       ///< Heat disinfect cooling mode
+    DG_MODE_ROPS,                       ///< RO permeate sample mode
     DG_MODE_NLEG,                       ///< Not legal - an illegal mode transition occurred
     NUM_OF_DG_MODES                     ///< Number of DG operation modes
 };
@@ -218,6 +219,7 @@
     DG_DISINFECT_HEAT_STATE,                            ///< DG disinfect heat
     DG_DISINFECT_CHEM_STATE,                            ///< DG disinfect chemical
     DG_DISINFECT_CHEM_FLUSH_STATE,                      ///< DG disinfect chemical flush
+    DG_DISINFECT_RO_PERMEATE_SAMPLE_STATE,              ///< DG disinfect RO permeate sample
     DG_DISINFECT_NOT_RUNNING_STATE,                     ///< DG disinfect not running
     NUM_OF_DG_DISINFECT_STATES                          ///< Number of DG disinfect states
 };
@@ -493,6 +495,31 @@
 /**@}*/
 
 /**
+ *  @addtogroup DGROPermeateSampleMode
+ *  @{
+ */
+
+/// Enumeration of RO permeate mode.
+enum DG_RO_Permeate_States
+{
+    DG_RO_PERM_SAMPLE_STATE_START = 0,                          ///< RO Permeate Sample, start mode state
+    DG_RO_PERM_SAMPLE_STATE_DRAIN_R1,                           ///< RO Permeate Sample, drain reservoir 1 state
+    DG_RO_PERM_SAMPLE_STATE_DRAIN_R2,                           ///< RO Permeate Sample, drain reservoir 2 state
+    DG_RO_PERM_SAMPLE_STATE_FLUSH_DRAIN,                        ///< RO Permeate Sample, flush drain state
+    DG_RO_PERM_SAMPLE_STATE_FLUSH_DIALYSATE,                    ///< RO Permeate Sample, flush dialysate state
+    DG_RO_PERM_SAMPLE_STATE_FLUSH_CONCENTRATE_STRAWS,           ///< RO Permeate Sample, flush concentrate straws state
+    DG_RO_PERM_SAMPLE_STATE_FLUSH_R2_TO_R1_AND_DRAIN_R1,        ///< RO Permeate Sample, flush R2 to R1 and drain R1 state
+    DG_RO_PERM_SAMPLE_STATE_COLLECT_SAMPLE,                     ///< RO Permeate Sample, collect sample state
+    DG_RO_PERM_SAMPLE_STATE_CANCEL_BASIC_PATH,                  ///< RO Permeate Sample, cancel basic path state
+    DG_RO_PERM_SAMPLE_STATE_CANCEL_WATER_PATH,                  ///< RO Permeate Sample, cancel water path state
+    DG_RO_PERM_SAMPLE_STATE_COMPLETE,                           ///< RO Permeate Sample, complete mode state
+    NUM_OF_DG_RO_PERM_STATES                                    ///< Number of RO permeate mode states
+};
+typedef enum DG_RO_Permeate_States DG_RO_PERM_STATE_T;    ///< Type for DG RO Permeate states enumeration
+
+/**@}*/
+
+/**
  *  @addtogroup DGServiceMode
  *  @{
  */
@@ -526,14 +553,17 @@
     DG_CMD_VALVE_SETTING = 8,                  ///< Command to request DG to change valve settings
     DG_CMD_SAMPLE_WATER = 9,                   ///< Command to request DG to sample water
     DG_CMD_START_FLUSH = 10,                   ///< Command to request DG to start flush
-    DG_CMD_STOP_FLUSH = 11,                    ///< Command to request DG to stop flu
+    DG_CMD_STOP_FLUSH = 11,                    ///< Command to request DG to stop flush
     DG_CMD_START_HEAT_DISINFECT = 12,          ///< Command to request DG to start heat disinfect
     DG_CMD_STOP_HEAT_DISINFECT = 13,           ///< Command to request DG to stop heat disinfect
     DG_CMD_START_CHEM_DISINFECT = 14,          ///< Command to request DG to start chemical disinfect
     DG_CMD_STOP_CHEM_DISINFECT = 15,           ///< Command to request DG to stop chemical disinfect
     DG_CMD_REQUEST_CONC_MIXING_RATIOS = 16,    ///< Command to request DG to send the concentrate pumps mixing ratios
     DG_CMD_START_CHEM_DISINFECT_FLUSH = 17,    ///< Command to request DG to start chemical disinfect
     DG_CMD_STOP_CHEM_DISINFECT_FLUSH = 18,     ///< Command to request DG to stop chemical disinfect
+    DG_CMD_START_RO_PERMEATE_SAMPLE = 19,      ///< Command to request DG to start RO permeate sample mode
+    DG_CMD_STOP_RO_PERMEATE_SAMPLE = 20,       ///< Command to request DG to stop RO permeate sample mode
+    DG_CMD_STOP_ACTIVE_COOL = 21,              ///< Command to request DG to stop active cool mode
     NUM_OF_DG_COMMANDS                         ///< Number of DG commands
 };
 typedef enum DG_Command DG_COMMAND_T;   ///< Type for DG commands enumeration