Index: firmware/App/Controllers/PresOccl.h =================================================================== diff -u -re64816def7cd98e7dcb6d133b3a56c9fea835af3 -r8bd1ae47aa13a843aa8abd6321ddc050deacb4a6 --- firmware/App/Controllers/PresOccl.h (.../PresOccl.h) (revision e64816def7cd98e7dcb6d133b3a56c9fea835af3) +++ firmware/App/Controllers/PresOccl.h (.../PresOccl.h) (revision 8bd1ae47aa13a843aa8abd6321ddc050deacb4a6) @@ -1,17 +1,17 @@ /************************************************************************** * -* Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. +* Copyright (c) 2019-2021 Diality Inc. - All Rights Reserved. * * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. * -* @file PresOccl.h +* @file PresOccl.h * -* @author (last) Sean Nash -* @date (last) 22-Sep-2020 +* @author (last) Sean Nash +* @date (last) 19-Aug-2021 * -* @author (original) Sean -* @date (original) 15-Jan-2020 +* @author (original) Sean +* @date (original) 15-Jan-2020 * ***************************************************************************/ @@ -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 ); /**@}*/