Index: firmware/App/Modes/ModeHeatDisinfect.c
===================================================================
diff -u -r184ee0c5527af35d34c29bd4f80cf8b1959ffd35 -reeaab2a9a685fb18845888d91040d3aa01977f6d
--- firmware/App/Modes/ModeHeatDisinfect.c	(.../ModeHeatDisinfect.c)	(revision 184ee0c5527af35d34c29bd4f80cf8b1959ffd35)
+++ firmware/App/Modes/ModeHeatDisinfect.c	(.../ModeHeatDisinfect.c)	(revision eeaab2a9a685fb18845888d91040d3aa01977f6d)
@@ -7,8 +7,8 @@
 *
 * @file    ModeHeatDisinfect.c
 *
-* @author  (last)      Dara Navaei
-* @date    (last)      27-Feb-2023
+* @author  (last)      Michael Garthwaite
+* @date    (last)      16-May-2023
 *
 * @author  (original)  Sean
 * @date    (original)  20-Apr-2020
@@ -79,6 +79,7 @@
 #define RSRVRS_DRAIN_TIMEOUT_MS                    ( 2 * SEC_PER_MIN * MS_PER_SECOND )                         ///< Reservoirs 1 & 2 drain timeout in ms.
 
 // Target temperature
+#define HEAT_DISINFECT_PRIM_HEATER_FLUSH_TARGET_TEMP_C 60.0F                                                   ///< Heat disinfect primary heater flush target temperature C.
 #define HEAT_DISINFECT_PRIM_HEATER_TARGET_TEMP_C   90.0F                                                       ///< Heat disinfect primary heater target temperature in C.
 #define HEAT_DISINFECT_TRIM_HEATER_TARGET_TEMP_C   90.0F                                                       ///< Heat disinfect trimmer heater target temperature in C.
 #define HEAT_DISINFECT_CONC_PUMPS_START_TEMP_C     75.0F                                                       ///< Heat disinfect start concentrate pumps target temperature in C.
@@ -317,7 +318,7 @@
     deenergizeActuators( NO_PARK_CONC_PUMPS );
 
     initHeatDisinfectMode();
-
+    setCurrentSubState( NO_SUB_STATE );
     setCPLDCleanLEDColor( CPLD_CLEAN_LED_ORANGE );
 
     return heatDisinfectState;
@@ -551,7 +552,7 @@
     else if ( DG_RESERVOIR_NOT_REACHED_TARGET == rsrvr1Status )
     {
         prevHeatDisinfectState = state;
-        state                  = DG_HEAT_DISINFECT_STATE_CANCEL_BASIC_PATH;
+        state                  = DG_HEAT_DISINFECT_STATE_CANCEL_WATER_PATH;
     }
 
     return state;
@@ -604,7 +605,7 @@
     else if ( DG_RESERVOIR_NOT_REACHED_TARGET == rsrvr2Status )
     {
         prevHeatDisinfectState = state;
-        state                  = DG_HEAT_DISINFECT_STATE_CANCEL_BASIC_PATH;
+        state                  = DG_HEAT_DISINFECT_STATE_CANCEL_WATER_PATH;
     }
 
     return state;
@@ -724,7 +725,7 @@
             if ( nelsonSupport != NELSON_INOCULATE )
 #endif
             {
-                setHeaterTargetTemperature( DG_PRIMARY_HEATER, HEAT_DISINFECT_PRIM_HEATER_TARGET_TEMP_C );
+                setHeaterTargetTemperature( DG_PRIMARY_HEATER, HEAT_DISINFECT_PRIM_HEATER_FLUSH_TARGET_TEMP_C );
                 startHeater( DG_PRIMARY_HEATER );
             }
 
@@ -877,7 +878,7 @@
             turnOffUVReactor( OUTLET_UV_REACTOR );
             // Set the valves to drain R2 and no fill
             setValveState( VPI, VALVE_STATE_CLOSED );
-            setValveState( VPD, VALVE_STATE_OPEN_C_TO_NC );
+            setValveState( VPD, VALVE_STATE_DRAIN_C_TO_NO );
             setValveState( VPO, VALVE_STATE_FILL_C_TO_NC );
             setValveState( VRO, VALVE_STATE_R1_C_TO_NO );
             setValveState( VRD2, VALVE_STATE_OPEN );
@@ -1606,7 +1607,7 @@
         SET_ALARM_WITH_1_U32_DATA( alarmDetectedPendingTrigger, prevHeatDisinfectState )
     }
 
-    requestNewOperationMode( DG_MODE_FAUL );
+    requestNewOperationMode( DG_MODE_STAN );
 }
 
 /*********************************************************************//**
@@ -1963,10 +1964,14 @@
         {
             // Set the variables to fail and go to cancel water path. Set the pending alarm to no alarm so the cancel water path
             // will not be raising the alarm at end of the cancel water path. The recoverable alarm is raised here in this function
-            U32 cap                     = (U32)( STATE_OPEN == getSwitchStatus( CONCENTRATE_CAP ) ? CONCENTRATE_CAP : DIALYSATE_CAP );
             prevHeatDisinfectState      = heatDisinfectState;
             heatDisinfectState          = DG_HEAT_DISINFECT_STATE_CANCEL_WATER_PATH;
-            alarmDetectedPendingTrigger = ALARM_ID_DG_DIALYSATE_OR_CONC_CAP_NOT_IN_PROPER_POSITION;
+            alarmDetectedPendingTrigger = ALARM_ID_DG_DIALYSATE_CAP_NOT_IN_PROPER_POSITION;
+
+            if ( STATE_OPEN == getSwitchStatus( CONCENTRATE_CAP ) )
+            {
+                alarmDetectedPendingTrigger = ALARM_ID_DG_CONCENTRATE_CAP_NOT_IN_PROPER_POSITION;
+            }
         }
     }