Index: firmware/App/Drivers/TemperatureSensors.c
===================================================================
diff -u -r0a8d902c3a7c4883ce6692cc53e85b254cef82c4 -r3b6bf2cb6d15da8cb273cff109d2c4b1ee99d546
--- firmware/App/Drivers/TemperatureSensors.c	(.../TemperatureSensors.c)	(revision 0a8d902c3a7c4883ce6692cc53e85b254cef82c4)
+++ firmware/App/Drivers/TemperatureSensors.c	(.../TemperatureSensors.c)	(revision 3b6bf2cb6d15da8cb273cff109d2c4b1ee99d546)
@@ -157,53 +157,53 @@
     // TH3 ( Trim Heater) constants.
     // Based on the PT100/PT1000,define the constants for all temperature sensors
 #ifdef USE_PT_100
-    tempSensors[ TEMPSENSORS_INLET_HEAT_EXCHANGER ].gain                        = PT100_TEMP_SENSORS_GAIN;
-    tempSensors[ TEMPSENSORS_INLET_HEAT_EXCHANGER ].refResistance               = PT100_TEMP_SENSORS_REF_RESISTANCE;
-    tempSensors[ TEMPSENSORS_INLET_HEAT_EXCHANGER ].zeroDegreeResistance        = PT100_TEMP_SENSORS_0_DEGREE_RESISTANCE;
-    tempSensors[ TEMPSENSORS_INLET_HEAT_EXCHANGER ].maxAllowedTemp              = TEMP_SENSORS_MAX_ALLOWED_DEGREE_C;
+    tempSensors[ D1_TEMP ].gain                   = PT100_TEMP_SENSORS_GAIN;
+    tempSensors[ D1_TEMP ].refResistance          = PT100_TEMP_SENSORS_REF_RESISTANCE;
+    tempSensors[ D1_TEMP ].zeroDegreeResistance   = PT100_TEMP_SENSORS_0_DEGREE_RESISTANCE;
+    tempSensors[ D1_TEMP ].maxAllowedTemp         = TEMP_SENSORS_MAX_ALLOWED_DEGREE_C;
 
-    tempSensors[ TEMPSENSORS_OUTLET_HEAT_EXCHANGER ].gain                       = PT100_TEMP_SENSORS_GAIN;
-    tempSensors[ TEMPSENSORS_OUTLET_HEAT_EXCHANGER ].refResistance              = PT100_TEMP_SENSORS_REF_RESISTANCE;
-    tempSensors[ TEMPSENSORS_OUTLET_HEAT_EXCHANGER ].zeroDegreeResistance       = PT100_TEMP_SENSORS_0_DEGREE_RESISTANCE;
-    tempSensors[ TEMPSENSORS_OUTLET_HEAT_EXCHANGER ].maxAllowedTemp             = TEMP_SENSORS_MAX_ALLOWED_DEGREE_C;
+    tempSensors[ X6_TEMP ].gain                   = PT100_TEMP_SENSORS_GAIN;
+    tempSensors[ X6_TEMP ].refResistance          = PT100_TEMP_SENSORS_REF_RESISTANCE;
+    tempSensors[ X6_TEMP ].zeroDegreeResistance   = PT100_TEMP_SENSORS_0_DEGREE_RESISTANCE;
+    tempSensors[ X6_TEMP ].maxAllowedTemp         = TEMP_SENSORS_MAX_ALLOWED_DEGREE_C;
 
-    tempSensors[ TEMPSENSORS_HYDRAULICS_PRIMARY_HEATER ].gain                   = PT100_TEMP_SENSORS_GAIN;
-    tempSensors[ TEMPSENSORS_HYDRAULICS_PRIMARY_HEATER ].refResistance          = PT100_TEMP_SENSORS_REF_RESISTANCE;
-    tempSensors[ TEMPSENSORS_HYDRAULICS_PRIMARY_HEATER ].zeroDegreeResistance   = PT100_TEMP_SENSORS_0_DEGREE_RESISTANCE;
-    tempSensors[ TEMPSENSORS_HYDRAULICS_PRIMARY_HEATER ].maxAllowedTemp         = HEATERS_INTERNAL_TEMP_SENSORS_MAX_ALLOWED_DEGREE_C;
+    tempSensors[ D4_TEMP ].gain                   = PT100_TEMP_SENSORS_GAIN;
+    tempSensors[ D4_TEMP ].refResistance          = PT100_TEMP_SENSORS_REF_RESISTANCE;
+    tempSensors[ D4_TEMP ].zeroDegreeResistance   = PT100_TEMP_SENSORS_0_DEGREE_RESISTANCE;
+    tempSensors[ D4_TEMP ].maxAllowedTemp         = HEATERS_INTERNAL_TEMP_SENSORS_MAX_ALLOWED_DEGREE_C;
 
