Index: firmware/App/Monitors/Pressure.c =================================================================== diff -u -r36138f58fce627fb63e4bcfc4607c24bf541d45a -re228885d4b066320c69bbec2553b5e7fc62ec2cb --- firmware/App/Monitors/Pressure.c (.../Pressure.c) (revision 36138f58fce627fb63e4bcfc4607c24bf541d45a) +++ firmware/App/Monitors/Pressure.c (.../Pressure.c) (revision e228885d4b066320c69bbec2553b5e7fc62ec2cb) @@ -27,10 +27,12 @@ // ********** private definitions ********** -#define PRESSURES_DATA_PUB_INTERVAL ( MS_PER_SECOND / TASK_PRIORITY_INTERVAL ) ///< Interval (ms/task time) at which the pressures data is published on the CAN bus. -#define DATA_PUBLISH_COUNTER_START_COUNT ( 5 ) ///< Data publish counter start count. -#define SIZE_OF_PRESSURE_ROLLING_AVG ( ( MS_PER_SECOND / TASK_PRIORITY_INTERVAL ) * 1 ) ///< Filtered pressure w/ 1 second moving average. -#define SIZE_OF_PRESSURETEMP_ROLLING_AVG ( ( MS_PER_SECOND / TASK_PRIORITY_INTERVAL ) * 1 ) ///< Filtered pressure temprature w/ 1 second moving average. +#define PRESSURES_DATA_PUB_INTERVAL ( MS_PER_SECOND / TASK_PRIORITY_INTERVAL ) ///< Interval (ms/task time) at which the pressures data is published on the CAN bus. +#define DATA_PUBLISH_COUNTER_START_COUNT ( 5 ) ///< Data publish counter start count. +#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. /// Defined states for the pressures monitor state machine. typedef enum PresMonitor_States @@ -348,7 +350,7 @@ /*********************************************************************//** * @brief - * The testPressureSensnorDataPublishIntervalOverride function overrides the + * The testPressureSensorDataPublishIntervalOverride function overrides the * pressure sensor data publish interval. * @details \b Inputs: none * @details \b Outputs: pressuresDataPublishInterval