Index: firmware/App/Monitors/Pressure.c =================================================================== diff -u -r9102c5da21a15bdaf4bb3bc38795ceb064e3c443 -r3ea4def3a3a69a00fb96b6089dbd097fa80041de --- firmware/App/Monitors/Pressure.c (.../Pressure.c) (revision 9102c5da21a15bdaf4bb3bc38795ceb064e3c443) +++ firmware/App/Monitors/Pressure.c (.../Pressure.c) (revision 3ea4def3a3a69a00fb96b6089dbd097fa80041de) @@ -36,6 +36,7 @@ #define SIZE_OF_PRESSURE_ROLLING_AVG ( PRESSURE_SAMPLE_FILTER_MS / TASK_PRIORITY_INTERVAL ) ///< Filtered pressure moving average. #define SIZE_OF_PRESSURETEMP_ROLLING_AVG ( PRESSURE_TEMP_SAMPLE_FILTER_MS / TASK_PRIORITY_INTERVAL ) ///< Filtered pressure temprature w/ 1 second moving average. #define MMHG_TO_PSI_CONVERSION 0.0193368F ///< MMHG to PSI conversion. +#define BAR_TO_PSI_CONVERSION 14.5038F ///< MMHG to PSI conversion. #define MIN_INLET_WATER_PRESSURE_WARNING_LOW_PSIG 20.0F ///< Minimum allowed Input low pressure value in psig. #define MAX_INLET_WATER_PRESSURE_WARNING_HIGH_PSIG 80.0F ///< Maximum allowed Input high pressure value in psig. @@ -345,8 +346,8 @@ for ( i = PRESSURE_SENSOR_FIRST; i < NUM_OF_PRESSURE_SENSORS; i++ ) { - F32 pressureinmmHG = getPressure( i ); - F32 pressure = getConvertedPressure( i, pressureinmmHG ); + F32 pressureinPSI = getPressure( i ); + F32 pressure = getConvertedPressure( i, pressureinPSI ); if ( filteredPressureReadings[i].pressureReadingsCount >= SIZE_OF_PRESSURE_ROLLING_AVG ) { @@ -401,12 +402,12 @@ static F32 getConvertedPressure( PRESSURE_SENSORS_T sensor, F32 pressure ) { F32 baroPressurePSI = getPressure( PRESSURE_SENSOR_BAROMETRIC ) * MMHG_TO_PSI_CONVERSION; - F32 pressurePSI = pressure * MMHG_TO_PSI_CONVERSION; // calibrated pressure - //F32 calPressure = getCalibrationAppliedPressure( sensor, pressurePSI ); + //F32 calPressure = getCalibrationAppliedPressure( sensor, pressure ); - return pressurePSI; + return pressure; + //return calPressure; } /*********************************************************************//**