-    tempSensors[ TEMPSENSORS_TRIMMER_HEATER ].gain                              = PT100_TEMP_SENSORS_GAIN;
-    tempSensors[ TEMPSENSORS_TRIMMER_HEATER ].refResistance                     = PT100_TEMP_SENSORS_REF_RESISTANCE;
-    tempSensors[ TEMPSENSORS_TRIMMER_HEATER ].zeroDegreeResistance              = PT100_TEMP_SENSORS_0_DEGREE_RESISTANCE;
-    tempSensors[ TEMPSENSORS_TRIMMER_HEATER ].maxAllowedTemp                    = TEMP_SENSORS_MAX_ALLOWED_DEGREE_C;
+    tempSensors[ D50_TEMP ].gain                  = PT100_TEMP_SENSORS_GAIN;
+    tempSensors[ D50_TEMP ].refResistance         = PT100_TEMP_SENSORS_REF_RESISTANCE;
+    tempSensors[ D50_TEMP ].zeroDegreeResistance  = PT100_TEMP_SENSORS_0_DEGREE_RESISTANCE;
+    tempSensors[ D50_TEMP ].maxAllowedTemp        = TEMP_SENSORS_MAX_ALLOWED_DEGREE_C;
 #else
-    tempSensors[ TEMPSENSORS_INLET_HEAT_EXCHANGER ].gain                        = PRIMARY_HEATER_TEMP_SENSORS_GAIN;
-    tempSensors[ TEMPSENSORS_INLET_HEAT_EXCHANGER ].refResistance               = PRIMARY_HEATER_TEMP_SENSORS_REF_RESISTANCE;
-    tempSensors[ TEMPSENSORS_INLET_HEAT_EXCHANGER ].zeroDegreeResistance        = PRIMARY_HEATER_TEMP_SENSORS_0_DEGREE_RESISTANCE;
-    tempSensors[ TEMPSENSORS_INLET_HEAT_EXCHANGER ].maxAllowedTemp              = TEMP_SENSORS_MAX_ALLOWED_DEGREE_C;
+    tempSensors[ D1_TEMP ].gain                   = PRIMARY_HEATER_TEMP_SENSORS_GAIN;
+    tempSensors[ D1_TEMP ].refResistance          = PRIMARY_HEATER_TEMP_SENSORS_REF_RESISTANCE;
+    tempSensors[ D1_TEMP ].zeroDegreeResistance   = PRIMARY_HEATER_TEMP_SENSORS_0_DEGREE_RESISTANCE;
+    tempSensors[ D1_TEMP ].maxAllowedTemp         = TEMP_SENSORS_MAX_ALLOWED_DEGREE_C;
 
-    tempSensors[ TEMPSENSORS_OUTLET_HEAT_EXCHANGER ].gain                       = PRIMARY_HEATER_TEMP_SENSORS_GAIN;
-    tempSensors[ TEMPSENSORS_OUTLET_HEAT_EXCHANGER ].refResistance              = PRIMARY_HEATER_TEMP_SENSORS_REF_RESISTANCE;
-    tempSensors[ TEMPSENSORS_OUTLET_HEAT_EXCHANGER ].zeroDegreeResistance       = PRIMARY_HEATER_TEMP_SENSORS_0_DEGREE_RESISTANCE;
-    tempSensors[ TEMPSENSORS_OUTLET_HEAT_EXCHANGER ].maxAllowedTemp             = TEMP_SENSORS_MAX_ALLOWED_DEGREE_C;
+    tempSensors[ X6_TEMP ].gain                   = PRIMARY_HEATER_TEMP_SENSORS_GAIN;
+    tempSensors[ X6_TEMP ].refResistance          = PRIMARY_HEATER_TEMP_SENSORS_REF_RESISTANCE;
+    tempSensors[ X6_TEMP ].zeroDegreeResistance   = PRIMARY_HEATER_TEMP_SENSORS_0_DEGREE_RESISTANCE;
+    tempSensors[ X6_TEMP ].maxAllowedTemp         = TEMP_SENSORS_MAX_ALLOWED_DEGREE_C;
 
