Index: Common.h
===================================================================
diff -u -r783b26846cc28a6d97903a22b03dfb1fe244832d -r835011262b104e54177237c0a30707c0769aba17
--- Common.h	(.../Common.h)	(revision 783b26846cc28a6d97903a22b03dfb1fe244832d)
+++ Common.h	(.../Common.h)	(revision 835011262b104e54177237c0a30707c0769aba17)
@@ -7,8 +7,8 @@
 *
 * @file    Common.h
 *
-* @author  (last)      Dara Navaei
-* @date    (last)      07-Mar-2023
+* @author  (last)      Michael Garthwaite
+* @date    (last)      08-Mar-2023
 *
 * @author  (original)  Sean
 * @date    (original)  04-Feb-2020
@@ -376,6 +376,8 @@
     F32 ROFlowRateLPM;                          ///< RO flow rate in L/min.
     F32 ROFlowRateWithCPsLPM;                   ///< RO flow rate with concentrate pumps in L/min.
     F32 dialysateFlowRateLPM;                   ///< Dialysate flow rate L/min.
+    F32 RORawFlowRateLPM;                       ///< Raw RO flow rate in L/min.
+    F32 dialysateRawFlowRateLPM;                ///< Raw dialysate flow rate in L/min.
 } FLOW_SENSORS_DATA_T;
 
 /// DG switch reservoirs command structure
@@ -385,6 +387,52 @@
     BOOL useLastTrimmerHeaterDC;                ///< Use last trimmer heater duty cycle flag.
 } DG_SWITCH_RSRVRS_CMD_T;
 
+/// DG change valve settings command structure
+typedef struct
+{
+    U32 valveSettingCmd;                         ///< DG valve setting command.
+} DG_VALVE_SETTING_CMD_REQUEST_T;
+
+/// DG fill command structure
+typedef struct
+{
+    U32 fillToVolMl;                            ///< fill to volume in mL.
+    U32 cmd;                                    ///< DG cmd.
+    F32 targetFlowRateLPM;                      ///< target flow rate in LPM.
+} DG_FILL_CMD_T;
+
+/// DG start stop command structure
+typedef struct
+{
+    BOOL start;                                 ///< DG start stop cmd.
+} DG_START_STOP_TX_CMD_REQUEST_T;
+
+/// DG start stop trimmer heater command structure
+typedef struct
+{
+    BOOL start;                                 ///< DG start stop trimmer heater.
+} DG_START_STOP_TRIMMER_HEATER_CMD_T;
+
+typedef struct
+{
+    BOOL start;                                 ///< DG start stop flush mode.
+} DG_FLUSH_MODE_CMD_T;
+
+typedef struct
+{
+    BOOL start;                                 ///< DG start stop heat disinfection mode.
+} DG_HEAT_DISINFECTION_MODE_CMD_T;
+
+typedef struct
+{
+    BOOL start;                                 ///< DG start stop chem disinfection mode.
+} DG_CHEM_DISINFECTION_MODE_CMD_T;
+
+typedef struct
+{
+    U32 cmd;                                    ///< DG sample water command.
+} DG_SAMPLE_WATER_CMD_REQUEST_T;
+
 #pragma pack(push, 1)
 /// DG usage info structure.
 typedef struct
@@ -396,6 +444,7 @@
     U32 lastChemDisCompleteDateEpoch;           ///< Last chemical disinfect complete date in epoch.
     U32 lastChemDisFlushCompleteDateEpoch;      ///< Last chemical disinfect flush complete date in epoch.
     U32 lastHeatDisCompleteDateEpoch;           ///< Last heat disinfect complete date in epoch.
+    U32 lastHeatActiveCoolCompleteDateEpoch;    ///< Last heat disinfect active cool complete date in epoch.
     U32 lastFilterFlushCompleteDateEpoch;       ///< Last filter flush complete date in epoch.
     U32 lastResetTimeEpoch;                     ///< Last time the record was reset in epoch.
     U16 crc;                                    ///< CRC for the DG usage info structure.