Index: firmware/App/Modes/ModePreTreat.c
===================================================================
diff -u -rf013ac5e5de456c4fa4367884cda6515f2a51642 -r9e85e7ace1390d48587174a5bc6eb11d5185cea4
--- firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision f013ac5e5de456c4fa4367884cda6515f2a51642)
+++ firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision 9e85e7ace1390d48587174a5bc6eb11d5185cea4)
@@ -51,9 +51,9 @@
 #define PRE_TREATMENT_FILL_RESERVOIR_ONE_VOLUME_ML      1300            ///< Fill reservoir one to this volume (in mL) during pre-treatment mode.
 #define PRE_TREATMENT_FILL_RESERVOIR_TWO_VOLUME_ML      700             ///< Fill reservoir two to this volume (in mL) during pre-treatment mode.
 #else
-#define PRE_TREATMENT_FLUSH_RESERVOIR_VOLUME_ML         FILL_RESERVOIR_TO_VOLUME_ML
-#define PRE_TREATMENT_FILL_RESERVOIR_ONE_VOLUME_ML      FILL_RESERVOIR_TO_VOLUME_ML
-#define PRE_TREATMENT_FILL_RESERVOIR_TWO_VOLUME_ML      FILL_RESERVOIR_TO_VOLUME_ML
+//#define PRE_TREATMENT_FLUSH_RESERVOIR_VOLUME_ML         FILL_RESERVOIR_TO_VOLUME_ML
+//#define PRE_TREATMENT_FILL_RESERVOIR_ONE_VOLUME_ML      FILL_RESERVOIR_TO_VOLUME_ML
+//#define PRE_TREATMENT_FILL_RESERVOIR_TWO_VOLUME_ML      FILL_RESERVOIR_TO_VOLUME_ML
 #endif
 
 /// States of the pre-treatment reservoir management state machine.
@@ -196,11 +196,12 @@
     {
         case HD_PRE_TREATMENT_START_STATE:
 #ifndef SKIP_SAMPLE_WATER
+            //transitionToSampleWater();
+#endif
             if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_SAMPLE_WATER ) != SW_CONFIG_ENABLE_VALUE )
             {
                 transitionToSampleWater();
             }
-#endif
             currentPreTreatmentState = HD_PRE_TREATMENT_WATER_SAMPLE_STATE;
             break;
 
@@ -355,11 +356,13 @@
     REQUEST_REJECT_REASON_CODE_T rejReason = REQUEST_REJECT_REASON_NO_PATIENT_CONNECTION_CONFIRM;
 
 #ifdef SKIP_UI_INTERACTION
-    if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_UI_INTERACTION ) == SW_CONFIG_ENABLE_VALUE )
+    patientConnectionConfirm = TRUE;
+#endif
+
+    if ( SW_CONFIG_ENABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_DISABLE_UI_INTERACTION ) )
     {
         patientConnectionConfirm = TRUE;
     }
-#endif
 
     if ( TRUE == patientConnectionConfirm )
     {
@@ -546,8 +549,8 @@
     execSampleWater();
 
 #ifndef SKIP_SAMPLE_WATER
-    if ( ( SAMPLE_WATER_COMPLETE_STATE == getSampleWaterState() ) /*||
-         ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_SAMPLE_WATER ) != SW_CONFIG_ENABLE_VALUE )*/ ) // DEBUG_DENALI
+    if ( ( SAMPLE_WATER_COMPLETE_STATE == getSampleWaterState() ) ||
+         ( SW_CONFIG_ENABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_DISABLE_SAMPLE_WATER ) ) )
 #endif
     {
         cmdDGSampleWater( SAMPLE_WATER_CMD_END );
@@ -652,11 +655,13 @@
     HD_PRE_TREATMENT_MODE_STATE_T state = HD_PRE_TREATMENT_CART_INSTALL_STATE;
 
 #ifdef SKIP_UI_INTERACTION
-    if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_UI_INTERACTION ) != SW_CONFIG_ENABLE_VALUE )
+    confirmInstallRequested = TRUE;
+#endif
+
+    if ( SW_CONFIG_ENABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_DISABLE_UI_INTERACTION ) )
     {
         confirmInstallRequested = TRUE;
     }