-    tempSensors[ TEMPSENSORS_HYDRAULICS_PRIMARY_HEATER ].gain                   = PRIMARY_HEATER_TEMP_SENSORS_GAIN;
-    tempSensors[ TEMPSENSORS_HYDRAULICS_PRIMARY_HEATER ].refResistance          = PRIMARY_HEATER_TEMP_SENSORS_REF_RESISTANCE;
-    tempSensors[ TEMPSENSORS_HYDRAULICS_PRIMARY_HEATER ].zeroDegreeResistance   = PRIMARY_HEATER_TEMP_SENSORS_0_DEGREE_RESISTANCE;
-    tempSensors[ TEMPSENSORS_HYDRAULICS_PRIMARY_HEATER ].maxAllowedTemp         = HEATERS_INTERNAL_TEMP_SENSORS_MAX_ALLOWED_DEGREE_C;
+    tempSensors[ D4_TEMP ].gain                   = PRIMARY_HEATER_TEMP_SENSORS_GAIN;
+    tempSensors[ D4_TEMP ].refResistance          = PRIMARY_HEATER_TEMP_SENSORS_REF_RESISTANCE;
+    tempSensors[ D4_TEMP ].zeroDegreeResistance   = PRIMARY_HEATER_TEMP_SENSORS_0_DEGREE_RESISTANCE;
+    tempSensors[ D4_TEMP ].maxAllowedTemp         = HEATERS_INTERNAL_TEMP_SENSORS_MAX_ALLOWED_DEGREE_C;
 
-    tempSensors[ TEMPSENSORS_TRIMMER_HEATER ].gain                              = PRIMARY_HEATER_TEMP_SENSORS_GAIN;
-    tempSensors[ TEMPSENSORS_TRIMMER_HEATER ].refResistance                     = PRIMARY_HEATER_TEMP_SENSORS_REF_RESISTANCE;
-    tempSensors[ TEMPSENSORS_TRIMMER_HEATER ].zeroDegreeResistance              = PRIMARY_HEATER_TEMP_SENSORS_0_DEGREE_RESISTANCE;
-    tempSensors[ TEMPSENSORS_TRIMMER_HEATER ].maxAllowedTemp                    = TEMP_SENSORS_MAX_ALLOWED_DEGREE_C;
+    tempSensors[ D50_TEMP ].gain                  = PRIMARY_HEATER_TEMP_SENSORS_GAIN;
+    tempSensors[ D50_TEMP ].refResistance         = PRIMARY_HEATER_TEMP_SENSORS_REF_RESISTANCE;
+    tempSensors[ D50_TEMP ].zeroDegreeResistance  = PRIMARY_HEATER_TEMP_SENSORS_0_DEGREE_RESISTANCE;
+    tempSensors[ D50_TEMP ].maxAllowedTemp        = TEMP_SENSORS_MAX_ALLOWED_DEGREE_C;
 #endif
 
 
     // Board temperature sensors conversion coefficient
-    tempSensors[ TEMPSENSORS_BOARD_TEMPERATURE ].conversionCoeff                = conversionCoeff;
-    tempSensors[ TEMPSENSORS_BOARD_TEMPERATURE ].maxAllowedTemp                 = NON_FLUID_PATH_TEMP_SENSORS_MAX_ALLOWED_DEGREE_C;
+    tempSensors[ BRD_TEMP ].conversionCoeff            = conversionCoeff;
+    tempSensors[ BRD_TEMP ].maxAllowedTemp             = NON_FLUID_PATH_TEMP_SENSORS_MAX_ALLOWED_DEGREE_C;
 
-    tempSensors[ TEMPSENSORS_BAROMETRIC_TEMP_SENSOR ].maxAllowedTemp            = NON_FLUID_PATH_TEMP_SENSORS_MAX_ALLOWED_DEGREE_C;
+    tempSensors[ BARO_TEMP ].maxAllowedTemp            = NON_FLUID_PATH_TEMP_SENSORS_MAX_ALLOWED_DEGREE_C;
 
     // Persistent alarm for the temperature sensors range check
     initPersistentAlarm( ALARM_ID_DD_TEMPERATURE_SENSOR_OUT_OF_RANGE, TEMP_SENSORS_OUT_OF_RANGE_TIME_OUT_MS, TEMP_SENSORS_OUT_OF_RANGE_TIME_OUT_MS );
