Index: firmware/App/Controllers/Heaters.c
===================================================================
diff -u -rc67b30d79e2ca2bdd8ebda901740cad0e0f6126f -r8c3db9c2d3957a1a9d53ad5d20d9594a09bc21be
--- firmware/App/Controllers/Heaters.c	(.../Heaters.c)	(revision c67b30d79e2ca2bdd8ebda901740cad0e0f6126f)
+++ firmware/App/Controllers/Heaters.c	(.../Heaters.c)	(revision 8c3db9c2d3957a1a9d53ad5d20d9594a09bc21be)
@@ -1,18 +1,19 @@
-/**********************************************************************//**
- *
- *  Copyright (c) 2019-2020 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
- *
- *  @date 21-Apr-2020
- *  @author Dara Navaei
- *
- *  @brief DG heaters controller
- *
- **************************************************************************/
+/**************************************************************************
+*
+* Copyright (c) 2019-2020 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
+*
+* @author (last) Quang Nguyen
+* @date (last) 31-Jul-2020
+*
+* @author (original) Dara Navaei
+* @date (original) 23-Apr-2020
+*
+***************************************************************************/
 
 #include "etpwm.h"
 
@@ -353,7 +354,7 @@
             break;
 
         default:
-            SET_ALARM_WITH_2_U32_DATA ( ALARM_ID_SOFTWARE_FAULT, SW_FAULT_ID_HEATERS_SELF_TEST_INVALID_STATE,
+            SET_ALARM_WITH_2_U32_DATA ( ALARM_ID_DG_SOFTWARE_FAULT, SW_FAULT_ID_HEATERS_SELF_TEST_INVALID_STATE,
                                         heatersSelfTestState );
             heatersSelfTestState = HEATERS_SELF_TEST_COMPLETE;
             break;
@@ -384,7 +385,7 @@
             break;
 
         default:
-            SET_ALARM_WITH_2_U32_DATA ( ALARM_ID_SOFTWARE_FAULT, SW_FAULT_ID_HEATERS_PRIMARY_HEATER_EXEC_INVALID_STATE,
+            SET_ALARM_WITH_2_U32_DATA ( ALARM_ID_DG_SOFTWARE_FAULT, SW_FAULT_ID_HEATERS_PRIMARY_HEATER_EXEC_INVALID_STATE,
                                         primaryHeatersExecState );
             primaryHeatersExecState = PRIMARY_HEATERS_EXEC_STATE_CONTROL_TO_TARGET;
             break;
@@ -413,7 +414,7 @@
             break;
 
         default:
-            SET_ALARM_WITH_2_U32_DATA ( ALARM_ID_SOFTWARE_FAULT, SW_FAULT_ID_HEATERS_TRIMMER_HEATER_EXEC_INVALID_STATE,
+            SET_ALARM_WITH_2_U32_DATA ( ALARM_ID_DG_SOFTWARE_FAULT, SW_FAULT_ID_HEATERS_TRIMMER_HEATER_EXEC_INVALID_STATE,
                                         trimmerHeaterExecState );
             trimmerHeaterExecState = TRIMMER_HEATER_EXEC_STATE_CONTROL_TO_TARGET;
             break;
@@ -472,7 +473,7 @@
         setSmallPrimaryHeaterPWM ( 0 );
         setTrimmerHeaterPWM ( 0 );
 
-        F32 convertedTemperature = getTemperatureValue ( TEMPSENSORS_TRIMMER_HEATER_INTERNAL_TEMP );
+        F32 convertedTemperature = getTemperatureValue ( TEMPSENSORS_TRIMMER_HEATER_INTERNAL );
 
         if ( fabs(convertedTemperature - SMALL_PRIMARY_AND_TRIMMER_HEATERS_POST_TARGET_TEMPERATURE) > HEATERS_POST_TEMPERATURE_TOLERANCE )
         {
@@ -512,7 +513,7 @@
     {
         setMainPrimaryHeaterPWM ( 0 );
 
-        F32 convertedTemperature = getTemperatureValue ( TEMPSENSORS_PRIMARY_HEATER_INTERNAL_TEMP );
+        F32 convertedTemperature = getTemperatureValue ( TEMPSENSORS_PRIMARY_HEATER_INTERNAL );
 
         if ( fabs(convertedTemperature - MAIN_PRIMARY_HEATER_POST_TARGET_TEMPERATURE ) > HEATERS_POST_TEMPERATURE_TOLERANCE )
         {
@@ -597,7 +598,7 @@
 
     if ( ++primaryHeaterTimerCounter >= CONTROLLER_CHECK_INTERVAL_COUNT )
     {
-        F32 outletTemp = getTemperatureValue ( TEMPSENSORS_OUTLET_PRIMARY_HEATER_TEMP_SENSOR );
+        F32 outletTemp = getTemperatureValue ( TEMPSENSORS_OUTLET_PRIMARY_HEATER );
         mainPrimaryHeaterDutyCycle = runPIController ( PI_CONTROLLER_ID_PRIMARY_HEATER,
                                                        primaryHeaterTargetTemperature, outletTemp );
 
@@ -716,7 +717,7 @@
 
     if ( ++trimmerHeaterTimerCounter >= CONTROLLER_CHECK_INTERVAL_COUNT )
     {
-        F32 outletTemp = getTemperatureValue ( TEMPSENSORS_OUTLET_REDUNDANCY_TEMP_SENSOR );
+        F32 outletTemp = getTemperatureValue ( TEMPSENSORS_OUTLET_REDUNDANCY );
         trimmerHeaterDutyCycle = runPIController ( PI_CONTROLLER_ID_TRIMMER_HEATER,
                                                    trimmerHeaterTargetTemperature, outletTemp );
         setTrimmerHeaterPWM ( trimmerHeaterDutyCycle );
@@ -868,15 +869,14 @@
     {
        char debugTempStr[ 256 ];
        sprintf( debugTempStr, "TPo: %6.2f, PriCJ: %6.2f, PriTC: %6.2f, TpriInt: %6.2f, TRo: %6.2f, TriCJ: %6.2f, TriTC: %6.2f, TtriInt: %6.2f\r\n",
-                              getTemperatureValue ( TEMPSENSORS_OUTLET_PRIMARY_HEATER_TEMP_SENSOR ),
-                              getTemperatureValue ( TEMPSENSORS_PRIMARY_HEATER_COLD_JUNCTION_TEMP_SENSOR ),
-                              getTemperatureValue ( TEMPSENSORS_PRIMARY_HEATER_THERMO_COUPLE_TEMP_SENSOR ),
-                              getTemperatureValue ( TEMPSENSORS_PRIMARY_HEATER_INTERNAL_TEMP ),
-                              getTemperatureValue ( TEMPSENSORS_OUTLET_REDUNDANCY_TEMP_SENSOR ),
-                              getTemperatureValue ( TEMPSENSORS_TRIMMER_HEATER_COLD_JUNCTION_TEMP_SENSOR ),
-                              getTemperatureValue ( TEMPSENSORS_TRIMMER_HEATER_THERMO_COUPLE_TEMP_SENSOR ),
-                              getTemperatureValue ( TEMPSENSORS_TRIMMER_HEATER_INTERNAL_TEMP )
-                              );
+                getTemperatureValue ( TEMPSENSORS_OUTLET_PRIMARY_HEATER ),
+                getTemperatureValue ( TEMPSENSORS_PRIMARY_HEATER_COLD_JUNCTION ),
+                getTemperatureValue ( TEMPSENSORS_PRIMARY_HEATER_THERMO_COUPLE ),
+                getTemperatureValue ( TEMPSENSORS_PRIMARY_HEATER_INTERNAL ),
+                getTemperatureValue ( TEMPSENSORS_OUTLET_REDUNDANCY ),
+                getTemperatureValue ( TEMPSENSORS_TRIMMER_HEATER_COLD_JUNCTION ),
+                getTemperatureValue ( TEMPSENSORS_TRIMMER_HEATER_THERMO_COUPLE ),
+                getTemperatureValue ( TEMPSENSORS_TRIMMER_HEATER_INTERNAL ) );
 
         sendDebugData ( (U08*)debugTempStr, strlen(debugTempStr) );
     }