-#endif
 
     if ( TRUE == confirmInstallRequested )
     {
@@ -771,11 +776,13 @@
     execPreTreatmentRecirc();
 
 #ifdef SKIP_UI_INTERACTION
-    if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_UI_INTERACTION ) == SW_CONFIG_ENABLE_VALUE )
+    continueToTreatmentRequested = TRUE;
+#endif
+
+    if ( SW_CONFIG_ENABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_DISABLE_UI_INTERACTION ) )
     {
         continueToTreatmentRequested = TRUE;
     }
-#endif
 
     if ( TRUE == continueToTreatmentRequested )
     {
@@ -965,16 +972,37 @@
         {
             if ( DG_RESERVOIR_1 == getDGInactiveReservoir() )
             {
-                cmdStartDGFill( PRE_TREATMENT_FILL_RESERVOIR_ONE_VOLUME_ML, DEFAULT_TARGET_FILL_FLOW_RATE_LPM );
+                U32 volume = FILL_RESERVOIR_TO_VOLUME_ML;
+
+                if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_PRIMING ) != SW_CONFIG_ENABLE_VALUE )
+                {
+                    volume = PRE_TREATMENT_FILL_RESERVOIR_ONE_VOLUME_ML;
+                }
+
+                cmdStartDGFill( volume, DEFAULT_TARGET_FILL_FLOW_RATE_LPM );
             }
             else
             {
-                cmdStartDGFill( PRE_TREATMENT_FILL_RESERVOIR_TWO_VOLUME_ML, DEFAULT_TARGET_FILL_FLOW_RATE_LPM );
+                U32 volume = FILL_RESERVOIR_TO_VOLUME_ML;
+
+                if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_PRIMING ) != SW_CONFIG_ENABLE_VALUE )
+                {
+                    volume = PRE_TREATMENT_FILL_RESERVOIR_TWO_VOLUME_ML;
+                }
+
+                cmdStartDGFill( volume, DEFAULT_TARGET_FILL_FLOW_RATE_LPM );
             }
         }
         else
         {
-            cmdStartDGFill( PRE_TREATMENT_FLUSH_RESERVOIR_VOLUME_ML, DEFAULT_TARGET_FILL_FLOW_RATE_LPM );
+            U32 volume = FILL_RESERVOIR_TO_VOLUME_ML;
+
+            if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_PRIMING ) != SW_CONFIG_ENABLE_VALUE )
+            {
+                volume = PRE_TREATMENT_FLUSH_RESERVOIR_VOLUME_ML;
+            }
+
+            cmdStartDGFill( volume, DEFAULT_TARGET_FILL_FLOW_RATE_LPM );
         }
     }
 
@@ -1046,6 +1074,11 @@
             if ( FALSE == reservoirFlushedStatus[ DG_RESERVOIR_1 ] )
             {
 #ifdef SKIP_PRIMING
+                //reservoirFilledStatus[ DG_RESERVOIR_1 ] = TRUE;
+#else
+                //reservoirFlushedStatus[ DG_RESERVOIR_1 ] = TRUE;
+                //cmdSetDGActiveReservoir( DG_RESERVOIR_1 );
+#endif
                 if ( SW_CONFIG_ENABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_DISABLE_PRIMING ) )
                 {
                     reservoirFilledStatus[ DG_RESERVOIR_1 ] = TRUE;
@@ -1055,10 +1088,6 @@
                     reservoirFlushedStatus[ DG_RESERVOIR_1 ] = TRUE;
                     cmdSetDGActiveReservoir( DG_RESERVOIR_1 );
                 }
-#else
-                reservoirFlushedStatus[ DG_RESERVOIR_1 ] = TRUE;
-                cmdSetDGActiveReservoir( DG_RESERVOIR_1 );
-#endif
             }
             else if ( ( TRUE == reservoirFlushedStatus[ DG_RESERVOIR_1 ] ) && ( FALSE == reservoirFlushedStatus[ DG_RESERVOIR_2 ] ) )
             {