Index: firmware/App/Monitors/Pressure.c =================================================================== diff -u -r313982ccc772f1bbe182877dff7e00381b04e0f4 -r60165f6d155831cfce06560fb45abaaaadea9798 --- firmware/App/Monitors/Pressure.c (.../Pressure.c) (revision 313982ccc772f1bbe182877dff7e00381b04e0f4) +++ firmware/App/Monitors/Pressure.c (.../Pressure.c) (revision 60165f6d155831cfce06560fb45abaaaadea9798) @@ -29,8 +29,11 @@ // ********** private definitions ********** //TODO : Increasing the publish interval -#define PRESSURES_DATA_PUB_INTERVAL ( 250 / TASK_PRIORITY_INTERVAL ) ///< Interval (ms/task time) at which the pressures data is published on the CAN bus. -//#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. +#ifndef __OPENSPDTEST__ +#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. +#else +#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_TEMP_SAMPLE_FILTER_MS ( 50 ) @@ -488,13 +491,23 @@ data.d51Pressure = getFilteredPressure( D51_PRES ); data.d18Pressure = getFilteredPressure( D18_PRES ); data.d41Pressure = getFilteredPressure( D41_PRES ); +#ifndef __OPENSPDTEST__ data.m1PresTemp = getFilteredPressureSensorTemperature( M1_PRES ); data.m3PresTemp = getFilteredPressureSensorTemperature( M3_PRES ); data.d9PresTemp = getFilteredPressureSensorTemperature( D9_PRES ); data.d66PresTemp = getFilteredPressureSensorTemperature( D66_PRES ); data.d51PresTemp = getFilteredPressureSensorTemperature( D51_PRES ); data.d18PresTemp = getFilteredPressureSensorTemperature( D18_PRES ); data.d41PresTemp = getFilteredPressureSensorTemperature( D41_PRES ); +#else + data.m1PresTemp = getPressure( M1_PRES ); + data.m3PresTemp = getPressure( M3_PRES ); + data.d9PresTemp = getPressure( D9_PRES ); + data.d66PresTemp = getPressure( D66_PRES ); + data.d51PresTemp = getPressure( D51_PRES ); + data.d18PresTemp = getPressure( D18_PRES ); + data.d41PresTemp = getPressure( D41_PRES ); +#endif pressuresDataPublicationTimerCounter = 0; broadcastData( MSG_ID_DD_PRESSURES_DATA, COMM_BUFFER_OUT_CAN_DD_BROADCAST, (U08*)&data, sizeof( PRESSURE_TEMP_DATA_T ) );