Index: firmware/App/Controllers/PresOccl.h =================================================================== diff -u -rde5a0d43bdef611d963d11855bc958a8d8899a09 -r1a685471524555a374854c0c9ec8e208e71fe2df --- firmware/App/Controllers/PresOccl.h (.../PresOccl.h) (revision de5a0d43bdef611d963d11855bc958a8d8899a09) +++ firmware/App/Controllers/PresOccl.h (.../PresOccl.h) (revision 1a685471524555a374854c0c9ec8e208e71fe2df) @@ -7,8 +7,8 @@ * * @file PresOccl.h * -* @author (last) Sean -* @date (last) 27-Feb-2020 +* @author (last) Sean Nash +* @date (last) 22-Sep-2020 * * @author (original) Sean * @date (original) 15-Jan-2020 @@ -34,35 +34,34 @@ /// Enumeration of pressure sensors monitored by this module. typedef enum PressureSensors { - PRESSURE_SENSOR_ARTERIAL = 0, ///< arterial blood line pressure sensor. - PRESSURE_SENSOR_VENOUS, ///< vensous blood line pressure sensor. - NUM_OF_PRESSURE_SENSORS ///< Number of pressure sensors. + PRESSURE_SENSOR_ARTERIAL = 0, ///< arterial blood line pressure sensor + PRESSURE_SENSOR_VENOUS, ///< vensous blood line pressure sensor + NUM_OF_PRESSURE_SENSORS ///< Number of pressure sensors } PRESSURE_SENSORS_T; /// Enumeration of occlusion sensors monitored by this module. typedef enum OcclusionSensors { - OCCLUSION_SENSOR_BLOOD_PUMP = 0, ///< blood pump occlusion sensor. - OCCLUSION_SENSOR_DIAL_IN_PUMP, ///< dialysate inlet pump occlusion sensor. - OCCLUSION_SENSOR_DIAL_OUT_PUMP, ///< dialysate outlet pump occlusion sensor. - NUM_OF_OCCLUSION_SENSORS ///< Number of occlusion sensors. + OCCLUSION_SENSOR_BLOOD_PUMP = 0, ///< blood pump occlusion sensor + OCCLUSION_SENSOR_DIAL_IN_PUMP, ///< dialysate inlet pump occlusion sensor + OCCLUSION_SENSOR_DIAL_OUT_PUMP, ///< dialysate outlet pump occlusion sensor + NUM_OF_OCCLUSION_SENSORS ///< Number of occlusion sensors } OCCLUSION_SENSORS_T; // ********** public function prototypes ********** void initPresOccl( void ); void execPresOccl( void ); -void setPressureLimits( PRESSURE_SENSORS_T sensor, F32 low, F32 high ); void setOcclusionThreshold( OCCLUSION_SENSORS_T sensor, F32 threshold ); SELF_TEST_STATUS_T execPresOcclTest( void ); -DATA_GET_PROTOTYPE( F32, getMeasuredArterialPressure ); -DATA_GET_PROTOTYPE( F32, getMeasuredVenousPressure); -DATA_GET_PROTOTYPE( F32, getMeasuredBloodPumpOcclusion ); -DATA_GET_PROTOTYPE( F32, getMeasuredDialInPumpOcclusion ); -DATA_GET_PROTOTYPE( F32, getMeasuredDialOutPumpOcclusion ); +F32 getMeasuredArterialPressure( void ); +F32 getMeasuredVenousPressure( void ); +F32 getMeasuredBloodPumpOcclusion( void ); +F32 getMeasuredDialInPumpOcclusion( void ); +F32 getMeasuredDialOutPumpOcclusion( void ); BOOL testSetPresOcclDataPublishIntervalOverride( U32 value ); BOOL testResetPresOcclDataPublishIntervalOverride( void );