@@ -251,7 +251,7 @@
  *************************************************************************/
 S32 getBaroSensorTemperatureDiff( void )
 {
-    return tempSensors[ TEMPSENSORS_BAROMETRIC_TEMP_SENSOR ].baroTempSnsrDiff;
+    return tempSensors[ BARO_TEMP ].baroTempSnsrDiff;
 }
 
 /*********************************************************************//**
@@ -281,10 +281,10 @@
     lastTemperatureReadCounter.data  = (U32)getFPGARTDReadCount();
 
     //Read temperature sensors
-    processTempSnsrsADCRead( TEMPSENSORS_INLET_HEAT_EXCHANGER, getFPGAInletHeatExchangerTemp() );
-    processTempSnsrsADCRead( TEMPSENSORS_OUTLET_HEAT_EXCHANGER, getFPGAOutletHeatExchangerTemp() );
-    processTempSnsrsADCRead( TEMPSENSORS_HYDRAULICS_PRIMARY_HEATER, getFPGAHydraulicsPrimaryHeaterTemp() );
-    processTempSnsrsADCRead( TEMPSENSORS_TRIMMER_HEATER, getFPGATrimmerHeaterTemp() );
+    processTempSnsrsADCRead( D1_TEMP, getFPGAD1Temp() );
+    processTempSnsrsADCRead( X6_TEMP, getFPGAX6Temp() );
+    processTempSnsrsADCRead( D4_TEMP, getFPGAD4Temp() );
+    processTempSnsrsADCRead( D50_TEMP, getFPGAD50Temp() );
 
     //TODO: Read Board temperture
     //processTempSnsrsADCRead( TEMPSENSORS_INTERNAL_COND_TEMP_SENSOR, getFPGACondSnsrInternalTemp() );
@@ -299,7 +299,7 @@
         baroConvConsts.temperatureCoeff = getFPGABaroTempCoeffOfTemperature();
         lastBaroTempReadCounter.data    = (U32)getFPGABaroReadCount();
 
-        processTempSnsrsADCRead( TEMPSENSORS_BAROMETRIC_TEMP_SENSOR, getFPGABaroTemperature() );
+        processTempSnsrsADCRead( BARO_TEMP, getFPGABaroTemperature() );
     }
 }
 
@@ -442,19 +442,19 @@
     // Different sensors have different ADC to temperature conversion methods
     switch( sensorIndex )
     {
-        case TEMPSENSORS_INLET_HEAT_EXCHANGER:
-        case TEMPSENSORS_OUTLET_HEAT_EXCHANGER:
-        case TEMPSENSORS_HYDRAULICS_PRIMARY_HEATER:
-        case TEMPSENSORS_TRIMMER_HEATER:
+        case D1_TEMP:
+        case X6_TEMP:
+        case D4_TEMP:
+        case D50_TEMP:
             temperature = getADC2TempConversion( avgADCReads, (U32)tempSensors [ sensorIndex ].gain, (U32)tempSensors [ sensorIndex ].refResistance,
                                                  (U32)tempSensors [ sensorIndex ].zeroDegreeResistance, tempSensors [ sensorIndex ].conversionCoeff );
             break;
 
-        case TEMPSENSORS_BOARD_TEMPERATURE:
+        case BRD_TEMP:
             //TODO : Need details on calculations.
             break;
 
-        case TEMPSENSORS_BAROMETRIC_TEMP_SENSOR:
+        case BARO_TEMP:
         {
             S32 baroTempSensorsDiff                     = (S32)avgADCReads - ( baroConvConsts.refTemperature * TWO_TO_POWER_OF_8 );
             S64 differenceTimesCoefficient              = (S64)baroTempSensorsDiff * (S64)baroConvConsts.temperatureCoeff;
@@ -582,23 +582,23 @@
 
     switch( sesnorIndex )
     {
-        case TEMPSENSORS_INLET_HEAT_EXCHANGER:
+        case D1_TEMP:
             //calId = CAL_DATA_INLET_HEAT_EXCHANGER_TEMP;
             break;
 
-        case TEMPSENSORS_OUTLET_HEAT_EXCHANGER:
+        case X6_TEMP:
             //calId = CAL_DATA_OUTLET_HEAT_EXCHANGER_TEMP;
             break;
 
-        case TEMPSENSORS_HYDRAULICS_PRIMARY_HEATER:
+        case D4_TEMP:
             //calId = CAL_DATA_HYD_PRIMARY_HEATER_TEMP;
             break;
 
-        case TEMPSENSORS_TRIMMER_HEATER:
+        case D50_TEMP:
             //calId = CAL_DATA_TRIM_HEATER_TEMP;
             break;
 
-        case TEMPSENSORS_BAROMETRIC_TEMP_SENSOR:
+        case BARO_TEMP:
             //calId = CAL_DATA_BARMOTERIC_TEMP;
             break;