Index: firmware/App/Controllers/PresOccl.h =================================================================== diff -u -rccfd15568f1e3d304320c2babb2fd4bcf0413304 -r8bd1ae47aa13a843aa8abd6321ddc050deacb4a6 --- firmware/App/Controllers/PresOccl.h (.../PresOccl.h) (revision ccfd15568f1e3d304320c2babb2fd4bcf0413304) +++ firmware/App/Controllers/PresOccl.h (.../PresOccl.h) (revision 8bd1ae47aa13a843aa8abd6321ddc050deacb4a6) @@ -67,17 +67,18 @@ void execPresOcclTest( void ); SELF_TEST_STATUS_T execPresOcclDryTest( void ); -F32 getMeasuredArterialPressure( void ); -F32 getMeasuredVenousPressure( void ); -U32 getMeasuredBloodPumpOcclusion( void ); -U32 getMeasuredDialInPumpOcclusion( void ); -U32 getMeasuredDialOutPumpOcclusion( void ); +F32 getMeasuredArterialPressure( void ); +F32 getFilteredArterialPressure( void ); +F32 getLongFilteredArterialPressure( void ); +F32 getMeasuredVenousPressure( void ); +F32 getFilteredVenousPressure( void ); +U32 getMeasuredBloodPumpOcclusion( void ); BOOL isCartridgeLoaded( void ); BOOL isCartridgeUnloaded( void ); BOOL isSalineBagEmpty( void ); -void setOcclusionInstallLevels( void ); +void setOcclusionInstallLevel( void ); BOOL testSetPresOcclDataPublishIntervalOverride( U32 value ); BOOL testResetPresOcclDataPublishIntervalOverride( void ); @@ -87,10 +88,8 @@ BOOL testResetVenousPressureOverride( void ); BOOL testSetBloodPumpOcclusionOverride( U32 value ); BOOL testResetBloodPumpOcclusionOverride( void ); -BOOL testSetDialInPumpOcclusionOverride( U32 value ); -BOOL testResetDialInPumpOcclusionOverride( void ); -BOOL testSetDialOutPumpOcclusionOverride( U32 value ); -BOOL testResetDialOutPumpOcclusionOverride( void ); +BOOL testSetArterialPressureOffsetOverride( F32 value ); +BOOL testResetArterialPressureOffsetOverride( void ); /**@}*/