Index: firmware/App/Controllers/TemperatureSensors.c =================================================================== diff -u -re7f256098e5c23cc621af73b17160a247d40559c -rdc45f2e844dd200ecde6c3a90196d40354676712 --- firmware/App/Controllers/TemperatureSensors.c (.../TemperatureSensors.c) (revision e7f256098e5c23cc621af73b17160a247d40559c) +++ firmware/App/Controllers/TemperatureSensors.c (.../TemperatureSensors.c) (revision dc45f2e844dd200ecde6c3a90196d40354676712) @@ -545,28 +545,17 @@ TEMPSENSORS_SELF_TEST_STATES_T state = TEMPSENSORS_SELF_TEST_COMPLETE; U32 largestDelta; - U08 i, j, k; - F32 tempBuffer [ NUM_OF_TEMPERATURE_SENSORS ]; - F32 temperature; + U08 i, j; - // Convert the ADCs to temperature for this test - for ( k = 0; k < sizeof(tempBuffer); k++ ) - { - temperature = getADC2TempConversion ( avgADCReads [ k ], - tempSensorsConstants [ k ] [ ADC_READ_GAIN_INDEX ], - tempSensorsConstants [ k ] [ ADC_READ_REF_RESISTANCE_INDEX ], - tempSensorsConstants [ k ] [ ADC_READ_0_DEG_RESISTANCE_INDEX ] ); - tempBuffer [ k ] = temperature; - } // Check if all the sensors are within a certain degree c // from each other - for ( i = 0; i < sizeof(tempBuffer); i++ ) + for ( i = 0; i < sizeof(temperatureValues); i++ ) { - for ( j = 0; j < sizeof(tempBuffer); j++ ) + for ( j = 0; j < sizeof(temperatureValues); j++ ) { if ( i != j ) { - largestDelta = MAX( largestDelta, fabs(tempBuffer [ i ] - tempBuffer [ j ]) ); + largestDelta = MAX( largestDelta, fabs(temperatureValues [ i ] - temperatureValues [ j ]) ); } if ( largestDelta > MAX_ALLOWED_TEMP_DELTA_BETWEEN_SENSORS ) { @@ -620,25 +609,9 @@ //processADCRead( TEMPSENSORS_TRIMMER_HEATER_INTERNAL_TEMP_SESNOR, getFPGATrimmerHeaterTemp() ); // TODO REMOVE THIS CODE. FOR TESTING ONLY - /*U32 i; - U32 adc = 16327313; - U32 size = 800; - F32 testTemperature[800]; - _disable_IRQ(); - U32 testTimer = getMSTimerCount(); - for ( i = 0; i < size; i++ ) - { - testTemperature[i] = getADC2TempConversion (adc, PRIMARY_HEATER_EXT_TEMP_SENSORS_GAIN, - PRIMARY_HEATER_EXT_TEMP_SENSORS_REF_RESISTANCE, - PRIMARY_HEATER_EXT_TEMP_SENSORS_0_DEGREE_RESISTANCE); - adc = adc + 150; - } - U32 elapsedTime = calcTimeSince( testTimer ); - _enable_IRQ(); - - U08 dara; + /*U08 dara; U32 test [20] = {16327313, 16330313, 16333313, 16336313, 16339313, 16342313, 16345313, 16348313, 16351313, 16354313, 16357313, 16360313, 16363313, 16366313, 16369313, 16372313, 16375313, 16378313, 16381313, 16384313};