Index: firmware/App/Modes/ModeStandby.c
===================================================================
diff -u -r20c90ee790deb7a38da44f948fef5b34d541d930 -rd28280f1054fc9ddf9304a11373dc9ee963425e3
--- firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision 20c90ee790deb7a38da44f948fef5b34d541d930)
+++ firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision d28280f1054fc9ddf9304a11373dc9ee963425e3)
@@ -7,8 +7,8 @@
 *
 * @file    ModeStandby.c
 *
-* @author  (last)      Dara Navaei
-* @date    (last)      15-Jul-2022
+* @author  (last)      Darren Cox
+* @date    (last)      29-Aug-2022
 *
 * @author  (original)  Dara Navaei
 * @date    (original)  05-Nov-2019
@@ -111,6 +111,8 @@
  *************************************************************************/
 U32 transitionToStandbyMode( void )
 {
+    HD_OP_MODE_T previousOpMode = getPreviousOperationMode();
+
     // Re-initialize when transitioning to standby mode
     initStandbyMode();
     initDGInterface();
@@ -137,6 +139,12 @@
     setValvePosition( VBA, VALVE_POSITION_A_INSERT_EJECT );
     setValvePosition( VBV, VALVE_POSITION_A_INSERT_EJECT );
 
+    // If we just exited Post Treatment Mode, goto disinfect sub state.
+    if ( MODE_POST == previousOpMode )
+    {
+        currentStandbyState = STANDBY_WAIT_FOR_DISINFECT_STATE;
+    }
+
     return currentStandbyState;
 }
 
@@ -255,7 +263,7 @@
                     {
                         case 0: // Pumps and valves off
                             setBloodPumpTargetFlowRate( 0, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_OPEN_LOOP );
-                            setDialInPumpTargetFlowRate( 0, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_OPEN_LOOP );
+                            setDialInPumpTargetFlowRate( 0, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_OPEN_LOOP, 0.0F );
                             setDialOutPumpTargetRate( 0, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_OPEN_LOOP );
                             setValvePosition( VDI, VALVE_POSITION_C_CLOSE );
                             setValvePosition( VDO, VALVE_POSITION_C_CLOSE );
@@ -272,15 +280,15 @@
 
                         case 2: // Pumps on, valves in pos A
                             setBloodPumpTargetFlowRate( 500, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_OPEN_LOOP );
-                            setDialInPumpTargetFlowRate( 500, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_OPEN_LOOP );
+                            setDialInPumpTargetFlowRate( 500, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_OPEN_LOOP, 0.0F );
                             setDialOutPumpTargetRate( 500, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_OPEN_LOOP );
                             break;
 
 
                         default: // Should not get here, reset if we do
                             toggle = 0;
                             setBloodPumpTargetFlowRate( 0, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_OPEN_LOOP );
-                            setDialInPumpTargetFlowRate( 0, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_OPEN_LOOP );
+                            setDialInPumpTargetFlowRate( 0, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_OPEN_LOOP, 0.0F );
                             setDialOutPumpTargetRate( 0, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_OPEN_LOOP );
                             setValvePosition( VDI, VALVE_POSITION_C_CLOSE );
                             setValvePosition( VDO, VALVE_POSITION_C_CLOSE );
@@ -480,28 +488,49 @@
  * initiation of setting the disinfects submode.
  * @details Inputs: currentStandbyState
  * @details Outputs: currentStandbyState
+ * @param cmd initiate (1) or cancel (0)
  * @return TRUE if signal accepted, FALSE if not
  *************************************************************************/
-BOOL signalInitiateStandbyDisinfectSubmode( void )
+BOOL signalInitiateStandbyDisinfectSubmode( U32 cmd )
 {
     BOOL result                            = FALSE;
     REQUEST_REJECT_REASON_CODE_T rejReason = REQUEST_REJECT_REASON_NOT_ALLOWED_IN_CURRENT_MODE;
 
-    if ( ( MODE_STAN == getCurrentOperationMode() ) && ( STANDBY_WAIT_FOR_TREATMENT_STATE == currentStandbyState ) )
+    if ( cmd == 0 )
     {
-        if ( TRUE == isDGCommunicating() )
+        // Cancel Disinfect command
+        if ( STANDBY_WAIT_FOR_DISINFECT_STATE == currentStandbyState )
         {
-            currentStandbyState = STANDBY_WAIT_FOR_DISINFECT_STATE;
+            currentStandbyState = STANDBY_WAIT_FOR_TREATMENT_STATE;
             result              = TRUE;
             rejReason           = REQUEST_REJECT_REASON_NONE;
         }
         else
         {
-            rejReason = REQUEST_REJECT_REASON_DG_COMM_LOST;
+            result              = FALSE;
+            rejReason           = REQUEST_REJECT_REASON_NOT_ALLOWED_IN_CURRENT_MODE;
         }
     }
+    else
+    {
+        // Initiate Disinfect command
+        if ( ( MODE_STAN == getCurrentOperationMode() ) && ( STANDBY_WAIT_FOR_TREATMENT_STATE == currentStandbyState ) )
+        {
+            if ( TRUE == isDGCommunicating() )
+            {
+                currentStandbyState = STANDBY_WAIT_FOR_DISINFECT_STATE;
+                result              = TRUE;
+                rejReason           = REQUEST_REJECT_REASON_NONE;
+            }
+            else
+            {
+                result              = FALSE;
+                rejReason           = REQUEST_REJECT_REASON_DG_COMM_LOST;
+            }
+        }
+    }
 
-    sendDisinfectConfirmResponse( result, rejReason );
+    handleSetHDStandbyDisinfectSubmodeResponse( result, rejReason );
 
     return result;
 }