Index: firmware/App/Controllers/Heaters.c =================================================================== diff -u -r74a520858974bcbc9a08a900823d84698e734412 -r6dc826002a31e63d50ef7b3fced3cfe99b4394b8 --- firmware/App/Controllers/Heaters.c (.../Heaters.c) (revision 74a520858974bcbc9a08a900823d84698e734412) +++ firmware/App/Controllers/Heaters.c (.../Heaters.c) (revision 6dc826002a31e63d50ef7b3fced3cfe99b4394b8) @@ -869,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 ), - 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 ) - ); + 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) ); } Index: firmware/App/Controllers/TemperatureSensors.c =================================================================== diff -u -rafd7f1594d627aa477b9702de211e55123a9f01d -r6dc826002a31e63d50ef7b3fced3cfe99b4394b8 --- firmware/App/Controllers/TemperatureSensors.c (.../TemperatureSensors.c) (revision afd7f1594d627aa477b9702de211e55123a9f01d) +++ firmware/App/Controllers/TemperatureSensors.c (.../TemperatureSensors.c) (revision 6dc826002a31e63d50ef7b3fced3cfe99b4394b8) @@ -609,10 +609,10 @@ F32 const avgADCReads = tempSensors[ sensorIndex ].adcRunningSum >> SHIFT_BITS_BY_5_FOR_AVERAGING; F32 const temperature = getADC2TempConversion ( avgADCReads, - (U32)tempSensors [ sensorIndex ].gain, - (U32)tempSensors [ sensorIndex ].refResistance, - (U32)tempSensors [ sensorIndex ].zeroDegreeResistance, - tempSensors [ sensorIndex ].conversionCoef ); + (U32)tempSensors [ sensorIndex ].gain, + (U32)tempSensors [ sensorIndex ].refResistance, + (U32)tempSensors [ sensorIndex ].zeroDegreeResistance, + tempSensors [ sensorIndex ].conversionCoef ); tempSensors[ sensorIndex ].temperatureValues.data = temperature; } @@ -673,17 +673,17 @@ { S32 const tpiConvertedADC = ( (S32)getFPGATPiTemp() & MASK_OFF_U32_MSB ); F32 const tpiTemperature = getADC2TempConversion( tpiConvertedADC, - (U32) tempSensors[ TEMPSENSORS_INLET_PRIMARY_HEATER ].gain, - (U32) tempSensors[ TEMPSENSORS_INLET_PRIMARY_HEATER ].refResistance, - (U32) tempSensors[ TEMPSENSORS_INLET_PRIMARY_HEATER ].zeroDegreeResistance, - tempSensors[ TEMPSENSORS_INLET_PRIMARY_HEATER ].conversionCoef ); + (U32) tempSensors[ TEMPSENSORS_INLET_PRIMARY_HEATER ].gain, + (U32) tempSensors[ TEMPSENSORS_INLET_PRIMARY_HEATER ].refResistance, + (U32) tempSensors[ TEMPSENSORS_INLET_PRIMARY_HEATER ].zeroDegreeResistance, + tempSensors[ TEMPSENSORS_INLET_PRIMARY_HEATER ].conversionCoef ); S32 const tpoConvertedADC = ( (S32)getFPGATPoTemp() & MASK_OFF_U32_MSB ); F32 const tpoTemperature = getADC2TempConversion( tpoConvertedADC, - (U32) tempSensors[ TEMPSENSORS_OUTLET_PRIMARY_HEATER ].gain, - (U32) tempSensors[ TEMPSENSORS_OUTLET_PRIMARY_HEATER ].refResistance, - (U32) tempSensors[ TEMPSENSORS_OUTLET_PRIMARY_HEATER ].zeroDegreeResistance, - tempSensors[ TEMPSENSORS_OUTLET_PRIMARY_HEATER ].conversionCoef ); + (U32) tempSensors[ TEMPSENSORS_OUTLET_PRIMARY_HEATER ].gain, + (U32) tempSensors[ TEMPSENSORS_OUTLET_PRIMARY_HEATER ].refResistance, + (U32) tempSensors[ TEMPSENSORS_OUTLET_PRIMARY_HEATER ].zeroDegreeResistance, + tempSensors[ TEMPSENSORS_OUTLET_PRIMARY_HEATER ].conversionCoef ); F32 const tempDiff = fabs(tpiTemperature - tpoTemperature); if ( tempDiff > MAX_ALLOWED_TEMP_DELTA_BETWEEN_SENSORS )