Index: firmware/App/Monitors/Pressure.c =================================================================== diff -u -re0fc678329b0cb25dd76fa5e23cc1f487851f0ec -r5126b79e4970ffe2ed9db4cccea18a1216c78570 --- firmware/App/Monitors/Pressure.c (.../Pressure.c) (revision e0fc678329b0cb25dd76fa5e23cc1f487851f0ec) +++ firmware/App/Monitors/Pressure.c (.../Pressure.c) (revision 5126b79e4970ffe2ed9db4cccea18a1216c78570) @@ -29,11 +29,7 @@ // ********** private definitions ********** //TODO : Increasing the publish interval -#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 ) @@ -491,23 +487,13 @@ 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 = (F32)getPressureSensorErrorCount( D9_PRES ); - data.m3PresTemp = (F32)getPressureSensorReadCount( D9_PRES ); - data.d9PresTemp = getPressure( D9_PRES ); - data.d66PresTemp = (F32)getPressureSensorErrorCount( D18_PRES ); - data.d51PresTemp = (F32)getPressureSensorReadCount( D18_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 ) );