Index: firmware/App/Controllers/Heaters.c
===================================================================
diff -u -r67021fbc633259e8e1bce76749dbef7d0cb51998 -re6f3a632890f96a5aa282922d11df148bdd06587
--- firmware/App/Controllers/Heaters.c	(.../Heaters.c)	(revision 67021fbc633259e8e1bce76749dbef7d0cb51998)
+++ firmware/App/Controllers/Heaters.c	(.../Heaters.c)	(revision e6f3a632890f96a5aa282922d11df148bdd06587)
@@ -40,15 +40,9 @@
 
 // ********** private definitions **********
 
-#ifndef V_2_SYSTEM
 #define MAIN_PRIMARY_HEATER_MAX_DUTY_CYCLE                         1.00                                                            ///< Main primary heater (heater A) max duty cycle (100%).
 #define SMALL_PRIMAY_HEATER_MAX_DUTY_CYCLE                         1.00                                                            ///< Small Primary heater (heater B) max duty cycle (100%).
 #define TRIMMER_HEATER_MAX_DUTY_CYCLE                              1.00                                                            ///< Trimmer heater max duty cycle (100%).
-#else
-#define MAIN_PRIMARY_HEATER_MAX_DUTY_CYCLE                         0.89                                                            ///< Main primary heater (heater A) max duty cycle (89%).
-#define SMALL_PRIMAY_HEATER_MAX_DUTY_CYCLE                         0.50                                                            ///< Small Primary heater (heater B) max duty cycle (50%).
-#define TRIMMER_HEATER_MAX_DUTY_CYCLE                              0.50                                                            ///< Trimmer heater max duty cycle (50%).
-#endif
 #define HEATERS_MIN_DUTY_CYCLE                                     0.00                                                            ///< Primary and trimmer heaters minimum duty cycle (0.00%).
 #define PRIMARY_HEATERS_CUMULATIVE_DUTY_CYCLE                      ( MAIN_PRIMARY_HEATER_MAX_DUTY_CYCLE + \
                                                                      SMALL_PRIMAY_HEATER_MAX_DUTY_CYCLE )                          ///< Primary heaters cumulative duty cycle.
@@ -218,6 +212,19 @@
 
 /*********************************************************************//**
  * @brief
+ * The getPrimaryHeaterTargetTemperature function return the primary heater
+ * target temperature.
+ * @details Inputs: primaryHeaterTargetTemperature
+ * @details Outputs: none
+ * @return the current primary heater target temperature
+ *************************************************************************/
+F32 getPrimaryHeaterTargetTemperature( void )
+{
+    return primaryHeaterTargetTemperature;
+}
+
+/*********************************************************************//**
+ * @brief
  * The startPrimaryHeater function starts the primary heaters. It resets
  * the primary heaters state and sets the main primary heater duty cycle.
  * @details Inputs: primaryHeaterTargetTemperature
@@ -267,8 +274,6 @@
  *************************************************************************/
 void stopPrimaryHeater( void )
 {
-    setMainPrimaryHeaterPWM( HEATERS_MIN_DUTY_CYCLE );
-    setSmallPrimaryHeaterPWM( HEATERS_MIN_DUTY_CYCLE );
     isPrimaryHeaterOn = FALSE;
 }
 
@@ -281,7 +286,6 @@
  *************************************************************************/
 void stopTrimmerHeater( void )
 {
-    setTrimmerHeaterPWM( HEATERS_MIN_DUTY_CYCLE );
     isTrimmerHeaterOn = FALSE;
 }
 
@@ -543,6 +547,8 @@
         // Switch to off state. Set the duty cycles to 0
         mainPrimaryHeaterDutyCycle = HEATERS_MIN_DUTY_CYCLE;
         smallPrimaryHeaterDutyCycle = HEATERS_MIN_DUTY_CYCLE;
+        setMainPrimaryHeaterPWM( HEATERS_MIN_DUTY_CYCLE );
+        setSmallPrimaryHeaterPWM( HEATERS_MIN_DUTY_CYCLE );
         state = PRIMARY_HEATERS_EXEC_STATE_OFF;
     }
 
@@ -609,6 +615,7 @@
     {
         // Set the duty cycle to 0 and switch to off state
         trimmerHeaterDutyCycle = HEATERS_MIN_DUTY_CYCLE;
+        setTrimmerHeaterPWM( HEATERS_MIN_DUTY_CYCLE );
         state = TRIMMER_HEATER_EXEC_STATE_OFF;
     }