Index: firmware/App/Controllers/DGInterface.h
===================================================================
diff -u -rdb291cc22fd8f10e6e47cad468e14ed5590a94f2 -r01391d9a66d4a2d6266366d0f838c08041d2d18c
--- firmware/App/Controllers/DGInterface.h	(.../DGInterface.h)	(revision db291cc22fd8f10e6e47cad468e14ed5590a94f2)
+++ firmware/App/Controllers/DGInterface.h	(.../DGInterface.h)	(revision 01391d9a66d4a2d6266366d0f838c08041d2d18c)
@@ -14,28 +14,28 @@
 * @date    (original)  08-Apr-2020
 *
 ***************************************************************************/
-
-#ifndef __DG_H__
-#define __DG_H__
-
-#include "HDCommon.h"
-#include "DGDefs.h"
-
-/**
- *  @defgroup DGInterface DGInterface
- *  @brief DG interface/monitor module.  Interfaces with and monitors the
- *  DG (dialysate generator) sub-system.
- *
- *  @addtogroup DGInterface
- *  @{
- */
-
-// ********** public definitions **********
 
+#ifndef __DG_H__
+#define __DG_H__
+
+#include "HDCommon.h"
+#include "DGDefs.h"
+
+/**
+ *  @defgroup DGInterface DGInterface
+ *  @brief DG interface/monitor module.  Interfaces with and monitors the
+ *  DG (dialysate generator) sub-system.
+ *
+ *  @addtogroup DGInterface
+ *  @{
+ */
+
+// ********** public definitions **********
+
 #define DEFAULT_TARGET_FILL_FLOW_RATE_LPM                  0.8F              ///< Default target fill flow rate in L/min.
 #define DRAIN_RESERVOIR_TO_VOLUME_ML                       0                 ///< Drain reservoir to this volume (in mL) during treatment.
 #define LOAD_CELL_ILLEGAL_WEIGHT_VALUE                   -10000.0F           ///< Initial value for Load Cells, known bad value
-
+
 /// DG Concentrate ratios data structure.
 typedef struct
 {
@@ -95,20 +95,20 @@
     BOOL isDGUsageInfoAvailable;                                             ///< Flag to indicate DG usage info is available.
 } DG_SERVICE_AND_USAGE_DATA_T;
 
-// ********** public function prototypes **********
-
+// ********** public function prototypes **********
+
 void initDGInterface( void );
 
 void execDGInterfaceMonitor( void );
 
-DG_OP_MODE_T getDGOpMode( void );
-U32 getDGSubMode( void );
-DG_RESERVOIR_ID_T getDGActiveReservoir( void );
+DG_OP_MODE_T getDGOpMode( void );
+U32 getDGSubMode( void );
+DG_RESERVOIR_ID_T getDGActiveReservoir( void );
 DG_RESERVOIR_ID_T getDGInactiveReservoir( void );
 BOOL hasDGCompletedReservoirSwitch( void );
 BOOL getDialysateFlowDataFreshFlag( void );
 F32 getDGDialysateFlowRateLMin( void );
-F32 getDGRawDialysateFlowRateLMin( void );
+F32 getDGRawDialysateFlowRateLMin( void );
 F32 getLoadCellWeight( LOAD_CELL_ID_T loadCellID );
 F32 getReservoirWeight( DG_RESERVOIR_ID_T resID );
 F32 getReservoirWeightLargeFilter( DG_RESERVOIR_ID_T resID );
@@ -120,44 +120,46 @@
 DG_DISINFECT_UI_STATES_T getDGDisinfectsStates( void );
 DG_MIXING_RATIOS_T getDGMixingRatios( void );
 void getHDVersionDGServiceAndUsageData( DG_SERVICE_AND_USAGE_DATA_T* data );
