Index: firmware/App/Drivers/TemperatureSensors.c
===================================================================
diff -u -r2205857f59dd884c4af450239381387cfb560c2e -rd4d21b42ee8bd292a6d9f7966fe37abe0271dfda
--- firmware/App/Drivers/TemperatureSensors.c	(.../TemperatureSensors.c)	(revision 2205857f59dd884c4af450239381387cfb560c2e)
+++ firmware/App/Drivers/TemperatureSensors.c	(.../TemperatureSensors.c)	(revision d4d21b42ee8bd292a6d9f7966fe37abe0271dfda)
@@ -113,7 +113,7 @@
 static OVERRIDE_U32_T lastBaroTempReadCounter;                                                                  ///< Barometric sensor read count from FPGA.
 static BARO_SENSOR_CONSTS_T baroConvConsts;                                                                     ///< Barometric sensor conversion constants.
 
-//static DD_TEMP_SENSORS_CAL_RECORD_T tempSensorCalRecord;                                                        ///< Temperature sensors calibration record.
+//static RO_TEMP_SENSORS_CAL_RECORD_T tempSensorCalRecord;                                                        ///< Temperature sensors calibration record.
 
 // ********** private function prototypes **********
 
@@ -150,33 +150,16 @@
     memset( &baroConvConsts, 0x0, sizeof( BARO_SENSOR_CONSTS_T ) );
 
     // Initialize TH1 (primary heater), TH2(outlet Heat Exchanger), TAUX ( Inlet Heat exchanger),
-    // TH3 ( Trim Heater) constants. For now, assume same gain across all sensors.
-    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;
+    // TH3 ( Trim Heater) constants. For now, assume same gain across all sensors.  // TODO - do for all RO temp sensors when defined
+    tempSensors[ TEMPSENSORS_TBD ].gain                        = PRIMARY_HEATER_TEMP_SENSORS_GAIN;
+    tempSensors[ TEMPSENSORS_TBD ].refResistance               = PRIMARY_HEATER_TEMP_SENSORS_REF_RESISTANCE;
+    tempSensors[ TEMPSENSORS_TBD ].zeroDegreeResistance        = PRIMARY_HEATER_TEMP_SENSORS_0_DEGREE_RESISTANCE;
+    tempSensors[ TEMPSENSORS_TBD ].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[ 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[ 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;
-
     // 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[ TEMPSENSORS_BOARD_TEMPERATURE ].conversionCoeff                = conversionCoeff;
+//    tempSensors[ TEMPSENSORS_BOARD_TEMPERATURE ].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;
-
     // 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 );