Index: firmware/App/Drivers/TemperatureSensors.c =================================================================== diff -u -re12eefac42a3806a34f3ddac6df30bbb5ca51f6f -r2c61c4a7037fd5a22ecbcd5732d91d3166ef8c5b --- firmware/App/Drivers/TemperatureSensors.c (.../TemperatureSensors.c) (revision e12eefac42a3806a34f3ddac6df30bbb5ca51f6f) +++ firmware/App/Drivers/TemperatureSensors.c (.../TemperatureSensors.c) (revision 2c61c4a7037fd5a22ecbcd5732d91d3166ef8c5b) @@ -40,12 +40,6 @@ #define PRIMARY_HEATER_TEMP_SENSORS_REF_RESISTANCE 20000 ///< Primary heater temperature sensors reference resistance. #define PRIMARY_HEATER_TEMP_SENSORS_0_DEGREE_RESISTANCE 1000U ///< Primary heater temperature sensors zero degree resistance. -#ifdef USE_PT_100 -#define PT100_TEMP_SENSORS_GAIN 8U ///< PT100 temperature sensors gain. -#define PT100_TEMP_SENSORS_REF_RESISTANCE 4700 ///< PT100 temperature sensors reference resistance. -#define PT100_TEMP_SENSORS_0_DEGREE_RESISTANCE 100U ///< PT100 temperature sensors zero degree resistance. -#endif - #define TEMP_SENSORS_ADC_BITS 24U ///< External temperature sensors ADC bits. #define MAX_NUM_OF_RAW_ADC_SAMPLES 4U ///< Number of ADC reads for moving average calculations. #define SHIFT_BITS_BY_2 2U ///< Shift bits by 2 to create a 4 for averaging 4 samples. @@ -157,28 +151,6 @@ // Initialize TH1 (primary heater), TH2(outlet Heat Exchanger), TAUX ( Inlet Heat exchanger), // TH3 ( Trim Heater) constants. - // Based on the PT100/PT1000,define the constants for all temperature sensors -#ifdef USE_PT_100 - 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[ 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[ 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[ 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[ 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; @@ -198,7 +170,6 @@ 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[ BRD_TEMP ].conversionCoeff = conversionCoeff;