Index: firmware/App/Controllers/Heaters.c
===================================================================
diff -u -r1b95ae077de1d01a314be8cc011662ab508fba10 -r2b60564ac818a6692b714dfd9920d2e2fcf0937d
--- firmware/App/Controllers/Heaters.c	(.../Heaters.c)	(revision 1b95ae077de1d01a314be8cc011662ab508fba10)
+++ firmware/App/Controllers/Heaters.c	(.../Heaters.c)	(revision 2b60564ac818a6692b714dfd9920d2e2fcf0937d)
@@ -1,17 +1,17 @@
 /**************************************************************************
 *
-* Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved.
+* Copyright (c) 2019-2021 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.
 *
-* @file Heaters.c
+* @file    Heaters.c
 *
-* @author (last) Quang Nguyen
-* @date (last) 14-Sep-2020
+* @author  (last)      Dara Navaei
+* @date    (last)      09-Nov-2021
 *
-* @author (original) Dara Navaei
-* @date (original) 23-Apr-2020
+* @author  (original)  Dara Navaei
+* @date    (original)  23-Apr-2020
 *
 ***************************************************************************/
 
@@ -364,6 +364,7 @@
  *************************************************************************/
 void execHeatersMonitor( void )
 {
+#ifdef 0  // This code is disabled to prevent any heaters monitoring while the driver in in development.
     DG_HEATERS_T heater;
 
 #ifndef IGNORE_HEATERS_MONITOR
@@ -409,8 +410,8 @@
         }
     }
 
-    // TODO un-comment the heaters voltage
-    //monitorHeatersVoltage();
+    monitorHeatersVoltage();
+#endif
 
     // Check for data publication
     publishHeatersData();
@@ -514,8 +515,6 @@
     HEATERS_STATE_T state = HEATER_EXEC_STATE_PRIMARY_CONTROL_TO_TARGET;
     DG_HEATERS_T heater   = DG_PRIMARY_HEATER;
 
-    // TODO do we need any control to maintain the temperature?
-
     if ( TRUE == haveHeaterControlConditionsChanged( heater ) )
     {
         state = HEATER_EXEC_STATE_PRIMARY_RAMP_TO_TARGET;
@@ -856,8 +855,8 @@
 /*********************************************************************//**
  * @brief
  * The monitorHeatersVoltage function monitors the heaters' voltages
- * @details Inputs: heatersVoltageMonitorTimeCounter
- * @details Outputs: heatersVoltageMonitorTimeCounter
+ * @details Inputs: voltageMonitorTimeCounter
+ * @details Outputs: voltageMonitorTimeCounter
  * @return none
  *************************************************************************/
 static void monitorHeatersVoltage( void )