-
-void setDGOpMode( U32 opMode, U32 subMode );
-void setDialysateTemperatureReadings( F32 tdi, F32 tro, F32 thd );
-void setDGReservoirsData( DG_RESERVOIR_ID_T resID, U32 fillVol, U32 drainVol );
+
+void setDGOpMode( U32 opMode, U32 subMode );
+void setDialysateTemperatureReadings( F32 tdi, F32 tro, F32 thd );
+void setDGReservoirsData( DG_RESERVOIR_ID_T resID, U32 fillVol, U32 drainVol );
 void setDialysateFlowData( FLOW_SENSORS_DATA_T flowRates );
 void setNewLoadCellReadings( F32 res1Primary, F32 res1Backup, F32 res2Primary, F32 res2Backup );
 void setDGDisinfectsStates( DG_DISINFECT_UI_STATES_T states );
 void setDGMixingRatios( DG_MIXING_RATIOS_T ratios );
 void setDGHeatersData( HEATERS_DATA_T *data );
 void setHDVersionDGServiceRecord( DG_SERVICE_RECORD_T* data );
 void setHDVersionDGUsageInfo( DG_USAGE_INFO_RECORD_T* data );
-
-void cmdSetDGDialysateHeatingParams( DG_CMD_DIALYSATE_HEATING_PARAMS_T heatingParams );
-void cmdStartDG( void );
-void cmdStopDG( void );
+
+void cmdSetDGDialysateHeatingParams( DG_CMD_DIALYSATE_HEATING_PARAMS_T heatingParams );
+void cmdStartDG( void );
+void cmdStopDG( void );
 void cmdSetDGActiveReservoir( DG_SWITCH_RSRVRS_CMD_T *cmd );
-void cmdChangeDGValveSetting( DG_VALVE_SETTING_ID_T valveSettingID );
+void cmdChangeDGValveSetting( DG_VALVE_SETTING_ID_T valveSettingID );
 void cmdStartDGFill( U32 fillToVolMl, F32 targetFlowLPM );
 void cmdStopDGFill( void );
-void cmdStartDGDrain( U32 drainToVolMl, BOOL tareLoadCell, BOOL rinse, BOOL start );
-void cmdStartDGTrimmerHeater( void );
+void cmdStartDGDrain( U32 drainToVolMl, BOOL tareLoadCell, BOOL rinse, BOOL start );
+void cmdStartDGTrimmerHeater( void );
 void cmdStopDGTrimmerHeater( void );
 void cmdDGSampleWater( SAMPLE_WATER_CMD_T cmd );
 void cmdStartDGFlush( void );
 void cmdDGParkConcentratePumps( void );
 void cmdStopDGFlush( void );
-void cmdStartDGHeatDisinfect( void );
+void cmdStartDGHeatDisinfectActiveCool( void );
 void cmdStopDGHeatDisinfect( void );
+void cmdStartDGHeatDisinfectPassiveCool( void );
 void cmdStartDGChemicalDisinfect( void );
 void cmdStopDGChemicalDisinfect( void );
 void cmdStartDGChemicalFlushDisinfect( void );
 void cmdStopDGChemFlushDisinfect( void );
+void cmdStartDGActiveCool( void );
 void cmdStopDGActiveCool( void );
 void cmdStartDGROPermeateSampleMode( void );
 void cmdStopDGROPermeateSampleMode( void );
 void cmdRequestDGMixingRatios( void );
 void cmdSetDGToServiceMode( void );
-
+
 void handleDGCommandResponse( DG_CMD_RESPONSE_T *dgCmdRespPtr );
 BOOL getDGCommandResponse( U32 commandID, DG_CMD_RESPONSE_T *cmdRespPtr );
 
@@ -166,6 +168,6 @@
 BOOL testSetDialOutLoadCellWeightOverride( U32 sensor, F32 value );
 BOOL testResetDialOutLoadCellWeightOverride( U32 sensor );
 
-/**@}*/
-
-#endif
+/**@}*/
+
+#endif