Index: firmware/App/Monitors/Pressure.c =================================================================== diff -u -r60165f6d155831cfce06560fb45abaaaadea9798 -re0fc678329b0cb25dd76fa5e23cc1f487851f0ec --- firmware/App/Monitors/Pressure.c (.../Pressure.c) (revision 60165f6d155831cfce06560fb45abaaaadea9798) +++ firmware/App/Monitors/Pressure.c (.../Pressure.c) (revision e0fc678329b0cb25dd76fa5e23cc1f487851f0ec) @@ -35,14 +35,14 @@ #define PRESSURES_DATA_PUB_INTERVAL ( 50 / TASK_PRIORITY_INTERVAL ) ///< Interval (ms/task time) at which the pressures data is published on the CAN bus. #endif #define DATA_PUBLISH_COUNTER_START_COUNT ( 5 ) ///< Data publish counter start count. -#define PRESSURE_SAMPLE_FILTER_MS ( 50 ) ///< Filter pressure data for given time +#define PRESSURE_SAMPLE_FILTER_MS ( 50 ) ///< Filter pressure data for given time #define PRESSURE_TEMP_SAMPLE_FILTER_MS ( 50 ) -//#define PRESSURE_SAMPLE_FILTER_MS ( 200 ) ///< Filter pressure data for given time -//#define PRESSURE_TEMP_SAMPLE_FILTER_MS ( 200 ) ///< Filter temperature data for given time +//#define PRESSURE_SAMPLE_FILTER_MS ( 200 ) ///< Filter pressure data for given time +//#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 BAR_TO_PSI_CONVERSION 14.5038F ///< 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. @@ -500,11 +500,11 @@ data.d18PresTemp = getFilteredPressureSensorTemperature( D18_PRES ); data.d41PresTemp = getFilteredPressureSensorTemperature( D41_PRES ); #else - data.m1PresTemp = getPressure( M1_PRES ); - data.m3PresTemp = getPressure( M3_PRES ); + data.m1PresTemp = (F32)getPressureSensorErrorCount( D9_PRES ); + data.m3PresTemp = (F32)getPressureSensorReadCount( D9_PRES ); data.d9PresTemp = getPressure( D9_PRES ); - data.d66PresTemp = getPressure( D66_PRES ); - data.d51PresTemp = getPressure( D51_PRES ); + data.d66PresTemp = (F32)getPressureSensorErrorCount( D18_PRES ); + data.d51PresTemp = (F32)getPressureSensorReadCount( D18_PRES ); data.d18PresTemp = getPressure( D18_PRES ); data.d41PresTemp = getPressure( D41_PRES ); #endif