Index: firmware/App/Monitors/Pressure.c =================================================================== diff -u -r3edf8084a5028ee0d00a3fba496284e593e4254d -r51d83f99e63d9cb52951097996641cc5b3ddffd7 --- firmware/App/Monitors/Pressure.c (.../Pressure.c) (revision 3edf8084a5028ee0d00a3fba496284e593e4254d) +++ firmware/App/Monitors/Pressure.c (.../Pressure.c) (revision 51d83f99e63d9cb52951097996641cc5b3ddffd7) @@ -35,7 +35,6 @@ #define PRESSURE_TEMP_SAMPLE_FILTER_MS ( 200 ) ///< Filter temperature data for given time #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 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. @@ -406,12 +405,10 @@ *************************************************************************/ static F32 getConvertedPressure( PRESSURE_SENSORS_T sensor, F32 pressure ) { - F32 pressurePSI = pressure * MMHG_TO_PSI_CONVERSION; - // calibrate pressure - //F32 calPressure = getCalibrationAppliedPressure( sensor, pressurePSI ); // TODO + //F32 calPressure = getCalibrationAppliedPressure( sensor, pressure ); // TODO - return pressurePSI; // calPressure; + return pressure; // calPressure; } /*********************************************************************//**