Index: firmware/App/Modes/ModePreTreat.c
===================================================================
diff -u -r48e5e7c2c365b44c9831f3af0b4f321862ea12ae -rf013ac5e5de456c4fa4367884cda6515f2a51642
--- firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision 48e5e7c2c365b44c9831f3af0b4f321862ea12ae)
+++ firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision f013ac5e5de456c4fa4367884cda6515f2a51642)
@@ -56,9 +56,6 @@
 #define PRE_TREATMENT_FILL_RESERVOIR_TWO_VOLUME_ML      FILL_RESERVOIR_TO_VOLUME_ML
 #endif
 
-#define PRIMARY_HEATER_TARGET_TEMP_OFFSET               2.0  //TODO remove           ///< Primary heater target temperature offset from trimmer heater temperature.
-
-
 /// States of the pre-treatment reservoir management state machine.
 typedef enum PreTreatmentReservoirMgmt_States
 {
@@ -358,7 +355,7 @@
     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 )
+    if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_UI_INTERACTION ) == SW_CONFIG_ENABLE_VALUE )
     {
         patientConnectionConfirm = TRUE;
     }
@@ -774,7 +771,7 @@
     execPreTreatmentRecirc();
 
 #ifdef SKIP_UI_INTERACTION
-    if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_UI_INTERACTION ) != SW_CONFIG_ENABLE_VALUE )
+    if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_UI_INTERACTION ) == SW_CONFIG_ENABLE_VALUE )
     {
         continueToTreatmentRequested = TRUE;
     }
@@ -1049,7 +1046,15 @@
             if ( FALSE == reservoirFlushedStatus[ DG_RESERVOIR_1 ] )
             {
 #ifdef SKIP_PRIMING
-                reservoirFilledStatus[ DG_RESERVOIR_1 ] = TRUE;
+                if ( SW_CONFIG_ENABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_DISABLE_PRIMING ) )
+                {
+                    reservoirFilledStatus[ DG_RESERVOIR_1 ] = TRUE;
+                }
+                else
+                {
+                    reservoirFlushedStatus[ DG_RESERVOIR_1 ] = TRUE;
+                    cmdSetDGActiveReservoir( DG_RESERVOIR_1 );
+                }
 #else
                 reservoirFlushedStatus[ DG_RESERVOIR_1 ] = TRUE;
                 cmdSetDGActiveReservoir( DG_RESERVOIR_1 );