Index: firmware/App/Drivers/PressureSensor.c =================================================================== diff -u -rb88a8fd2c5fca8f055d6df1437635692388fcb0d -r87d45fcfcfdfa6d7638834181fd07bed56a3af67 --- firmware/App/Drivers/PressureSensor.c (.../PressureSensor.c) (revision b88a8fd2c5fca8f055d6df1437635692388fcb0d) +++ firmware/App/Drivers/PressureSensor.c (.../PressureSensor.c) (revision 87d45fcfcfdfa6d7638834181fd07bed56a3af67) @@ -20,6 +20,7 @@ #include "PersistentAlarm.h" #include "PressureCommon.h" #include "PressureSensor.h" +#include "Timers.h" #include "Utilities.h" /** @@ -46,19 +47,56 @@ #define PRESSURE_STALE_DATA 2 ///< Pressure status bits indicate data is stale (no new data since last fpga read). #define PRESSURE_DIAG_CONDITION 3 ///< Pressure status bits diagnostic condition (alarm). +#define PUMP_PRESSURE_PSIA_TO_PSI_OFFSET 14.7F ///< Subtract this offset to convert PSIA to PSI. +#define ONE_BAR_TO_PSI_CONVERSION 14.5F ///< 1 bar to PSI conversion. +#define ONE_BAR_TO_MILLI_BAR 1000 ///< 1 bar to milli-bar conversion. +#define COUNTS_TO_MILLI_BAR 100 ///< Counts to milli-bar conversion. +#define BARO_SENSOR_REFERENCE_TEMP_C 2000 ///< Barometric sensor reference temperature in C. +#define BARO_SENSOR_WAIT_FOR_COEFF_TIME_OUT_MS ( 20 * MS_PER_SECOND ) ///< Barometric sensor wait for coefficients timeout in milliseconds. + +static const U32 TWO_TO_POWER_OF_6 = ( 1 << 6 ); ///< 2^6. +static const U32 TWO_TO_POWER_OF_7 = ( 1 << 7 ); ///< 2^7. +static const U32 TWO_TO_POWER_OF_8 = ( 1 << 8 ); ///< 2^8. +static const U32 TWO_TO_POWER_OF_15 = ( 1 << 15 ); ///< 2^15. +static const U32 TWO_TO_POWER_OF_16 = ( 1 << 16 ); ///< 2^16. +static const U32 TWO_TO_POWER_OF_17 = ( 1 << 17 ); ///< 2^17. +static const U32 TWO_TO_POWER_OF_21 = ( 1 << 21 ); ///< 2^21. +static const U32 TWO_TO_POWER_OF_23 = ( 1 << 23 ); ///< 2^23. + +/// Barometric sensor conversion coefficients +typedef struct +{ + U16 pressureSensitivity; ///< Barometric sensor pressure sensitivity constant. + U16 pressureOffset; ///< Barometric sensor pressure offset constant. + U16 pressureSensitivityTempCoeff; ///< Barometric sensor pressure sensitivity temperature coefficient. + U16 pressureOffsetTempCoeff; ///< Barometric sensor pressure offset temperature coefficient. + U16 refTemperature; ///< Barometric sensor reference temperature. + U16 temperatureCoeff; ///< Barometric sensor temperature coefficient. + OVERRIDE_U32_T coeffsCRC; ///< Barometric sensor coefficients CRC. + U32 waitForCoeffStartTimeMS; ///< Barometric sensor wait for coefficients start time in milliseconds. + BOOL hasCRCBeenChecked; ///< Barometric sensor has CRC been checked flag. + BOOL hasCRCCheckBeenRequested; ///< Barometric sensor has CRC check been requested flag. +} BARO_SENSOR_CONSTS_T; + // ********** private data ********** static OVERRIDE_F32_T currentPressureReadings[ NUM_OF_PRESSURE_SENSORS ]; ///< Current pressure sensor pressure readings (overrideable). static OVERRIDE_F32_T currentPresTempReadings[ NUM_OF_PRESSURE_SENSORS ]; ///< Current pressure sensor temperature readings (overrideable). static OVERRIDE_U32_T lastPressureReadCounter[ NUM_OF_PRESSURE_SENSORS ]; ///< Last pressure sensor read count (Overrideable). static OVERRIDE_U32_T lastPressureErrorCounter[ NUM_OF_PRESSURE_SENSORS ]; ///< Last pressure sensor error count (Overrideable). static U32 currentPressureStatus[ NUM_OF_PRESSURE_SENSORS ]; ///< Current status of pressure sensors. +static BARO_SENSOR_CONSTS_T baroConvConsts; ///< Barometric sensor conversion constants. +//static DG_PRES_SENSORS_CAL_RECORD_T pressuresCalRecord; ///< Pressures calibration record. // ********** private function prototypes ********** static void checkPressureSensors( void ); -static F32 convertPressureRdg2mmHg( U16 counts ); -static U32 getPressureStatusFromFPGARegReading( U16 fpgaReg ); +static F32 convertPressureRdg2mmHg( U16 counts ); +static U32 getPressureStatusFromFPGARegReading( U16 fpgaReg ); +static F32 calculateBaroPressurePSI( U32 baroPresCount ); +static F32 calculateBaroTemperatureC( U32 baroTempCount ); +static void checkBaroSensorCoeffsCRC( void ); +static F32 getCalibrationAppliedPressure( U08 sensorId, F32 pressure ); /*********************************************************************//** * @brief @@ -74,29 +112,43 @@ // Initialize override structures for each pressure sensor for ( i = 0; i < (U32)NUM_OF_PRESSURE_SENSORS; i++ ) { - currentPressureReadings[ i ].data = 0.0F; - currentPressureReadings[ i ].ovData = 0.0F; + currentPressureReadings[ i ].data = 0.0F; + currentPressureReadings[ i ].ovData = 0.0F; currentPressureReadings[ i ].ovInitData = 0.0F; - currentPressureReadings[ i ].override = OVERRIDE_RESET; + currentPressureReadings[ i ].override = OVERRIDE_RESET; - currentPresTempReadings[ i ].data = 0.0F; - currentPresTempReadings[ i ].ovData = 0.0F; + currentPresTempReadings[ i ].data = 0.0F; + currentPresTempReadings[ i ].ovData = 0.0F; currentPresTempReadings[ i ].ovInitData = 0.0F; - currentPresTempReadings[ i ].override = OVERRIDE_RESET; + currentPresTempReadings[ i ].override = OVERRIDE_RESET; - lastPressureReadCounter[ i ].data = 0; - lastPressureReadCounter[ i ].ovData = 0; + lastPressureReadCounter[ i ].data = 0; + lastPressureReadCounter[ i ].ovData = 0; lastPressureReadCounter[ i ].ovInitData = 0; - lastPressureReadCounter[ i ].override = OVERRIDE_RESET; + lastPressureReadCounter[ i ].override = OVERRIDE_RESET; - lastPressureErrorCounter[ i ].data = 0; - lastPressureErrorCounter[ i ].ovData = 0; + lastPressureErrorCounter[ i ].data = 0; + lastPressureErrorCounter[ i ].ovData = 0; lastPressureErrorCounter[ i ].ovInitData = 0; - lastPressureErrorCounter[ i ].override = OVERRIDE_RESET; + lastPressureErrorCounter[ i ].override = OVERRIDE_RESET; currentPressureStatus[ i ] = PRESSURE_STALE_DATA; } + baroConvConsts.pressureSensitivity = 0; + baroConvConsts.pressureOffset = 0; + baroConvConsts.pressureSensitivityTempCoeff = 0; + baroConvConsts.pressureOffsetTempCoeff = 0; + baroConvConsts.refTemperature = 0; + baroConvConsts.temperatureCoeff = 0; + baroConvConsts.coeffsCRC.data = 0; + baroConvConsts.coeffsCRC.ovData = 0; + baroConvConsts.coeffsCRC.ovInitData = 0; + baroConvConsts.coeffsCRC.override = OVERRIDE_RESET; + baroConvConsts.waitForCoeffStartTimeMS = getMSTimerCount(); + baroConvConsts.hasCRCBeenChecked = FALSE; + baroConvConsts.hasCRCCheckBeenRequested = FALSE; + // Initialize the FPGA persistent alarms initFPGAPersistentAlarm( FPGA_PERS_ERROR_ARTERIAL_PRESSURE_SENSOR, ALARM_ID_TD_ARTERIAL_SENSOR_TIMEOUT_FAULT, PRES_SENSORS_COUNT_ERROR_TIMEOUT_MS, PRES_SENSORS_COUNT_ERROR_TIMEOUT_MS ); @@ -118,26 +170,35 @@ *************************************************************************/ void readPressureSensors( void ) { - U16 h2 = getH2Pressure(); + U16 h2 = getH2Pressure(); U16 h14 = getH14Pressure(); + U16 h23 = getH23Pressure(); + checkBaroSensorCoeffsCRC(); + // Update status of pressure sensors - currentPressureStatus[ H2_PRES ] = getPressureStatusFromFPGARegReading( h2 ); + currentPressureStatus[ H2_PRES ] = getPressureStatusFromFPGARegReading( h2 ); currentPressureStatus[ H14_PRES ] = getPressureStatusFromFPGARegReading( h14 ); + currentPressureStatus[ H23_PRES ] = 0; // TODO do have status from the baro pressure sensor? // Update and convert raw pressures to mmHg - currentPressureReadings[ H2_PRES ].data = convertPressureRdg2mmHg( h2 ); - currentPressureReadings[ H14_PRES ].data = convertPressureRdg2mmHg( h14 ); + currentPressureReadings[ H2_PRES ].data = convertPressureRdg2mmHg( h2 ); + currentPressureReadings[ H14_PRES ].data = convertPressureRdg2mmHg( h14 ); + // Update and convert raw baro pressure to psi + currentPressureReadings[ H23_PRES ].data = calculateBaroPressurePSI( h23 ); // Update and convert raw pressure sensor temperatures to deg C - currentPresTempReadings[ H2_PRES ].data = convertPressureTempReading2DegC( getH2Temperature() ); + currentPresTempReadings[ H2_PRES ].data = convertPressureTempReading2DegC( getH2Temperature() ); currentPresTempReadings[ H14_PRES ].data = convertPressureTempReading2DegC( getH14Temperature() ); + currentPresTempReadings[ H23_PRES ].data = calculateBaroTemperatureC( getH23Temperature() ); // Update read and error counters for each pressure sensor - lastPressureReadCounter[ H2_PRES ].data = (U32)getH2ReadCounter(); - lastPressureReadCounter[ H14_PRES ].data = (U32)getH14ReadCounter(); - lastPressureErrorCounter[ H2_PRES ].data = (U32)getH2ErrorCounter(); + lastPressureReadCounter[ H2_PRES ].data = (U32)getH2ReadCounter(); + lastPressureReadCounter[ H14_PRES ].data = (U32)getH14ReadCounter(); + lastPressureReadCounter[ H23_PRES ].data = (U32)getH23ReadCounter(); + lastPressureErrorCounter[ H2_PRES ].data = (U32)getH2ErrorCounter(); lastPressureErrorCounter[ H14_PRES ].data = (U32)getH14ErrorCounter(); + lastPressureErrorCounter[ H23_PRES ].data = (U32)getH23ErrorCounter(); // Monitor pressure sensor health #ifndef TEST_NO_PRESSURE_CHECKS @@ -186,6 +247,111 @@ /*********************************************************************//** * @brief + * The calculateBaroPressurePSI function calculates the barometric pressure in psi. + * @details Inputs: measuredPressureReadingsSum + * @details Outputs: none + * @param baroPresCount barometric pressure sensor ADC count + * @return barometric pressure in psi + *************************************************************************/ +static F32 calculateBaroPressurePSI( U32 baroPresCount ) +{ + S32 tempDiff = calculateBaroTemperatureC( getH23Temperature() ); + S64 tempOffset = ( baroConvConsts.pressureOffsetTempCoeff * tempDiff ) / TWO_TO_POWER_OF_6; + S64 presOffset = baroConvConsts.pressureOffset * TWO_TO_POWER_OF_17; + S64 offset = presOffset + tempOffset; + S64 tempSensitivity = ( baroConvConsts.pressureSensitivityTempCoeff * tempDiff ) / TWO_TO_POWER_OF_7; + S64 presSensitivity = baroConvConsts.pressureSensitivity * TWO_TO_POWER_OF_16; + S64 sensitivity = tempSensitivity + presSensitivity; + S32 pres = (S32)( ( ( baroPresCount * sensitivity ) / TWO_TO_POWER_OF_21 ) - offset ) / TWO_TO_POWER_OF_15; + F32 presPSI = ( (F32)pres / (F32)( COUNTS_TO_MILLI_BAR * ONE_BAR_TO_MILLI_BAR ) ) * ONE_BAR_TO_PSI_CONVERSION; + F32 presPSIWithCal = getCalibrationAppliedPressure( H23_PRES, presPSI ); + + return presPSIWithCal; +} + +/*********************************************************************//** + * @brief + * The calculateBaroPressurePSI function calculates the barometric pressure in psi. + * @details Inputs: measuredPressureReadingsSum + * @details Outputs: none + * @param baroPresCount barometric pressure sensor ADC count + * @return barometric pressure in psi + *************************************************************************/ +static F32 calculateBaroTemperatureC( U32 baroTempCount ) +{ + S32 baroTempSensorsDiff = (S32)baroTempCount - ( baroConvConsts.refTemperature * TWO_TO_POWER_OF_8 ); + S64 differenceTimesCoefficient = (S64)baroTempSensorsDiff * (S64)baroConvConsts.temperatureCoeff; + S64 baroSnsrTemperature = BARO_SENSOR_REFERENCE_TEMP_C + ( differenceTimesCoefficient / TWO_TO_POWER_OF_23 ); + F32 temperatureC = (F32)( baroSnsrTemperature / 100.0F ); + + return temperatureC; +} + +/*********************************************************************//** + * @brief + * The checkBaroSensorCoeffsCRC function gets all the barometric sensor coefficients + * and calls crc4 function to calculate the CRC of the coefficients and compares + * them to the provided CRC by the manufacturer. + * @details Inputs: baroConvConsts + * @details Outputs: baroConvConsts + * @return none + *************************************************************************/ +static void checkBaroSensorCoeffsCRC( void ) +{ + BARO_PRES_SENSOR_MFG_T baroMfgCoeffs; + + getH23MfgCoeffs( &baroMfgCoeffs ); + + U32 baroCRC = (U32)baroMfgCoeffs.baroPromCRC; + BOOL hasCRCChanged = ( baroCRC != getU32OverrideValue( &baroConvConsts.coeffsCRC ) ? TRUE : FALSE ); + + // Once FPGA is ready get the barometric sensor's temperature conversion constants + if ( ( TRUE == hasCRCChanged ) || ( TRUE == baroConvConsts.hasCRCCheckBeenRequested ) ) + { + U08 calculatedCRC = crc4( (U16*)&baroMfgCoeffs, sizeof( BARO_PRES_SENSOR_MFG_T ) ); + + baroConvConsts.coeffsCRC.data = baroCRC; + baroCRC = (U16)( baroCRC & MASK_OFF_MSB ) & MASK_OFF_NIBBLE_MSB; + baroConvConsts.hasCRCBeenChecked = TRUE; + baroConvConsts.hasCRCCheckBeenRequested = FALSE; + + if ( calculatedCRC != baroCRC ) + { + // TODO enable the alarm + //SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DG_BAROMETRIC_SENSOR_COEFFS_BAD_CRC, calculatedCRC, baroCoeffs.crc ); + } + } + else if ( ( TRUE == didTimeout( baroConvConsts.waitForCoeffStartTimeMS, BARO_SENSOR_WAIT_FOR_COEFF_TIME_OUT_MS ) ) && + ( FALSE == baroConvConsts.hasCRCBeenChecked ) ) + { + //SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DG_BAROMETRIC_SENSOR_COEFFS_BAD_CRC, 0, baroCRC ); + } +} + +/*********************************************************************//** + * @brief + * The getCalibrationAppliedPressure function applies the calibration values + * to the provided pressure and returns the values. + * @details Inputs: pressuresCalRecord + * @details Outputs: none + * @param sensorId the ID of the pressure sensor + * @param pressure the pressure before applying calibration to it + * @return calibration applied pressure + *************************************************************************/ +static F32 getCalibrationAppliedPressure( U08 sensorId, F32 pressure ) +{ + // TODO placeholder for later + //F32 calPressure = pow( pressure, 4 ) * pressuresCalRecord.pressureSensors[ (PRESSURE_SENSORS_T)sensorId ].fourthOrderCoeff + + // pow( pressure, 3 ) * pressuresCalRecord.pressureSensors[ (PRESSURE_SENSORS_T)sensorId ].thirdOrderCoeff + + // pow( pressure, 2 ) * pressuresCalRecord.pressureSensors[ (PRESSURE_SENSORS_T)sensorId ].secondOrderCoeff + + // pressure * pressuresCalRecord.pressureSensors[ (PRESSURE_SENSORS_T)sensorId ].gain + + // pressuresCalRecord.pressureSensors[ (PRESSURE_SENSORS_T)sensorId ].offset; + //return calPressure; + return pressure; +} + +/*********************************************************************//** + * @brief * The checkPressureSensors function checks the read and error counters for * each pressure sensor. * @details \b Alarm: ALARM_ID_TD_ARTERIAL_SENSOR_TIMEOUT_FAULT if the