Index: firmware/App/Modes/ModePreTreat.c
===================================================================
diff -u -r09e6cf9de34acf18f6e1138bf56ac0edb4821186 -r68aefeff8890cdfa956c7bfdf0d4505b4ac25cb7
--- firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision 09e6cf9de34acf18f6e1138bf56ac0edb4821186)
+++ firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision 68aefeff8890cdfa956c7bfdf0d4505b4ac25cb7)
@@ -1,6 +1,6 @@
 /**************************************************************************
 *
-* Copyright (c) 2019-2021 Diality Inc. - All Rights Reserved.
+* Copyright (c) 2019-2022 Diality Inc. - All Rights Reserved.
 *
 * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN
 * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
@@ -25,6 +25,7 @@
 #include "PresOccl.h"
 #include "PreTreatmentRecirc.h"
 #include "Prime.h"
+#include "Reservoirs.h"
 #include "SelfTests.h"
 #include "SampleWater.h"
 #include "SystemCommMessages.h"
@@ -55,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.
@@ -141,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();
 }
@@ -155,11 +161,13 @@
 *************************************************************************/
 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
+    setDialysateHeatingParams();
+
     cmdStopDGTrimmerHeater();
 
     // Set user alarm recovery actions allowed in this mode
@@ -946,16 +954,16 @@
         {
             if ( DG_RESERVOIR_1 == getDGInactiveReservoir() )
             {
-                cmdStartDGFill( PRE_TREATMENT_FILL_RESERVOIR_ONE_VOLUME_ML );
+                cmdStartDGFill( PRE_TREATMENT_FILL_RESERVOIR_ONE_VOLUME_ML, DEFAULT_TARGET_FILL_FLOW_RATE_LPM );
             }
             else
             {
-                cmdStartDGFill( PRE_TREATMENT_FILL_RESERVOIR_TWO_VOLUME_ML );
+                cmdStartDGFill( PRE_TREATMENT_FILL_RESERVOIR_TWO_VOLUME_ML, DEFAULT_TARGET_FILL_FLOW_RATE_LPM );
             }
         }
         else
         {
-            cmdStartDGFill( PRE_TREATMENT_FLUSH_RESERVOIR_VOLUME_ML );
+            cmdStartDGFill( PRE_TREATMENT_FLUSH_RESERVOIR_VOLUME_ML, DEFAULT_TARGET_FILL_FLOW_RATE_LPM );
         }
     }