Index: firmware/App/Controllers/Heaters.c
===================================================================
diff -u -r984a7f458ebbd83f565480d2abc7126471d2dde9 -rb77fd49e9083761003ec1f58392b1954d0956b20
--- firmware/App/Controllers/Heaters.c	(.../Heaters.c)	(revision 984a7f458ebbd83f565480d2abc7126471d2dde9)
+++ firmware/App/Controllers/Heaters.c	(.../Heaters.c)	(revision b77fd49e9083761003ec1f58392b1954d0956b20)
@@ -28,6 +28,11 @@
 #include "SystemCommMessages.h"
 #include "PIControllers.h"
 
+/**
+ *  @addtogroup Heaters
+ *  @{
+ */
+
 #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%)
@@ -92,6 +97,8 @@
 static U32                              primaryHeaterTimerCounter;      ///< Primary heater timer counter
 static U32                              trimmerHeaterTimerCounter;      ///< Trimmer heater timer counter
 static U32                              dataPublicationTimerCounter;    ///< Data publication timer counter
+static BOOL                             isPrimaryHeaterOn;              ///< Flag to show if the primary heater is on   //TODO add to AE
+static BOOL                             isTrimmerHeaterOn;              ///< Flag to show if the trimmer heater is on   //TODO add to AE
 
 // private functions prototypes
 
@@ -156,8 +163,9 @@
  * The setPrimaryHeaterTargetTemperature function sets the primary heater
  *  target temperature
  * @details
- * Inputs : F32 (targetTemp)
+ * Inputs : primaryHeaterTargetTemperature
  * Outputs : none
+ * @param targetTemp : Target temperature
  * @return none
  *************************************************************************/
 void setPrimaryHeaterTargetTemperature ( F32 targetTemp )
@@ -170,8 +178,9 @@
  * The setTrimmerHeaterTargetTemperature function sets the trimmer heater
  *  target temperature
  * @details
- * Inputs : F32 (targetTemp)
+ * Inputs : trimmerHeaterTargetTemperature
  * Outputs : none
+ * @param targetTemp : Target temperature
  * @return none
  *************************************************************************/
 void setTrimmerHeaterTargetTemperature ( F32 targetTemp )
@@ -316,17 +325,14 @@
     switch ( primaryHeatersExecState )
     {
         case PRIMARY_HEATERS_EXEC_STATE_OFF:
-
             primaryHeatersExecState = handlePrimaryHeaterStateOff();
             break;
 
         case PRIMARY_HEATERS_EXEC_STATE_CONTROL_TO_TARGET:
-
             primaryHeatersExecState = handlePrimaryHeaterStateControlToTarget();
             break;
 
         default:
-
             SET_ALARM_WITH_2_U32_DATA ( ALARM_ID_SOFTWARE_FAULT, SW_FAULT_ID_HEATERS_PRIMARY_HEATER_EXEC_INVALID_STATE,
                                         primaryHeatersExecState );
             primaryHeatersExecState = PRIMARY_HEATERS_EXEC_STATE_CONTROL_TO_TARGET;
@@ -347,17 +353,14 @@
     switch ( trimmerHeaterExecState )
     {
         case TRIMMER_HEATER_EXEC_STATE_OFF:
-
             trimmerHeaterExecState = handleTrimmerHeaterStateOff();
             break;
 
         case TRIMMER_HEATER_EXEC_STATE_CONTROL_TO_TARGET:
-
             trimmerHeaterExecState = handleTrimmerHeaterControlToTarget();
             break;
 
         default:
-
             SET_ALARM_WITH_2_U32_DATA ( ALARM_ID_SOFTWARE_FAULT, SW_FAULT_ID_HEATERS_TRIMMER_HEATER_EXEC_INVALID_STATE,
                                         trimmerHeaterExecState );
             trimmerHeaterExecState = TRIMMER_HEATER_EXEC_STATE_CONTROL_TO_TARGET;
@@ -385,7 +388,7 @@
     if ( TOGGLEPRIMAYHEATER() )
     {
         setPrimaryHeaterTargetTemperature ( 37 );
-        if ( getTemperatureValue ( TEMPSENSORS_INLET_PRIMARY_HEATER_TEMP_SENSOR ) > 0 )
+        //if ( getTemperatureValue ( TEMPSENSORS_INLET_PRIMARY_HEATER_TEMP_SENSOR ) > 0 )
         {
             startPrimaryHeater();
             state = PRIMARY_HEATERS_EXEC_STATE_CONTROL_TO_TARGET;
@@ -465,7 +468,7 @@
     if ( TOGGLEPRIMAYHEATER() )
     {
         setTrimmerHeaterTargetTemperature ( 38 );
-        if ( getTemperatureValue ( TEMPSENSORS_OUTLET_REDUNDANCY_TEMP_SENSOR ) > 0 )
+        //if ( getTemperatureValue ( TEMPSENSORS_OUTLET_REDUNDANCY_TEMP_SENSOR ) > 0 )
         {
             startTrimmerHeater();
             state = TRIMMER_HEATER_EXEC_STATE_CONTROL_TO_TARGET;
@@ -521,6 +524,7 @@
  * @details
  * Inputs : none
  * Outputs : none
+ * @param : pwm : To set the PWM
  * @return none
  *************************************************************************/
 static void setMainPrimaryHeaterPWM ( F32 pwm )
@@ -535,6 +539,7 @@
  * @details
  * Inputs : none
  * Outputs : none
+ * @param: pwm : To set the PWM
  * @return none
  *************************************************************************/
 static void setSmallPrimaryHeaterPWM ( F32 pwm )
@@ -548,6 +553,7 @@
  * @details
  * Inputs : none
  * Outputs : none
+ * @param : pwm : To set the PWM
  * @return none
  *************************************************************************/
 static void setTrimmerHeaterPWM ( F32 pwm )
@@ -562,20 +568,17 @@
  * @details
  * Inputs : none
  * Outputs : none
+ * @param : heater (NAME_OF_HEATER) : Name of the heater to reset
  * @return none
  *************************************************************************/
 static void resetHeaterState ( NAME_OF_HEATER_T heater )
 {
     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, 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, SMALL_PRIMAY_HEATER_MAX_DUTY_CYCLE );
     }
 }
@@ -640,6 +643,3 @@
     etpwmSetCmpB( etpwmREG6, 0 );
 }
 // TODO REMOVE THE CODE
-
-
-