Index: firmware/App/Controllers/PresOccl.h =================================================================== diff -u -rde5a0d43bdef611d963d11855bc958a8d8899a09 -rd9d085cdca67200ecddbdfbc75c489e704b23081 --- firmware/App/Controllers/PresOccl.h (.../PresOccl.h) (revision de5a0d43bdef611d963d11855bc958a8d8899a09) +++ firmware/App/Controllers/PresOccl.h (.../PresOccl.h) (revision d9d085cdca67200ecddbdfbc75c489e704b23081) @@ -34,18 +34,18 @@ /// 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 ********** @@ -58,11 +58,11 @@ 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 );