Index: firmware/App/Controllers/PresOccl.h =================================================================== diff -u -r727f30438c094ec62abe1fad1f5a8962cd304a4d -rcd5be724d5a3ba7457e761191d82f278654d7f5c --- firmware/App/Controllers/PresOccl.h (.../PresOccl.h) (revision 727f30438c094ec62abe1fad1f5a8962cd304a4d) +++ firmware/App/Controllers/PresOccl.h (.../PresOccl.h) (revision cd5be724d5a3ba7457e761191d82f278654d7f5c) @@ -1,14 +1,14 @@ /************************************************************************** * -* Copyright (c) 2020-2023 Diality Inc. - All Rights Reserved. +* Copyright (c) 2020-2024 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 * * @author (last) Sean Nash -* @date (last) 18-Jul-2023 +* @date (last) 31-Aug-2023 * * @author (original) Sean * @date (original) 15-Jan-2020 @@ -32,6 +32,9 @@ // ********** public definitions ********** +#define USE_NORMAL_STABILIZATION_PERIOD FALSE +#define USE_SHORT_STABILIZATION_PERIOD TRUE + /// Enumeration of pressure sensors monitored by this module. typedef enum PressureSensors { @@ -40,15 +43,6 @@ 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_SENSORS_T; - /// Enumeration of arterial/venous pressure limits states. typedef enum PressureLimitsStates { @@ -86,7 +80,7 @@ void setPressureLimitsToOuterBounds( void ); void updatePressureLimitWindows( void ); -void signalInitiatePressureStabilization( void ); +void signalInitiatePressureStabilization( BOOL useShort ); void resetArtVenPressureOffsets( void ); void setArtVenPressureOffsets( void ); @@ -107,10 +101,10 @@ BOOL testSetPresOcclDataPublishIntervalOverride( U32 value ); BOOL testResetPresOcclDataPublishIntervalOverride( void ); -BOOL testSetArterialPressureOverride( F32 value ); -BOOL testResetArterialPressureOverride( void ); -BOOL testSetVenousPressureOverride( F32 value ); -BOOL testResetVenousPressureOverride( void ); +BOOL testSetArterialPressureOverride( F32 value, BOOL filtered ); +BOOL testResetArterialPressureOverride( BOOL filtered ); +BOOL testSetVenousPressureOverride( F32 value, BOOL filtered ); +BOOL testResetVenousPressureOverride( BOOL filtered ); BOOL testSetBloodPumpOcclusionOverride( U32 value ); BOOL testResetBloodPumpOcclusionOverride( void );