Index: firmware/App/Modes/ModePreTreat.c
===================================================================
diff -u -r182a81ed78f66f05ef286e2456c6c86f5e4f3e28 -r5addd92e279ebc0871364fee70e3ac74db21001a
--- firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision 182a81ed78f66f05ef286e2456c6c86f5e4f3e28)
+++ firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision 5addd92e279ebc0871364fee70e3ac74db21001a)
@@ -56,7 +56,7 @@
 #define PRE_TREATMENT_FILL_RESERVOIR_TWO_VOLUME_ML      FILL_RESERVOIR_TO_VOLUME_ML
 #endif
 
-#define PRIMARY_HEATER_TARGET_TEMP_OFFSET               2.0             ///< Primary heater target temperature offset from trimmer heater temperature.
+#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.
@@ -142,6 +142,11 @@
     initConsumableSelfTest();
     initPrime();
     initSelfTests();
+    // Reservoirs state machine is not used in Pre-treatment but the
+    // init function is called here to initialize all the variables in
+    // the reservoirs driver since an API from the reservoirs is used
+    // to setup the DG heaters.
+    initReservoirs();
 
     resetSignalFlags();
 }
@@ -156,11 +161,11 @@
 *************************************************************************/
 U32 transitionToPreTreatmentMode( void )
 {
-    F32 const trimmerHeaterTemp = getTreatmentParameterF32( TREATMENT_PARAM_DIALYSATE_TEMPERATURE );
-    F32 const primaryHeaterTemp = trimmerHeaterTemp + PRIMARY_HEATER_TARGET_TEMP_OFFSET;
+    F32 trimmerHeaterTemp = getTreatmentParameterF32( TREATMENT_PARAM_DIALYSATE_TEMPERATURE );
 
     initPreTreatmentMode();
-    cmdSetDGDialysateTargetTemps( primaryHeaterTemp, trimmerHeaterTemp );
+    // Set the heaters specs to start heating up the water
+    setHeatersTemperatureAndTime();
     cmdStopDGTrimmerHeater();
 
     // Set user alarm recovery actions allowed in this mode