Index: firmware/App/Monitors/Pressure.c =================================================================== diff -u -rc85d9f0a8023fabdf1cd557965958d225e2b9085 -r5126b79e4970ffe2ed9db4cccea18a1216c78570 --- firmware/App/Monitors/Pressure.c (.../Pressure.c) (revision c85d9f0a8023fabdf1cd557965958d225e2b9085) +++ firmware/App/Monitors/Pressure.c (.../Pressure.c) (revision 5126b79e4970ffe2ed9db4cccea18a1216c78570) @@ -15,27 +15,30 @@ * ***************************************************************************/ -#include "AlarmMgmtDD.h" +#include "AlarmMgmtDD.h" #include "Messaging.h" #include "Pressure.h" #include "PersistentAlarm.h" #include "TaskPriority.h" -#include "Valves.h" - -/** - * @addtogroup Pressure - * @{ - */ - -// ********** private definitions ********** +#include "Valves.h" +/** + * @addtogroup Pressure + * @{ + */ + +// ********** private definitions ********** +//TODO : Increasing the publish interval #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 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 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 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. @@ -74,9 +77,9 @@ F32 pressureTempReadingsTotal; ///< Rolling total - used to calc average. U32 pressureTempReadingsCount; ///< Number of samples in rolling average buffer }FILTER_PRESSURE_TEMPERATURE_READINGS_T; - -// ********** private data ********** +// ********** private data ********** + static OVERRIDE_F32_T filteredcurrentPressureReadings[ NUM_OF_PRESSURE_SENSORS ]; ///< filtered current pressure sensor pressure readings (overrideable). static OVERRIDE_F32_T filteredcurrentPresTempReadings[ NUM_OF_PRESSURE_SENSORS ]; ///< filtered current pressure sensor temperature readings (overrideable). //static DD_PRES_SENSORS_CAL_RECORD_T pressuresCalRecord; ///< Pressures calibration record. @@ -86,10 +89,10 @@ static PRESSURE_STATE_T pressuresState; ///< current state of pressure monitor state machine. static U32 pressuresDataPublicationTimerCounter; ///< used to schedule pressure data publication to CAN bus. static OVERRIDE_U32_T pressuresDataPublishInterval = { PRESSURES_DATA_PUB_INTERVAL, - PRESSURES_DATA_PUB_INTERVAL, 0, 0 }; ///< Pressure data publish interval. - -// ********** private function prototypes ********** + PRESSURES_DATA_PUB_INTERVAL, 0, 0 }; ///< Pressure data publish interval. +// ********** private function prototypes ********** + static void filterPressureSensorReadings( void ); static void filterPressureSensorTemperatureReadings( void ); //static F32 getCalibrationAppliedPressure( U08 sensorId, F32 pressure ); @@ -235,11 +238,11 @@ *************************************************************************/ void checkInletWaterPressure( void ) { - F32 pressureIn = getFilteredPressure( PRESSURE_SENSOR_WATER_INLET_INPUT ); - F32 PressureOut = getFilteredPressure( PRESSURE_SENSOR_WATER_INLET_OUTPUT ); + F32 pressureIn = getFilteredPressure( M1_PRES ); + F32 PressureOut = getFilteredPressure( M3_PRES ); //Check Water Inlet Input pressure range - if ( VALVE_STATE_OPEN == getValveStateName( VWI ) ) + if ( VALVE_STATE_OPEN == getValveStateName( M4_VALV ) ) { BOOL isPressureTooLow; BOOL isPressureTooHigh; @@ -263,13 +266,13 @@ } else { - // VWI is closed - clear all alarms + // M4_VALV is closed - clear all alarms checkPersistentAlarm( ALARM_ID_DD_INLET_WATER_PRESSURE_IN_LOW_RANGE, FALSE, pressureIn, MIN_INLET_WATER_PRESSURE_WARNING_LOW_PSIG ); checkPersistentAlarm( ALARM_ID_DD_INLET_WATER_PRESSURE_IN_HIGH_RANGE, FALSE, pressureIn, MAX_INLET_WATER_PRESSURE_WARNING_HIGH_PSIG ); } //Check Water Inlet Output pressure range - if ( VALVE_STATE_OPEN == getValveStateName( VWI ) ) + if ( VALVE_STATE_OPEN == getValveStateName( M4_VALV ) ) { BOOL isPressureTooLow; BOOL isPressureTooHigh; @@ -293,42 +296,42 @@ } else { - // VWI is closed - clear all alarms + // M4_VALV is closed - clear all alarms checkPersistentAlarm( ALARM_ID_DD_INLET_WATER_PRESSURE_OUT_LOW_RANGE, FALSE, PressureOut, MIN_INLET_WATER_PRES_OUT_WARNING_LOW_PSIG ); checkPersistentAlarm( ALARM_ID_DD_INLET_WATER_PRESSURE_OUT_HIGH_RANGE, FALSE, PressureOut, MAX_INLET_WATER_PRES_OUT_WARNING_HIGH_PSIG ); } } - -/*********************************************************************//** - * @brief + +/*********************************************************************//** + * @brief * The execPressureSensor function executes the pressure monitor state machine - * and publish pressure data. - * @details \b Inputs: pressuresState + * and publish pressure data. + * @details \b Inputs: pressuresState * @details \b Outputs: pressuresState - * @details \b Alarm: ALARM_ID_DD_SOFTWARE_FAULT if invalid pressure state seen - * @return none - *************************************************************************/ -void execPressureSensor( void ) -{ - // state machine - switch ( pressuresState ) - { - case PRESSURE_INIT_STATE: - pressuresState = handlePressuresInitState(); - break; - - case PRESSURE_CONTINUOUS_READ_STATE: - pressuresState = handlePressuresContReadState(); - break; - - default: + * @details \b Alarm: ALARM_ID_DD_SOFTWARE_FAULT if invalid pressure state seen + * @return none + *************************************************************************/ +void execPressureSensor( void ) +{ + // state machine + switch ( pressuresState ) + { + case PRESSURE_INIT_STATE: + pressuresState = handlePressuresInitState(); + break; + + case PRESSURE_CONTINUOUS_READ_STATE: + pressuresState = handlePressuresContReadState(); + break; + + default: SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DD_SOFTWARE_FAULT, SW_FAULT_ID_PRESSURE_INVALID_EXEC_STATE, pressuresState ) - pressuresState = PRESSURE_INIT_STATE; - break; - } - - // publish pressure/occlusion data on interval - publishPressuresData(); + pressuresState = PRESSURE_INIT_STATE; + break; + } + + // publish pressure/occlusion data on interval + publishPressuresData(); } /*********************************************************************//** @@ -341,12 +344,12 @@ *************************************************************************/ static void filterPressureSensorReadings( void ) { - U32 i; + PRESSURE_SENSORS_T i; - for ( i = (U32)PRESSURE_SENSOR_FIRST; i < (U32)NUM_OF_PRESSURE_SENSORS; i++ ) + for ( i = PRESSURE_SENSOR_FIRST; i < NUM_OF_PRESSURE_SENSORS; i++ ) { - F32 pressureinmmHG = getPressure( (PRESSURE_SENSORS_T)i ); - F32 pressure = getConvertedPressure( (PRESSURE_SENSORS_T)i, pressureinmmHG ); + F32 pressureinPSI = getPressure( i ); + F32 pressure = getConvertedPressure( i, pressureinPSI ); if ( filteredPressureReadings[i].pressureReadingsCount >= SIZE_OF_PRESSURE_ROLLING_AVG ) { @@ -370,11 +373,11 @@ *************************************************************************/ static void filterPressureSensorTemperatureReadings( void ) { - U32 i; + PRESSURE_SENSORS_T i; - for ( i = (U32)PRESSURE_SENSOR_FIRST; i < (U32)NUM_OF_PRESSURE_SENSORS; i++ ) + for ( i = PRESSURE_SENSOR_FIRST; i < NUM_OF_PRESSURE_SENSORS; i++ ) { - F32 pressureTemperature = getPressureSensorTemperature( (PRESSURE_SENSORS_T)i ); + F32 pressureTemperature = getPressureSensorTemperature( i ); if ( filteredPressureTempReadings[i].pressureTempReadingsCount >= SIZE_OF_PRESSURETEMP_ROLLING_AVG ) { @@ -400,13 +403,13 @@ *************************************************************************/ static F32 getConvertedPressure( PRESSURE_SENSORS_T sensor, F32 pressure ) { - F32 baroPressurePSI = getPressure( PRESSURE_SENSOR_BAROMETRIC ) * MMHG_TO_PSI_CONVERSION; - F32 pressurePSI = pressure * MMHG_TO_PSI_CONVERSION; + F32 baroPressurePSI = getPressure( BARO_PRES ) * MMHG_TO_PSI_CONVERSION; // calibrated pressure - //F32 calPressure = getCalibrationAppliedPressure( sensor, pressurePSI ); + //F32 calPressure = getCalibrationAppliedPressure( sensor, pressure ); - return pressurePSI; + return pressure; + //return calPressure; } /*********************************************************************//** @@ -428,81 +431,81 @@ // pressuresCalRecord.pressureSensors[ (PRESSURE_SENSORS_T)sensorId ].offset; // return calPressure; //} - -/*********************************************************************//** - * @brief - * The handlePressuresInitState function handles the pressures initialize state - * of the pressures monitor state machine. - * @details \b Inputs: none - * @details \b Outputs: none - * @return next state - *************************************************************************/ -static PRESSURE_STATE_T handlePressuresInitState( void ) -{ - return PRESSURE_CONTINUOUS_READ_STATE; -} - -/*********************************************************************//** - * @brief - * The handlePressuresContReadState function handles the continuous read state - * of the pressures monitor state machine. - * @details \b Inputs: pressureFilterCounter - * @details \b Outputs: pressure sensor values updated - * @return next state - *************************************************************************/ -static PRESSURE_STATE_T handlePressuresContReadState( void ) + +/*********************************************************************//** + * @brief + * The handlePressuresInitState function handles the pressures initialize state + * of the pressures monitor state machine. + * @details \b Inputs: none + * @details \b Outputs: none + * @return next state + *************************************************************************/ +static PRESSURE_STATE_T handlePressuresInitState( void ) { + return PRESSURE_CONTINUOUS_READ_STATE; +} + +/*********************************************************************//** + * @brief + * The handlePressuresContReadState function handles the continuous read state + * of the pressures monitor state machine. + * @details \b Inputs: pressureFilterCounter + * @details \b Outputs: pressure sensor values updated + * @return next state + *************************************************************************/ +static PRESSURE_STATE_T handlePressuresContReadState( void ) +{ PRESSURE_STATE_T result = PRESSURE_CONTINUOUS_READ_STATE; //Get raw pressure value readPressureSensors(); // filter pressure readings - filterPressureSensors(); - - return result; + filterPressureSensors(); + + return result; } -/*********************************************************************//** - * @brief - * The publishPressuresData function publishes DD pressures data at a set interval. - * @details \b Inputs: pressuresDataPublicationTimerCounter +/*********************************************************************//** + * @brief + * The publishPressuresData function publishes DD pressures data at a set interval. + * @details \b Inputs: pressuresDataPublicationTimerCounter * @details \b Outputs: pressuresDataPublicationTimerCounter - * @details \b Message \b Sent: MSG_ID_DD_PRESSURES_DATA to publish pressure data. - * @return none - *************************************************************************/ -static void publishPressuresData( void ) -{ - // publish pressure/occlusion data on interval - if ( ++pressuresDataPublicationTimerCounter >= getU32OverrideValue( &pressuresDataPublishInterval ) ) + * @details \b Message \b Sent: MSG_ID_DD_PRESSURES_DATA to publish pressure data. + * @return none + *************************************************************************/ +static void publishPressuresData( void ) +{ + // publish pressure/occlusion data on interval + if ( ++pressuresDataPublicationTimerCounter >= getU32OverrideValue( &pressuresDataPublishInterval ) ) { PRESSURE_TEMP_DATA_T data; - data.filteredWaterInletInputPressure = getFilteredPressure( PRESSURE_SENSOR_WATER_INLET_INPUT ); - data.filteredWaterInletOutputPressure = getFilteredPressure( PRESSURE_SENSOR_WATER_INLET_OUTPUT ); - data.filteredHydraulicsOutletPressure = getFilteredPressure( PRESSURE_SENSOR_HYDRAULICS_OUTLET ); - data.filteredBibagPressure = getFilteredPressure( PRESSURE_SENSOR_BIBAG ); - data.filteredSpentdialysatePressure = getFilteredPressure( PRESSURE_SENSOR_SPENT_DIALYSATE ); - data.filteredFreshdialysatePressure = getFilteredPressure( PRESSURE_SENSOR_FRESH_DIALYSATE ); - data.filteredTransmembranePressure = getFilteredPressure( PRESSURE_SENSOR_TRANSMEMBRANE ); - data.filteredWaterInletInputTemp = getFilteredPressureSensorTemperature( PRESSURE_SENSOR_WATER_INLET_INPUT ); - data.filteredWaterInletOutputTemp = getFilteredPressureSensorTemperature( PRESSURE_SENSOR_WATER_INLET_OUTPUT ); - data.filteredHydraulicsOutletTemp = getFilteredPressureSensorTemperature( PRESSURE_SENSOR_HYDRAULICS_OUTLET ); - data.filteredBibagTemp = getFilteredPressureSensorTemperature( PRESSURE_SENSOR_BIBAG ); - data.filteredSpentdialysateTemp = getFilteredPressureSensorTemperature( PRESSURE_SENSOR_SPENT_DIALYSATE ); - data.filteredFreshdialysateTemp = getFilteredPressureSensorTemperature( PRESSURE_SENSOR_FRESH_DIALYSATE ); - data.filteredTransmembraneTemp = getFilteredPressureSensorTemperature( PRESSURE_SENSOR_TRANSMEMBRANE ); - pressuresDataPublicationTimerCounter = 0; - - broadcastData( MSG_ID_DD_PRESSURES_DATA, COMM_BUFFER_OUT_CAN_DD_BROADCAST, (U08*)&data, sizeof( PRESSURE_TEMP_DATA_T ) ); - } -} - - -/************************************************************************* - * TEST SUPPORT FUNCTIONS - *************************************************************************/ + data.m1Pressure = getFilteredPressure( M1_PRES ); + data.m3Pressure = getFilteredPressure( M3_PRES ); + data.d9Pressure = getFilteredPressure( D9_PRES ); + data.d66Pressure = getFilteredPressure( D66_PRES ); + data.d51Pressure = getFilteredPressure( D51_PRES ); + data.d18Pressure = getFilteredPressure( D18_PRES ); + data.d41Pressure = getFilteredPressure( D41_PRES ); + 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 ); + pressuresDataPublicationTimerCounter = 0; + broadcastData( MSG_ID_DD_PRESSURES_DATA, COMM_BUFFER_OUT_CAN_DD_BROADCAST, (U08*)&data, sizeof( PRESSURE_TEMP_DATA_T ) ); + } +} + +/************************************************************************* + * TEST SUPPORT FUNCTIONS + *************************************************************************/ + + /*********************************************************************//** * @brief * The testPressureSensorDataPublishIntervalOverride function overrides the @@ -553,5 +556,5 @@ return result; } - -/**@}*/ + +/**@}*/