Index: firmware/App/Modes/ModePreTreat.c
===================================================================
diff -u -r6a8d904f4316ed9d9f2f14f99afde63bef38eace -rf760ffc4b10556e5186e9ceb90294262063440ca
--- firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision 6a8d904f4316ed9d9f2f14f99afde63bef38eace)
+++ firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision f760ffc4b10556e5186e9ceb90294262063440ca)
@@ -7,8 +7,8 @@
 *
 * @file    ModePreTreat.c
 *
-* @author  (last)      Dara Navaei
-* @date    (last)      13-Dec-2022
+* @author  (last)      Sean Nash
+* @date    (last)      31-Jan-2023
 *
 * @author  (original)  Dara Navaei
 * @date    (original)  05-Nov-2019
@@ -124,7 +124,7 @@
 *************************************************************************/
 void initPreTreatmentMode( void )
 {
-    currentPreTreatmentState = HD_PRE_TREATMENT_START_STATE;
+    currentPreTreatmentState = HD_PRE_TREATMENT_WATER_SAMPLE_STATE;
     currentReservoirMgmtState = PRE_TREATMENT_RESERVOIR_MGMT_START_STATE;
     setUFVolStatus = FALSE;
     patientConnectionConfirm = FALSE;
@@ -196,6 +196,9 @@
 
     doorClosedRequired( FALSE, FALSE );
 
+    // Start pre-treatment mode in sample water state
+    transitionToSampleWater();
+
     return currentPreTreatmentState;
 }
 
@@ -218,16 +221,6 @@
     // execute mode state machine
     switch ( currentPreTreatmentState )
     {
-        case HD_PRE_TREATMENT_START_STATE:
-#ifndef _RELEASE_
-            if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_SAMPLE_WATER ) != SW_CONFIG_ENABLE_VALUE )
-#endif
-            {
-                transitionToSampleWater();
-            }
-            currentPreTreatmentState = HD_PRE_TREATMENT_WATER_SAMPLE_STATE;
-            break;
-
         case HD_PRE_TREATMENT_WATER_SAMPLE_STATE:
             currentPreTreatmentState = handleWaterSampleState();
             break;
@@ -620,7 +613,7 @@
     patientConnectionConfirm = FALSE;
     treatmentStartRequested = FALSE;
 
-    doorClosedRequired( FALSE, FALSE );
+    doorClosedRequired( TRUE, TRUE );
 
     for ( valve = VDI; valve < NUM_OF_VALVES; ++valve )
     {
@@ -652,27 +645,25 @@
 
     if ( SAMPLE_WATER_COMPLETE_STATE == getSampleWaterState() )
     {
-        {
-            cmdDGSampleWater( SAMPLE_WATER_CMD_END );
+        cmdDGSampleWater( SAMPLE_WATER_CMD_END );
 
-            if ( SELF_TEST_STATUS_PASSED == getSampleWaterResult() )
+        if ( SELF_TEST_STATUS_PASSED == getSampleWaterResult() )
+        {
+            if ( ( DG_MODE_STAN == dgOpMode ) && ( DG_STANDBY_MODE_STATE_IDLE == dgSubMode ) )
             {
-                if ( ( DG_MODE_STAN == dgOpMode ) && ( DG_STANDBY_MODE_STATE_IDLE == dgSubMode ) )
-                {
-                    state = HD_PRE_TREATMENT_SELF_TEST_CONSUMABLE_STATE;
-                    cmdStartDG();
-                    transitionToConsumableSelfTest();
-                }
-                else
-                {
-                    cmdStopDG();
-                }
+                state = HD_PRE_TREATMENT_SELF_TEST_CONSUMABLE_STATE;
+                cmdStartDG();
+                transitionToConsumableSelfTest();
             }
             else
             {
-                requestNewOperationMode( MODE_STAN );
+                cmdStopDG();
             }
         }
+        else
+        {
+            requestNewOperationMode( MODE_STAN );
+        }
     }
 
     return state;
@@ -880,7 +871,7 @@
  * @brief
  * The handlePatientConnectionState function handles patient connection state
  * during pre-treatment mode.
- * @details Inputs: none
+ * @details Inputs: alarmActionResumeReceived
  * @details Outputs: requested mode transition to treatment mode
  * @return current state (sub-mode)
  *************************************************************************/
@@ -894,6 +885,19 @@
         requestNewOperationMode( MODE_TREA );
     }
 
+    if ( TRUE == doesAlarmStatusIndicateStop() )
+    {
+        signalDialInPumpHardStop();
+        cmdStopDGTrimmerHeater();
+    }
+    else if ( TRUE == alarmActionResumeReceived )
+    {
+        alarmActionResumeReceived = FALSE;
+        //setDialInPumpTargetFlowRate( DIP_PATIENT_CONNECTION_FLOW_RATE_ML_MIN, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_OPEN_LOOP );
+        setDialInPumpTargetFlowRate( 250, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_OPEN_LOOP ); // TODO remove this line once the new flow control is implemented
+        cmdStartDGTrimmerHeater();
+    }
+
     return HD_PRE_TREATMENT_PATIENT_CONNECTION_STATE;
 }