Index: firmware/App/Controllers/TemperatureSensors.c =================================================================== diff -u -r0dec8744af40d0c87a6d7cd1923920c1c2bd1d2f -re03873e424a6c2fc6eca07511e8c80dc91a5afdc --- firmware/App/Controllers/TemperatureSensors.c (.../TemperatureSensors.c) (revision 0dec8744af40d0c87a6d7cd1923920c1c2bd1d2f) +++ firmware/App/Controllers/TemperatureSensors.c (.../TemperatureSensors.c) (revision e03873e424a6c2fc6eca07511e8c80dc91a5afdc) @@ -27,7 +27,7 @@ * @{ */ -// Private defines +// ********** private definitions ********** #define PRIMARY_HEATER_EXT_TEMP_SENSORS_GAIN 16U ///< Primary heater external temperature sensors gain #define PRIMARY_HEATER_EXT_TEMP_SENSORS_REF_RESISTANCE 19600U ///< Primary heater external temperature sensors reference resistance @@ -47,50 +47,29 @@ #define TEMP_EQUATION_COEFF_A (3.9083 * pow(10,-3)) ///< ADC to temperature conversion coefficient A #define TEMP_EQUATION_COEFF_B (-5.775 * pow(10,-7)) ///< ADC to temperature conversion coefficient B +#define ADC_FPGA_READ_DELAY 30U ///< Delay in ms before reading the ADC values from FPGA #define MAX_NUM_OF_RAW_ADC_SAMPLES 32U ///< Number of ADC reads for moving average calculations - -#define ADC_READ_FIRST_READ_INDEX 0U ///< ADC array first ADC read index - -#define ADC_READ_NEXT_INDEX_INDEX 0U ///< ADC array next insertion index -#define ADC_READ_RUNNING_SUM_INDEX 1U ///< ADC array running sum index - -#define ADC_READ_GAIN_INDEX 0U ///< ADC array gain index -#define ADC_READ_REF_RESISTANCE_INDEX 1U ///< ADC array reference resistances index -#define ADC_READ_0_DEG_RESISTANCE_INDEX 2U ///< ADC array zero degree resistance index -#define ADC_READ_2_TEMP_CONVERSION_COEFFICIENT 3U ///< ADC array ADC to temperature conversion coefficient (will be used for heaters internal sensors) - -#define READ_AND_ERROR_PREV_FPGA_COUNT_INDEX 0U ///< Read and error previous FPGA count index -#define READ_AND_ERROR_INTERNAL_READ_COUNT_INDEX 1U ///< Read and error internal read count index -#define READ_AND_ERROR_INTERNAL_ERROR_COUNT_INDEX 2U ///< Read and error internal error count index -#define READ_AND_ERROR_PREV_FPGA_ERROR_INDEX 3U ///< Read and error previous FPGA error index -#define NUM_OF_READ_AND_ERROR_ARRAY_COLUMNS 4U ///< Number of read and error array columns - #define MAX_ALLOWED_TEMP_DELTA_BETWEEN_SENSORS 2U ///< Maximum allowed temperature delta between sensors - -#define NUM_OF_RUNNING_SUM_AND_INDEX_ARRAY_COLUMNS 2U ///< Number of columns in running sum and index array -#define NUM_OF_TEMP_SENSORS_CONSTANTS_ARRAY_COLUMNS 4U ///< Number of columns in temperature sensors constants - #define MAX_ALLOWED_UNCHANGED_ADC_READS 4U ///< Maximum number of times that the read of a sensor cannot change - -#define EXTERNAL_TEMP_SENSORS_ERROR_VALUE 0x80 ///< External temperature sensors error value -#define HEATERS_INTERNAL_TEMP_SENSOR_FAULT 0x01 ///< Heaters internal temperature sensor fault #define SHIFT_BITS_BY_2 2U ///< Shift bits by 2 +#define SHIFT_BITS_BY_5_FOR_AVERAGING 5U ///< Shift the ADCs of the temperature sensors by 5 to average them + #define MIN_WATER_INPUT_TEMPERATURE 10U ///< Minimum water input temperature -#define MAX_WATER_INPUT_TEMPERATURE 40U ///< Maximum water input temperature -#define ADC_FPGA_READ_DELAY 30U ///< Delay in ms before reading the ADC values from FPGA +#define MAX_WATER_INPUT_TEMPERATURE 35U ///< Maximum water input temperature #define INPUT_WATER_TEMPERATURE_CHECK_TIME_INTERVAL 100U ///< Time interval that is used to check the input water -#define HEATERS_INTERNAL_TEMPERTURE_CALCULATION_INTERVAL 20U ///< Time interval that is used to calculate the heaters internal temperature +#define HEATERS_INTERNAL_TEMPERTURE_CALCULATION_INTERVAL 20U ///< Time interval that is used to calculate the heaters internal temperature #define HEATERS_INTERNAL_TC_ADC_TO_TEMP_CONVERSION_COEFF 0.25 ///< Heaters internal temperature sensors ADC to temperature conversion coefficient #define HEATERS_COLD_JUNCTION_ADC_TO_TEMP_CONVERSION_COEFF 0.0625 ///< Heaters cold junction temperature sensors ADC to temperature conversion coefficient -#define TEMP_SENSORS_DATA_PUBLISH_INTERVAL (5000 / TASK_PRIORITY_INTERVAL) ///< Temperature sensors publish data time interval - #define K_THERMOCOUPLE_TEMP_2_MILLI_VOLT_CONVERSION_COEFF 0.041276 ///< K thermocouple temperature to millivolt conversion coefficient - -#define SHIFT_BITS_BY_5_FOR_AVERAGING 5U ///< Shift the ADCs of the temperature sensors by 5 to average them #define SIZE_OF_THERMOCOUPLE_COEFFICIENTS 10U ///< Size of the thermocouple coefficients +#define EXTERNAL_TEMP_SENSORS_ERROR_VALUE 0x80 ///< External temperature sensors error value +#define HEATERS_INTERNAL_TEMP_SENSOR_FAULT 0x01 ///< Heaters internal temperature sensor fault + +#define TEMP_SENSORS_DATA_PUBLISH_INTERVAL (5000 / TASK_PRIORITY_INTERVAL) ///< Temperature sensors publish data time interval + /// Temperature sensor self test states typedef enum tempSensors_Self_Test_States { @@ -109,44 +88,58 @@ NUM_OF_TEMPSENSORS_EXEC_STATES, ///< Total number of exec states } TEMPSENSORS_EXEC_STATES_T; -// Private variables +typedef struct +{ + F32 gain; + F32 refResistance; + F32 twoTempConversionCoef; + F32 zeroDegreeResistance; -static SELF_TEST_STATUS_T tempSensorsSelfTestResult; ///< Self test result of the TemperatureSensors module -static TEMPSENSORS_SELF_TEST_STATES_T tempSensorsSelfTestState; ///< TemperatureSensor self test state -static TEMPSENSORS_EXEC_STATES_T tempSensorsExecState; ///< TemperatureSensor exec state -static S32 rawADCReads [ NUM_OF_TEMPERATURE_SENSORS ] - [ MAX_NUM_OF_RAW_ADC_SAMPLES ]; ///< Raw ADC reads array -static S32 runningSumAndIndex [ NUM_OF_TEMPERATURE_SENSORS ] - [ NUM_OF_RUNNING_SUM_AND_INDEX_ARRAY_COLUMNS ]; ///< Running sum and next ADC index array -static F32 tempSensorsConstants [ NUM_OF_TEMPERATURE_SENSORS ] - [ NUM_OF_TEMP_SENSORS_CONSTANTS_ARRAY_COLUMNS ]; ///< Temperature sensors constants array -static U32 readAndErrorCounts [ NUM_OF_TEMPERATURE_SENSORS ] - [ NUM_OF_READ_AND_ERROR_ARRAY_COLUMNS ]; ///< Read and error counts from FPGA array -static OVERRIDE_F32_T temperatureValues [ NUM_OF_TEMPERATURE_SENSORS ]; ///< Temperature values array -static U32 elapsedTime; ///< Elapsed time variable -static U32 internalHeatersConversionTimer; ///< Conversion timer variable to calculate the heaters internal temperature -static OVERRIDE_U32_T tempSensorsPublishInterval = { TEMP_SENSORS_DATA_PUBLISH_INTERVAL, - TEMP_SENSORS_DATA_PUBLISH_INTERVAL, 0, 0 }; ///< Temperature sensors publish time interval override -static U32 dataPublicationTimerCounter; ///< Temperature sensors data publish timer counter -static F32 tempValuesForPublication [ NUM_OF_TEMPERATURE_SENSORS ]; ///< Temperature sensors data publication array + S32 rawADCReads[ MAX_NUM_OF_RAW_ADC_SAMPLES ]; + S32 adcNextIndex; + S32 adcRunningSum; -static const F32 positiveTCExpA0 = 0.118597600000E0; ///< K TC positive temperature exponent coefficient A0 -static const F32 positiveTCExpA1 = -0.118343200000E-3; ///< K TC positive temperature exponent coefficient A1 -static const F32 positiveTCExpA2 = 0.126968600000E3; ///< K TC positive temperature exponent coefficient A2 + U32 readCount; + U32 internalErrorCount; + OVERRIDE_F32_T temperatureValues; +} TEMP_SENSOR_T; + +// ********** private data ********** + +static SELF_TEST_STATUS_T tempSensorsSelfTestResult; ///< Self test result of the TemperatureSensors module +static TEMPSENSORS_SELF_TEST_STATES_T tempSensorsSelfTestState; ///< TemperatureSensor self test state +static TEMPSENSORS_EXEC_STATES_T tempSensorsExecState; ///< TemperatureSensor exec state +static TEMP_SENSOR_T tempSensors [ NUM_OF_TEMPERATURE_SENSORS ]; ///< Temperature sensors' data structure + +static U32 elapsedTime; ///< Elapsed time variable +static U32 internalHeatersConversionTimer; ///< Conversion timer variable to calculate the heaters internal temperature + +static F32 tempValuesForPublication [ NUM_OF_TEMPERATURE_SENSORS ]; ///< Temperature sensors data publication array +static U32 dataPublicationTimerCounter; ///< Temperature sensors data publish timer counter +static OVERRIDE_U32_T tempSensorsPublishInterval = { TEMP_SENSORS_DATA_PUBLISH_INTERVAL, + TEMP_SENSORS_DATA_PUBLISH_INTERVAL, 0, 0 }; ///< Temperature sensors publish time interval override + +static const F32 positiveTCExpA0 = 0.118597600000E0; ///< K TC positive temperature exponent coefficient A0 +static const F32 positiveTCExpA1 = -0.118343200000E-3; ///< K TC positive temperature exponent coefficient A1 +static const F32 positiveTCExpA2 = 0.126968600000E3; ///< K TC positive temperature exponent coefficient A2 + +/// Thermocouple correction coefficients for positive cold junction temperature static const F32 positiveTCCoeffs [ SIZE_OF_THERMOCOUPLE_COEFFICIENTS ] = { - -0.176004136860E-1, 0.389212049750E-1, - 0.185587700320E-4, -0.994575928740E-7, - 0.318409457190E-9, -0.560728448890E-12, - 0.560750590590E-15,-0.320207200030E-18, - 0.971511471520E-22,-0.121047212750E-25 }; ///< Thermocouple correction coefficients for positive cold junction temperature + -0.176004136860E-1, 0.389212049750E-1, + 0.185587700320E-4, -0.994575928740E-7, + 0.318409457190E-9, -0.560728448890E-12, + 0.560750590590E-15,-0.320207200030E-18, + 0.971511471520E-22,-0.121047212750E-25 +}; +/// Thermcouple inverse coefficient for positive cold junction temperature static const F32 positiveTCInverserCoeffs [ SIZE_OF_THERMOCOUPLE_COEFFICIENTS ] = { - 0.0, 2.508355E1, 7.860106E-2, -2.503131E-1, 8.315270E-2, - -1.228034E-2, 9.804036E-4, -4.413030E-5, 1.057734E-6, - -1.052755E-8 }; ///< Thermcouple inverse coefficient for positive cold junction temperature + 0.0, 2.508355E1, 7.860106E-2, -2.503131E-1, 8.315270E-2, + -1.228034E-2, 9.804036E-4, -4.413030E-5, 1.057734E-6, -1.052755E-8 +}; -// Private functions prototypes +// ********** private function prototypes ********** static TEMPSENSORS_SELF_TEST_STATES_T handleSelfTestStart ( void ); static TEMPSENSORS_SELF_TEST_STATES_T handleSelfTestADCCheck ( void ); @@ -165,15 +158,15 @@ static void publishTemperatureSensorsData ( void ); static DATA_GET_PROTOTYPE( U32, getPublishTemperatureSensorsDataInterval ); -// Public functions +// ********** Public functions ********** /************************************************************************* * @brief * The initTemperatureSensors function initializes the module * @details * Inputs : none * Outputs : tempSensorsSelfTestResult, tempSensorsSelfTestState, - * tempSensorsExecState, sampleCount, elapsedTime, tempSensorsConstants + * tempSensorsExecState, sampleCount, elapsedTime, tempSensors * @param none * @return none *************************************************************************/ @@ -193,54 +186,48 @@ * The heaters cold junction sensor has 0.0625 conversion coefficient * The conversion coefficient will be set to 0 for the temperature sensors */ + + for ( i = 0; i < NUM_OF_TEMPERATURE_SENSORS; ++i ) + { + memset(&tempSensors[ i ], 0x0, sizeof( TEMP_SENSOR_T ) ); + } + // Initialize TPi and TPo constants for ( i = TEMPSENSORS_INLET_PRIMARY_HEATER_TEMP_SENSOR; i < TEMPSENSORS_CONDUCTIVITY_SENSOR_1_TEMP_SENSOR; i++ ) { - tempSensorsConstants [ i ] [ ADC_READ_GAIN_INDEX ] = PRIMARY_HEATER_EXT_TEMP_SENSORS_GAIN; - tempSensorsConstants [ i ] [ ADC_READ_REF_RESISTANCE_INDEX ] = PRIMARY_HEATER_EXT_TEMP_SENSORS_REF_RESISTANCE; - tempSensorsConstants [ i ] [ ADC_READ_0_DEG_RESISTANCE_INDEX ] = PRIMARY_HEATER_EXT_TEMP_SENSORS_0_DEGREE_RESISTANCE; - tempSensorsConstants [ i ] [ ADC_READ_2_TEMP_CONVERSION_COEFFICIENT ] = 0; + tempSensors [ i ].gain = PRIMARY_HEATER_EXT_TEMP_SENSORS_GAIN; + tempSensors [ i ].refResistance = PRIMARY_HEATER_EXT_TEMP_SENSORS_REF_RESISTANCE; + tempSensors [ i ].zeroDegreeResistance = PRIMARY_HEATER_EXT_TEMP_SENSORS_0_DEGREE_RESISTANCE; } + // Initialize TD1 and TD2 constants for ( i = TEMPSENSORS_CONDUCTIVITY_SENSOR_1_TEMP_SENSOR; i < TEMPSENSORS_OUTLET_REDUNDANCY_TEMP_SENSOR; i++ ) { - tempSensorsConstants [ i ] [ ADC_READ_GAIN_INDEX ] = COND_SENSORS_TEMP_SENSOR_GAIN; - tempSensorsConstants [ i ] [ ADC_READ_REF_RESISTANCE_INDEX ] = COND_SENSORS_TEMP_SENSOR_REF_RESISTANCE; - tempSensorsConstants [ i ] [ ADC_READ_0_DEG_RESISTANCE_INDEX ] = COND_SENSORS_TEMP_SENSOR_0_DEGREE_RESISTANCE; - tempSensorsConstants [ i ] [ ADC_READ_2_TEMP_CONVERSION_COEFFICIENT ] = 0; + tempSensors [ i ].gain = COND_SENSORS_TEMP_SENSOR_GAIN; + tempSensors [ i ].refResistance = COND_SENSORS_TEMP_SENSOR_REF_RESISTANCE; + tempSensors [ i ].zeroDegreeResistance = COND_SENSORS_TEMP_SENSOR_0_DEGREE_RESISTANCE; } + // Initialize TRo and TDi constants for ( i = TEMPSENSORS_OUTLET_REDUNDANCY_TEMP_SENSOR; i < TEMPSENSORS_PRIMARY_HEATER_THERMO_COUPLE_TEMP_SENSOR; i++ ) { - tempSensorsConstants [ i ] [ ADC_READ_GAIN_INDEX ] = TRIMMER_HEATER_EXT_TEMP_SENSORS_GAIN; - tempSensorsConstants [ i ] [ ADC_READ_REF_RESISTANCE_INDEX ] = TRIMMER_HEATER_EXT_TEMP_SENSORS_REF_RESISTANCE; - tempSensorsConstants [ i ] [ ADC_READ_0_DEG_RESISTANCE_INDEX ] = TRIMMER_HEATER_EXT_TEMP_SENSORS_0_DEGREE_RESISTANCE; - tempSensorsConstants [ i ] [ ADC_READ_2_TEMP_CONVERSION_COEFFICIENT ] = 0; + tempSensors [ i ].gain = TRIMMER_HEATER_EXT_TEMP_SENSORS_GAIN; + tempSensors [ i ].refResistance = TRIMMER_HEATER_EXT_TEMP_SENSORS_REF_RESISTANCE; + tempSensors [ i ].zeroDegreeResistance = TRIMMER_HEATER_EXT_TEMP_SENSORS_0_DEGREE_RESISTANCE; } + // Initialize the heaters internal thermocouples constants for ( i = TEMPSENSORS_PRIMARY_HEATER_THERMO_COUPLE_TEMP_SENSOR; i < TEMPSENSORS_PRIMARY_HEATER_COLD_JUNCTION_TEMP_SENSOR; i++ ) { - tempSensorsConstants [ i ] [ ADC_READ_GAIN_INDEX ] = 0; - tempSensorsConstants [ i ] [ ADC_READ_REF_RESISTANCE_INDEX ] = 0; - tempSensorsConstants [ i ] [ ADC_READ_0_DEG_RESISTANCE_INDEX ] = 0; - tempSensorsConstants [ i ] [ ADC_READ_2_TEMP_CONVERSION_COEFFICIENT ] = HEATERS_INTERNAL_TC_ADC_TO_TEMP_CONVERSION_COEFF; + tempSensors [ i ].twoTempConversionCoef = HEATERS_INTERNAL_TC_ADC_TO_TEMP_CONVERSION_COEFF; } + // Initialize the heaters cold junction constants for ( i = TEMPSENSORS_PRIMARY_HEATER_COLD_JUNCTION_TEMP_SENSOR; i < TEMPSENSORS_PRIMARY_HEATER_INTERNAL_TEMP; i++ ) { - tempSensorsConstants [ i ] [ ADC_READ_GAIN_INDEX ] = 0; - tempSensorsConstants [ i ] [ ADC_READ_REF_RESISTANCE_INDEX ] = 0; - tempSensorsConstants [ i ] [ ADC_READ_0_DEG_RESISTANCE_INDEX ] = 0; - tempSensorsConstants [ i ] [ ADC_READ_2_TEMP_CONVERSION_COEFFICIENT ] = HEATERS_COLD_JUNCTION_ADC_TO_TEMP_CONVERSION_COEFF; + tempSensors [ i ].twoTempConversionCoef = HEATERS_COLD_JUNCTION_ADC_TO_TEMP_CONVERSION_COEFF; } // Initialize the heaters calculated internal temperature sensors. The constants are zero since they will not be used for conversion - for ( i = TEMPSENSORS_PRIMARY_HEATER_INTERNAL_TEMP; i < NUM_OF_TEMPERATURE_SENSORS; i++ ) - { - tempSensorsConstants [ i ] [ ADC_READ_GAIN_INDEX ] = 0; - tempSensorsConstants [ i ] [ ADC_READ_REF_RESISTANCE_INDEX ] = 0; - tempSensorsConstants [ i ] [ ADC_READ_0_DEG_RESISTANCE_INDEX ] = 0; - tempSensorsConstants [ i ] [ ADC_READ_2_TEMP_CONVERSION_COEFFICIENT ] = 0; - } } /************************************************************************* @@ -329,13 +316,13 @@ { F32 temperature; - if ( temperatureValues [ sensor ].override == OVERRIDE_KEY ) + if ( tempSensors[ sensor ].temperatureValues.override == OVERRIDE_KEY ) { - temperature = temperatureValues [ sensor ].ovData; + temperature = tempSensors[ sensor ].temperatureValues.ovData; } else { - temperature = temperatureValues [ sensor ].data; + temperature = tempSensors[ sensor ].temperatureValues.data; } return temperature; @@ -388,8 +375,8 @@ F32 temperature = 0.0; F32 equiVoltage = 0.0; F32 correctedVoltage = 0.0; - F32 TCTemp = temperatureValues [ TCIndex ].data; - F32 CJTemp = temperatureValues [ CJIndex ].data; + F32 TCTemp = tempSensors[ TCIndex ].temperatureValues.data; + F32 CJTemp = tempSensors[ CJIndex ].temperatureValues.data; // Value in mV F32 rawVoltage = ( TCTemp - CJTemp ) * K_THERMOCOUPLE_TEMP_2_MILLI_VOLT_CONVERSION_COEFF; @@ -420,11 +407,11 @@ if ( TCIndex == TEMPSENSORS_PRIMARY_HEATER_THERMO_COUPLE_TEMP_SENSOR ) { - temperatureValues [ TEMPSENSORS_PRIMARY_HEATER_INTERNAL_TEMP ].data = temperature; + tempSensors[ TEMPSENSORS_PRIMARY_HEATER_INTERNAL_TEMP ].temperatureValues.data = temperature; } else { - temperatureValues [ TEMPSENSORS_TRIMMER_HEATER_INTERNAL_TEMP ].data = temperature; + tempSensors[ TEMPSENSORS_TRIMMER_HEATER_INTERNAL_TEMP ].temperatureValues.data = temperature; } } @@ -511,35 +498,29 @@ #ifndef _VECTORCAST_ isADCValid = TRUE; // TODO remove this line. Temporary set to true until FPGA error count is fixed #endif - U32 previousReadCount = readAndErrorCounts [ sensorIndex ] [ READ_AND_ERROR_PREV_FPGA_COUNT_INDEX ]; - - if ( fpgaError != 0 ) + if ( fpgaError == 0 ) { - /*if ( error == EXTERNAL_TEMP_SENSORS_ERROR_VALUE ) + if ( tempSensors[ sensorIndex ].readCount != fpgaCount ) { - // TODO: alarm? - }*/ - } - else if ( fpgaCount == previousReadCount ) - { - U32 internalErrorCount = readAndErrorCounts [ sensorIndex ] [ READ_AND_ERROR_INTERNAL_ERROR_COUNT_INDEX ]; - - if ( internalErrorCount > MAX_ALLOWED_UNCHANGED_ADC_READS ) - { - // TODO alarm + tempSensors[ sensorIndex ].readCount = fpgaCount; + tempSensors[ sensorIndex ].internalErrorCount = 0; + isADCValid = TRUE; } else { - internalErrorCount = internalErrorCount + 1; - readAndErrorCounts [ sensorIndex ] [ READ_AND_ERROR_PREV_FPGA_COUNT_INDEX ] = fpgaCount; - readAndErrorCounts [ sensorIndex ] [ READ_AND_ERROR_INTERNAL_ERROR_COUNT_INDEX ] = internalErrorCount; + ++tempSensors[ sensorIndex ].internalErrorCount; + if ( tempSensors[ sensorIndex ].internalErrorCount > MAX_ALLOWED_UNCHANGED_ADC_READS ) + { + // TODO alarm + } } } - else if ( fpgaCount > previousReadCount ) + else { - readAndErrorCounts [ sensorIndex ] [ READ_AND_ERROR_PREV_FPGA_COUNT_INDEX ] = fpgaCount; - readAndErrorCounts [ sensorIndex ] [ READ_AND_ERROR_INTERNAL_ERROR_COUNT_INDEX ] = 0; - isADCValid = TRUE; + /*if ( error == EXTERNAL_TEMP_SENSORS_ERROR_VALUE ) + { + // TODO: alarm? + }*/ } return isADCValid; @@ -558,27 +539,23 @@ *************************************************************************/ static void processADCRead ( U32 sensorIndex, S32 adc ) { - // Update the values in the folders - U32 index = runningSumAndIndex [ sensorIndex ] [ ADC_READ_NEXT_INDEX_INDEX ]; - S32 runningSum = runningSumAndIndex [ sensorIndex ] [ ADC_READ_RUNNING_SUM_INDEX ]; - S32 indexValue = rawADCReads [ sensorIndex ] [ index ]; - U32 nextIndex = INC_WRAP( index, ADC_READ_FIRST_READ_INDEX, MAX_NUM_OF_RAW_ADC_SAMPLES - 1 ); - runningSum = runningSum - indexValue + adc; + U32 const index = tempSensors[ sensorIndex ].adcNextIndex; + S32 const indexValue = tempSensors[ sensorIndex ].rawADCReads [ index ]; - rawADCReads [ sensorIndex ] [ index ] = adc; - runningSumAndIndex [ sensorIndex ] [ ADC_READ_NEXT_INDEX_INDEX ] = nextIndex; - runningSumAndIndex [ sensorIndex ] [ ADC_READ_RUNNING_SUM_INDEX ] = runningSum; + tempSensors[ sensorIndex ].rawADCReads[ index ] = adc; + tempSensors[ sensorIndex ].adcNextIndex = INC_WRAP( index, 0, MAX_NUM_OF_RAW_ADC_SAMPLES - 1 ); + tempSensors[ sensorIndex ].adcRunningSum = tempSensors[ sensorIndex ].adcRunningSum - indexValue + adc; // Calculate the average - F32 avgADCReads = runningSum >> SHIFT_BITS_BY_5_FOR_AVERAGING; + F32 const avgADCReads = tempSensors[ sensorIndex ].adcRunningSum >> SHIFT_BITS_BY_5_FOR_AVERAGING; - F32 temperature = getADC2TempConversion ( avgADCReads, - (U32)tempSensorsConstants [ sensorIndex ] [ ADC_READ_GAIN_INDEX ], - (U32)tempSensorsConstants [ sensorIndex ] [ ADC_READ_REF_RESISTANCE_INDEX ], - (U32)tempSensorsConstants [ sensorIndex ] [ ADC_READ_0_DEG_RESISTANCE_INDEX ], - tempSensorsConstants [ sensorIndex ] [ ADC_READ_2_TEMP_CONVERSION_COEFFICIENT ] ); + F32 const temperature = getADC2TempConversion ( avgADCReads, + (U32)tempSensors [ sensorIndex ].gain, + (U32)tempSensors [ sensorIndex ].refResistance, + (U32)tempSensors [ sensorIndex ].zeroDegreeResistance, + tempSensors [ sensorIndex ].twoTempConversionCoef ); - temperatureValues [ sensorIndex ].data = temperature; + tempSensors[ sensorIndex ].temperatureValues.data = temperature; } /************************************************************************* @@ -610,21 +587,18 @@ *************************************************************************/ static TEMPSENSORS_SELF_TEST_STATES_T handleSelfTestADCCheck ( void ) { - TEMPSENSORS_SELF_TEST_STATES_T state = TEMPSENSORS_SELF_TEST_CONSISTENCY_CHECK; - // TODo Remove - F32 avgADCReads [ NUM_OF_TEMPERATURE_SENSORS ]; //TODO remove - U08 i; - for ( i = 0; i < sizeof(avgADCReads); i++ ) - { - U32 avgADC = avgADCReads [ i ]; + processTempSnsrsADCRead ( TEMPSENSORS_INLET_PRIMARY_HEATER_TEMP_SENSOR, getFPGATPiTemp(), getFPGARTDErrorCount(), getFPGARTDReadCount() ); + processTempSnsrsADCRead ( TEMPSENSORS_OUTLET_PRIMARY_HEATER_TEMP_SENSOR, getFPGATPoTemp(), getFPGARTDErrorCount(), getFPGARTDReadCount() ); - if ( avgADC > TEMP_SENSORS_ADC_MAX_COUNT ) - { - SET_ALARM_WITH_1_U32_DATA ( ALARM_ID_TEMPERATURE_SENSORS_OUT_OF_RANGE, TEMPSENSORS_SELF_TEST_ADC_CHECK ); - } + BOOL const isLessThanZero = tempSensors[ TEMPSENSORS_INLET_PRIMARY_HEATER_TEMP_SENSOR ].rawADCReads[0] < 0; + BOOL const isGreaterThanFullScale = tempSensors[ TEMPSENSORS_INLET_PRIMARY_HEATER_TEMP_SENSOR ].rawADCReads[0] > TEMP_SENSORS_ADC_MAX_COUNT; + if ( isLessThanZero || isGreaterThanFullScale ) + { + tempSensorsSelfTestResult = SELF_TEST_STATUS_FAILED; + SET_ALARM_WITH_1_U32_DATA ( ALARM_ID_TEMPERATURE_SENSORS_FAULT, TEMPSENSORS_SELF_TEST_ADC_CHECK ); } - return state; + return TEMPSENSORS_SELF_TEST_CONSISTENCY_CHECK; } /************************************************************************* @@ -639,33 +613,16 @@ *************************************************************************/ static TEMPSENSORS_SELF_TEST_STATES_T handleSelfTestConsistencyCheck ( void ) { - //TODO Consider edge cases for the consistency check - TEMPSENSORS_SELF_TEST_STATES_T state = TEMPSENSORS_SELF_TEST_COMPLETE; - - U32 largestDelta; - U08 i, j; - - // Check if all the sensors are within a certain degree c - // from each other - for ( i = 0; i < sizeof(temperatureValues); i++ ) - { - for ( j = 0; j < sizeof(temperatureValues); j++ ) - { - if ( i != j ) - { - largestDelta = MAX( largestDelta, fabs(temperatureValues [ i ].data - temperatureValues [ j ].data) ); - } - if ( largestDelta > MAX_ALLOWED_TEMP_DELTA_BETWEEN_SENSORS ) - { - SET_ALARM_WITH_1_U32_DATA ( ALARM_ID_TEMPERATURE_SENSORS_INCONSISTENT, TEMPSENSORS_SELF_TEST_CONSISTENCY_CHECK ); - } - } + F32 const tempDiff = fabs(tempSensors[ TEMPSENSORS_INLET_PRIMARY_HEATER_TEMP_SENSOR ].temperatureValues.data + - tempSensors[ TEMPSENSORS_OUTLET_PRIMARY_HEATER_TEMP_SENSOR ].temperatureValues.data); + if ( tempDiff > MAX_ALLOWED_TEMP_DELTA_BETWEEN_SENSORS ) { + tempSensorsSelfTestResult = SELF_TEST_STATUS_FAILED; + SET_ALARM_WITH_1_U32_DATA ( ALARM_ID_TEMPERATURE_SENSORS_INCONSISTENT, TEMPSENSORS_SELF_TEST_CONSISTENCY_CHECK ); + } else { + tempSensorsSelfTestResult = SELF_TEST_STATUS_PASSED; } - // TODO finalize the results - tempSensorsSelfTestResult = SELF_TEST_STATUS_PASSED; - - return state; + return TEMPSENSORS_SELF_TEST_COMPLETE; } /************************************************************************* @@ -709,8 +666,6 @@ *************************************************************************/ static TEMPSENSORS_EXEC_STATES_T handleExecGetADCValues ( void ) { - TEMPSENSORS_EXEC_STATES_T state = TEMPSENSORS_EXEC_STATE_GET_ADC_VALUES; - // Look at the error counter and the specific error flag to make sure the error is a temp sensor // Add a byte array to have bits for each sensor to find out exactly what sensor failed processTempSnsrsADCRead ( TEMPSENSORS_INLET_PRIMARY_HEATER_TEMP_SENSOR, getFPGATPiTemp(), getFPGARTDErrorCount(), getFPGARTDReadCount() ); @@ -731,10 +686,10 @@ elapsedTime = getMSTimerCount(); } else if ( didTimeout( elapsedTime, INPUT_WATER_TEMPERATURE_CHECK_TIME_INTERVAL ) && - temperatureValues [ TEMPSENSORS_INLET_PRIMARY_HEATER_TEMP_SENSOR ].override != OVERRIDE_KEY ) + tempSensors[ TEMPSENSORS_INLET_PRIMARY_HEATER_TEMP_SENSOR ].temperatureValues.override != OVERRIDE_KEY ) { elapsedTime = 0; - F32 inletTemperature = temperatureValues [ TEMPSENSORS_INLET_PRIMARY_HEATER_TEMP_SENSOR ].data; + F32 inletTemperature = tempSensors[ TEMPSENSORS_INLET_PRIMARY_HEATER_TEMP_SENSOR ].temperatureValues.data; if ( inletTemperature < MIN_WATER_INPUT_TEMPERATURE || inletTemperature >= MAX_WATER_INPUT_TEMPERATURE ) { SET_ALARM_WITH_1_U32_DATA ( ALARM_ID_INLET_WATER_TEMPERATURE_OUT_OF_RANGE, inletTemperature ); @@ -757,7 +712,7 @@ publishTemperatureSensorsData(); - return state; + return TEMPSENSORS_EXEC_STATE_GET_ADC_VALUES; } /************************************************************************* @@ -831,8 +786,8 @@ if ( isTestingActivated() ) { result = TRUE; - temperatureValues [ sensor ].ovData = temperature; - temperatureValues [ sensor ].override = OVERRIDE_KEY; + tempSensors[ sensor ].temperatureValues.ovData = temperature; + tempSensors[ sensor ].temperatureValues.override = OVERRIDE_KEY; } } @@ -858,8 +813,8 @@ if ( isTestingActivated() ) { result = TRUE; - temperatureValues [ sensor ].override = OVERRIDE_RESET; - temperatureValues [ sensor ].ovData = temperatureValues [ sensor ].ovInitData; + tempSensors[ sensor ].temperatureValues.override = OVERRIDE_RESET; + tempSensors[ sensor ].temperatureValues.ovData = tempSensors[ sensor ].temperatureValues.ovInitData; } } Index: firmware/App/Controllers/TemperatureSensors.h =================================================================== diff -u -ra7bf3ca23ea37a61000379facae628a31b3ecc59 -re03873e424a6c2fc6eca07511e8c80dc91a5afdc --- firmware/App/Controllers/TemperatureSensors.h (.../TemperatureSensors.h) (revision a7bf3ca23ea37a61000379facae628a31b3ecc59) +++ firmware/App/Controllers/TemperatureSensors.h (.../TemperatureSensors.h) (revision e03873e424a6c2fc6eca07511e8c80dc91a5afdc) @@ -18,7 +18,7 @@ #ifndef __TEMPERATURESENSORS_H__ #define __TEMPERATURESENSORS_H__ -#include "Common.h" +#include "DGCommon.h" /** * @defgroup TemperatureSensors TemperatureSensors @@ -29,7 +29,9 @@ * @{ */ -/// Sensors name +// ********** public definitions ********** + +/// Enumeration of temperature sensors typedef enum SENSORS_NAME { TEMPSENSORS_INLET_PRIMARY_HEATER_TEMP_SENSOR = 0, ///< Inlet primary heaters temperature sensor @@ -47,6 +49,8 @@ NUM_OF_TEMPERATURE_SENSORS ///< Number of temperature sensors } TEMPERATURE_SENSORS_T; +// ********** public function prototypes ********** + void initTemperatureSensors ( void ); SELF_TEST_STATUS_T execTemperatureSensorsSelfTest ( void ); @@ -61,4 +65,6 @@ BOOL testSetTemperatureSensorsPublishIntervalOverride ( U32 value ); BOOL testResetTemperatureSensorsPublishIntervalOverride ( void ); +/**@}*/ + #endif