Index: firmware/App/Modes/ModePreTreat.c
===================================================================
diff -u -r1796d251d3ccd028b5806f6358d1e8e598d8c14d -rae7ff6466ac1225cb5998990cc5163edc53ce003
--- firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision 1796d251d3ccd028b5806f6358d1e8e598d8c14d)
+++ firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision ae7ff6466ac1225cb5998990cc5163edc53ce003)
@@ -19,6 +19,7 @@
 #include "ConsumableSelfTest.h"
 #include "FPGA.h"
 #include "ModePreTreat.h"
+#include "ModeTreatmentParams.h"
 #include "OperationModes.h"
 #include "PreTreatmentRecirc.h"
 #include "Prime.h"
@@ -42,6 +43,8 @@
 #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.
 
+#define PRIMARY_HEATER_TARGET_TEMP_OFFSET               2.0             ///< Primary heater target temperature offset from trimmer heater temperature.
+
 /// States of the pre-treatment reservoir management state machine.
 typedef enum PreTreatmentReservoirMgmt_States
 {
@@ -486,19 +489,29 @@
     execSampleWater();
 
 #ifndef SKIP_SAMPLE_WATER
-    if ( TRUE == isSampleWaterPassed() )
+    if ( SAMPLE_WATER_COMPLETE_STATE == getSampleWaterState() )
 #endif
     {
-        if ( ( DG_MODE_STAN == dgOpMode ) && ( DG_STANDBY_MODE_STATE_IDLE == dgSubMode ) )
+        if ( TRUE == getSampleWaterResult() )
         {
-            state = HD_PRE_TREATMENT_SELF_TEST_CONSUMABLE_STATE;
-            cmdStartDG();
-            cmdSetDGDialysateTargetTemps( 39.0, 37.0 );
-            transitionToConsumableSelfTest();
+            if ( ( DG_MODE_STAN == dgOpMode ) && ( DG_STANDBY_MODE_STATE_IDLE == dgSubMode ) )
+            {
+                state = HD_PRE_TREATMENT_SELF_TEST_CONSUMABLE_STATE;
+                F32 const trimmerHeaterTemp = getTreatmentParameterU32( TREATMENT_PARAM_DIALYSATE_TEMPERATURE );
+                F32 const primaryHeaterTemp = trimmerHeaterTemp + PRIMARY_HEATER_TARGET_TEMP_OFFSET;
+
+                cmdStartDG();
+                cmdSetDGDialysateTargetTemps( primaryHeaterTemp, trimmerHeaterTemp );
+                transitionToConsumableSelfTest();
+            }
+            else
+            {
+                cmdStopDG();
+            }
         }
         else
         {
-            cmdStopDG();
+            requestNewOperationMode( MODE_STAN );
         }
     }