Index: firmware/App/Controllers/Heaters.c
===================================================================
diff -u -r4df3087b3b1944c60cd33c752a81c3fdba19189f -r7650c4651918914e3dd0e8d34d928f224101fb74
--- firmware/App/Controllers/Heaters.c	(.../Heaters.c)	(revision 4df3087b3b1944c60cd33c752a81c3fdba19189f)
+++ firmware/App/Controllers/Heaters.c	(.../Heaters.c)	(revision 7650c4651918914e3dd0e8d34d928f224101fb74)
@@ -49,12 +49,12 @@
 #define CONTROLLER_CHECK_INTERVAL_COUNT         10U                             ///< Time interval count to check the PI controller
 #define TEMP_SENSORS_INTERVAL_COUNT             10U                             ///< Temperature sensors interval count
 
-#define HEATERS_DATA_PUBLISH_INTERVAL           (500 / TASK_GENERAL_INTERVAL )  ///< Heaters data publish interval  // TODO add to AE
+#define HEATERS_DATA_PUBLISH_INTERVAL           (500 / TASK_GENERAL_INTERVAL )  ///< Heaters data publish interval
 
-#define SMALL_PRIMARY_AND_TRIMMER_HEATERS_POST_TARGET_TEMPERATURE  40U          ///< Small primary and trimmer heaters target temperature during POST //TODO add to AE
-#define MAIN_PRIMARY_HEATER_POST_TARGET_TEMPERATURE  35U                        ///< Main primary heater target temperature during POST //TODO add to AE
-#define HEATERS_POST_HEAT_UP_TIME_SECONDS            50U                        ///< The time that the heaters are heated up to reach to the target temperature during POST //TODO add to AE
-#define HEATERS_POST_TEMPERATURE_TOLERANCE           1U                         ///< Tolerance of the sensors to the target temperature during POST //TODO add to AE
+#define SMALL_PRIMARY_AND_TRIMMER_HEATERS_POST_TARGET_TEMPERATURE  40U          ///< Small primary and trimmer heaters target temperature during POST
+#define MAIN_PRIMARY_HEATER_POST_TARGET_TEMPERATURE  35U                        ///< Main primary heater target temperature during POST
+#define HEATERS_POST_HEAT_UP_TIME_SECONDS            50U                        ///< The time that the heaters are heated up to reach to the target temperature during POST
+#define HEATERS_POST_TEMPERATURE_TOLERANCE           1U                         ///< Tolerance of the sensors to the target temperature during POST
 
 /// Heaters self test enums
 typedef enum heaters_self_test_states
@@ -110,14 +110,14 @@
 static BOOL                             isTrimmerHeaterOn;                      ///< Flag to show if the trimmer heater is on
 
 static OVERRIDE_U32_T                   heatersDataPublishInterval = { HEATERS_DATA_PUBLISH_INTERVAL,
-                                        HEATERS_DATA_PUBLISH_INTERVAL, 0, 0 };  ///< Heaters data publish time interval    // TODO add to AE
-static U32                              selfTestElapsedTime;                    ///< Self test elapsed time variable       //TODO add to AE
+                                        HEATERS_DATA_PUBLISH_INTERVAL, 0, 0 };  ///< Heaters data publish time interval
+static U32                              selfTestElapsedTime;                    ///< Self test elapsed time variable
 
 // private functions prototypes
 
-static HEATERS_SELF_TEST_STATES_T handleHeatersSelfTestStart ( void ); //TODO add to AE
-static HEATERS_SELF_TEST_STATES_T handleHeatersSelfTestSmallPrimaryAndTrimmerHeaters ( void ); //TODO add to AE
-static HEATERS_SELF_TEST_STATES_T handleHeatersSelfTestMainPrimaryHeater ( void ); //TODO add to AE
+static HEATERS_SELF_TEST_STATES_T handleHeatersSelfTestStart ( void );
+static HEATERS_SELF_TEST_STATES_T handleHeatersSelfTestSmallPrimaryAndTrimmerHeaters ( void );
+static HEATERS_SELF_TEST_STATES_T handleHeatersSelfTestMainPrimaryHeater ( void );
 
 static PRIMARY_HEATERS_EXEC_STATES_T handlePrimaryHeaterStateOff ( void );
 static PRIMARY_HEATERS_EXEC_STATES_T handlePrimaryHeaterStateControlToTarget ( void );
@@ -130,7 +130,7 @@
 static void setTrimmerHeaterPWM ( F32 pwm );
 static void resetHeaterState ( NAME_OF_HEATER_T heater );
 static void publishHeatersData ( void );
-static DATA_GET_PROTOTYPE( U32, getPublishHeatersDataInterval ); //TODO add to AE
+static DATA_GET_PROTOTYPE( U32, getPublishHeatersDataInterval );
 
 // TODO: Remove the below code. FOR TESTING ONLY
 #define PRIMARY_HEATER_MIBSPI1_PORT_MASK     0x00000002  // (CS1 - re-purposed as input GPIO)