Index: firmware/App/Controllers/PresOccl.h =================================================================== diff -u -r14be978c00cef299cf67b515117b689de6cef353 -rf10e393f3d4c017d7e6f252b6ee203042ea5ee67 --- firmware/App/Controllers/PresOccl.h (.../PresOccl.h) (revision 14be978c00cef299cf67b515117b689de6cef353) +++ firmware/App/Controllers/PresOccl.h (.../PresOccl.h) (revision f10e393f3d4c017d7e6f252b6ee203042ea5ee67) @@ -74,8 +74,8 @@ S32 venMaxLimit; ///< Current venous maximum pressure limit (mmHg) F32 arterialLongFilterPres; ///< Latest long filtered arterial pressure (mmHg) F32 venousLongFilterPres; ///< Latest long filtered venous pressure (mmHg) - U32 filteredbldPumpOcclusion; ///< Latest filtered BP occlusion (no units) - U32 partialOcclBaseline; ///< PartialBloodPump Occlusion baseline (no units) + F32 bldPumpOcclusionLongFilter; ///< Latest long filtered BP occlusion (no units) + F32 partialOcclBaseline; ///< PartialBloodPump Occlusion baseline (no units) } PRESSURE_OCCLUSION_DATA_T; // ********** public function prototypes ********** @@ -101,9 +101,9 @@ F32 getFilteredVenousPressure( void ); F32 getLongFilteredVenousPressure( void ); U32 getMeasuredBloodPumpOcclusion( void ); -U32 getFilteredBloodPumpOccl( void ); -void signalBloodPumpPressureOcclbaseline( void ); - +F32 getFilteredBloodPumpOccl( void ); +void signalBloodPumpPressureOcclBaseline( void ); +F32 getBloodPumpPartialOcclBaseline( void ); BOOL isCartridgeLoaded( void ); BOOL isCartridgeUnloaded( void ); BOOL isSalineBagEmpty( void ); @@ -120,8 +120,10 @@ BOOL testResetVenousPressureOverride( BOOL filtered ); BOOL testSetBloodPumpOcclusionOverride( U32 value ); BOOL testResetBloodPumpOcclusionOverride( void ); -BOOL testSetFilteredBloodPumpOcclusionOverride( U32 value ); +BOOL testSetFilteredBloodPumpOcclusionOverride( F32 value ); BOOL testResetFilteredBloodPumpOcclusionOverride( void ); +BOOL testSetBloodPumpPartialOcclusionBaselineOverride( F32 value ); +BOOL testResetBloodPumpPartialOcclusionBaselineOverride( void ); /**@}*/