Index: firmware/App/Controllers/Heaters.c
===================================================================
diff -u -r1b01b8c723dd1b04943e07eeda9e369b6d8e4afe -r984a7f458ebbd83f565480d2abc7126471d2dde9
--- firmware/App/Controllers/Heaters.c	(.../Heaters.c)	(revision 1b01b8c723dd1b04943e07eeda9e369b6d8e4afe)
+++ firmware/App/Controllers/Heaters.c	(.../Heaters.c)	(revision 984a7f458ebbd83f565480d2abc7126471d2dde9)
@@ -39,9 +39,7 @@
 #define TRIMMER_HEATER_P_COEFFICIENT            0.02    ///< Trimmer heater proportional coefficient
 #define TRIMMER_HEATER_I_COEFFICIENT            0.001   ///< Trimmer heater integral coefficient
 
-#define DELTA_TEMP_TO_PWM_DUTY_CYCLE_CONVERSION 0.05    ///< Delta temperature to PWM duty cycle conversion (initial guess)
 #define CONTROLLER_CHECK_INTERVAL_COUNT         10U     ///< Time interval count to check the PI controller
-
 #define TEMP_SENSORS_INTERVAL_COUNT             10U     ///< Temperature sensors interval count
 
 /// Heaters self test enums
@@ -571,14 +569,14 @@
     if ( heater == PRIMARY_HEATER )
     {
         F32 inletTemperatrue = getTemperatureValue ( TEMPSENSORS_INLET_PRIMARY_HEATER_TEMP_SENSOR );
-        mainPrimaryHeaterDutyCycle = fabs(primaryHeaterTargetTemperature - inletTemperatrue) * DELTA_TEMP_TO_PWM_DUTY_CYCLE_CONVERSION;
-        resetPIController ( PI_CONTROLLER_ID_PRIMARY_HEATER, mainPrimaryHeaterDutyCycle );
+        //mainPrimaryHeaterDutyCycle = fabs(primaryHeaterTargetTemperature - inletTemperatrue) * DELTA_TEMP_TO_PWM_DUTY_CYCLE_CONVERSION;
+        resetPIController ( PI_CONTROLLER_ID_PRIMARY_HEATER, MAIN_PRIMARY_HEATER_MAX_DUTY_CYCLE );
     }
     else if ( heater == TRIMMER_HEATER )
     {
         F32 inletTemperatrue = getTemperatureValue ( TEMPSENSORS_OUTLET_REDUNDANCY_TEMP_SENSOR );
-        trimmerHeaterDutyCycle = fabs(trimmerHeaterTargetTemperature - inletTemperatrue) * DELTA_TEMP_TO_PWM_DUTY_CYCLE_CONVERSION;
-        resetPIController ( PI_CONTROLLER_ID_TRIMMER_HEATER, trimmerHeaterDutyCycle );
+        //trimmerHeaterDutyCycle = fabs(trimmerHeaterTargetTemperature - inletTemperatrue) * DELTA_TEMP_TO_PWM_DUTY_CYCLE_CONVERSION;
+        resetPIController ( PI_CONTROLLER_ID_TRIMMER_HEATER, SMALL_PRIMAY_HEATER_MAX_DUTY_CYCLE );
     }
 }
 
@@ -598,7 +596,6 @@
     {
 #ifdef DEBUG_ENABLED
     {
-       F32 flow = (F32)(10909.0909/getFPGAROPumpFlowRate());
        char debugTempStr[ 256 ];
        sprintf( debugTempStr, "MPDC: %2d, SPDC: %2d, THDC: %2d, TPi: %6.2f, TPo: %6.2f, TD1: %6.2f, "
                               "TD2: %6.2f, TRo: %6.2f, TDi: %6.2f, TPh: %6.2f, TTh: %6.2f, PTarg: %6.2f, TTarg: %6.2f, ROFlow: %6.2f\r\n",