Index: firmware/App/Controllers/PresOccl.c =================================================================== diff -u -r2b05010319546ccc087214b4040c5f05283ce23d -r0bbdaa97de95dfcf090fae08bc88f2250e0e0c48 --- firmware/App/Controllers/PresOccl.c (.../PresOccl.c) (revision 2b05010319546ccc087214b4040c5f05283ce23d) +++ firmware/App/Controllers/PresOccl.c (.../PresOccl.c) (revision 0bbdaa97de95dfcf090fae08bc88f2250e0e0c48) @@ -7,8 +7,8 @@ * * @file PresOccl.c * -* @author (last) Sean Nash -* @date (last) 15-Aug-2023 +* @author (last) Michael Garthwaite +* @date (last) 28-Aug-2023 * * @author (original) Sean * @date (original) 15-Jan-2020 @@ -85,6 +85,7 @@ #define PSI_TO_MMHG ( 51.7149F ) ///< Conversion factor for converting PSI to mmHg. +// The new arterial pressure sensor is the same as the venous pressure sensor #define VENOUS_PRESSURE_NORMAL_OP 0 ///< Venous pressure status bits indicate normal operation. #define VENOUS_PRESSURE_CMD_MODE 1 ///< Venous pressure status bits indicate sensor in command mode. #define VENOUS_PRESSURE_STALE_DATA 2 ///< Venous pressure status bits indicate data is stale (no new data since last fpga read). @@ -169,9 +170,9 @@ static BOOL pressureLimitsActive; ///< Flag indicates whether arterial and venous pressure alarm limits are active. static U32 stabilizationStartTimeMs; ///< Timestamp taken when pressure limit stabilization began (ms). static F32 longFilteredArterialPressure; ///< Measured arterial pressure after long (10 s) filter. -static F32 shortFilteredArterialPressure; ///< Measured arterial pressure after short (1 s) filter. +static OVERRIDE_F32_T shortFilteredArterialPressure = { 0.0, 0.0, 0.0, 0 }; ///< Measured arterial pressure after short (1 s) filter. static F32 longFilteredVenousPressure; ///< Measured venous pressure after long (10 s) filter. -static F32 shortFilteredVenousPressure; ///< Measured venous pressure after short (1 s) filter. +static OVERRIDE_F32_T shortFilteredVenousPressure = { 0.0, 0.0, 0.0, 0 }; ///< Measured venous pressure after short (1 s) filter. static BOOL useShortStabilizeTime; ///< Flag to use short stabilize time. static U32 bloodPumpOcclusionAfterCartridgeInstall; ///< Measured blood pump occlusion reading taken after cartridge install. @@ -253,9 +254,9 @@ venLowPresExemptAfterAirTrapFillTimerCtr = 0; resetArtVenPressureOffsets(); longFilteredArterialPressure = 0.0F; - shortFilteredArterialPressure = 0.0F; + shortFilteredArterialPressure.data = 0.0F; longFilteredVenousPressure = 0.0F; - shortFilteredVenousPressure = 0.0F; + shortFilteredVenousPressure.data = 0.0F; presOcclDataPublicationTimerCounter = DATA_PUBLISH_COUNTER_START_COUNT; presOcclState = PRESSURE_WAIT_FOR_POST_STATE; presOcclPostState = PRESSURE_SELF_TEST_STATE_START; @@ -423,8 +424,8 @@ } else { - F32 filtArt = getLongFilteredArterialPressure(); - F32 filtVen = getLongFilteredVenousPressure(); + filtArt = getLongFilteredArterialPressure(); + filtVen = getLongFilteredVenousPressure(); } curArtPres = FLOAT_TO_INT_WITH_ROUND( filtArt ); @@ -926,7 +927,6 @@ } } } - // Check for occlusion in Treatment modes where pumps are moving else if ( MODE_TREA == getCurrentOperationMode() ) { @@ -1002,7 +1002,7 @@ *************************************************************************/ F32 getFilteredArterialPressure( void ) { - return shortFilteredArterialPressure; + return getF32OverrideValue( &shortFilteredArterialPressure ); } /*********************************************************************//** @@ -1045,7 +1045,7 @@ *************************************************************************/ F32 getFilteredVenousPressure( void ) { - return shortFilteredVenousPressure; + return getF32OverrideValue( &shortFilteredVenousPressure ); } /*********************************************************************//** @@ -1116,7 +1116,7 @@ artPressureReadingsShortTotal += artPres; artPressureReadingsShortIdx = INC_WRAP( artPressureReadingsShortIdx, 0, SIZE_OF_SHORT_ART_ROLLING_AVG - 1 ); artPressureReadingsShortCount = INC_CAP( artPressureReadingsShortCount, SIZE_OF_SHORT_ART_ROLLING_AVG ); - shortFilteredArterialPressure = artPressureReadingsShortTotal / (F32)artPressureReadingsShortCount; + shortFilteredArterialPressure.data = artPressureReadingsShortTotal / (F32)artPressureReadingsShortCount; // Long filter for venous pressure. if ( venPressureReadingsLongCount >= SIZE_OF_LONG_VEN_ROLLING_AVG ) @@ -1138,7 +1138,7 @@ venPressureReadingsShortTotal += venPres; venPressureReadingsShortIdx = INC_WRAP( venPressureReadingsShortIdx, 0, SIZE_OF_SHORT_VEN_ROLLING_AVG - 1 ); venPressureReadingsShortCount = INC_CAP( artPressureReadingsShortCount, SIZE_OF_SHORT_VEN_ROLLING_AVG ); - shortFilteredVenousPressure = venPressureReadingsShortTotal / (F32)venPressureReadingsShortCount; + shortFilteredVenousPressure.data = venPressureReadingsShortTotal / (F32)venPressureReadingsShortCount; } /*********************************************************************//** @@ -1156,8 +1156,8 @@ { PRESSURE_OCCLUSION_DATA_T data; - data.arterialPressure = shortFilteredArterialPressure; - data.venousPressure = shortFilteredVenousPressure; + data.arterialPressure = getFilteredArterialPressure(); + data.venousPressure = getFilteredVenousPressure(); data.bldPumpOcclusion = getMeasuredBloodPumpOcclusion(); data.presLimitState = currPresLimitsState; data.artMinLimit = currentArterialMinLimit; @@ -1324,19 +1324,28 @@ * The testSetArterialPressureOverride function overrides the measured arterial * pressure. * @details Inputs: none - * @details Outputs: arterialPressure + * @details Outputs: arterialPressure, shortFilteredArterialPressure * @param value override arterial pressure (in mmHg) + * @param filtered override filtered value or raw value * @return TRUE if override successful, FALSE if not *************************************************************************/ -BOOL testSetArterialPressureOverride( F32 value ) +BOOL testSetArterialPressureOverride( F32 value, BOOL filtered ) { BOOL result = FALSE; if ( TRUE == isTestingActivated() ) { result = TRUE; - arterialPressure.ovData = value; - arterialPressure.override = OVERRIDE_KEY; + if ( FALSE == filtered ) + { + arterialPressure.ovData = value; + arterialPressure.override = OVERRIDE_KEY; + } + else + { + shortFilteredArterialPressure.ovData = value; + shortFilteredArterialPressure.override = OVERRIDE_KEY; + } } return result; @@ -1347,18 +1356,26 @@ * The testResetArterialPressureOverride function resets the override of the * arterial pressure. * @details Inputs: none - * @details Outputs: arterialPressure + * @details Outputs: arterialPressure, shortFilteredArterialPressure * @return TRUE if reset successful, FALSE if not *************************************************************************/ -BOOL testResetArterialPressureOverride( void ) +BOOL testResetArterialPressureOverride( BOOL filtered ) { BOOL result = FALSE; if ( TRUE == isTestingActivated() ) { result = TRUE; - arterialPressure.override = OVERRIDE_RESET; - arterialPressure.ovData = arterialPressure.ovInitData; + if ( FALSE == filtered ) + { + arterialPressure.override = OVERRIDE_RESET; + arterialPressure.ovData = arterialPressure.ovInitData; + } + else + { + shortFilteredArterialPressure.override = OVERRIDE_RESET; + shortFilteredArterialPressure.ovData = shortFilteredArterialPressure.ovInitData; + } } return result; @@ -1369,19 +1386,28 @@ * The testSetVenousPressureOverride function overrides the measured venous * pressure. * @details Inputs: none - * @details Outputs: venousPressure + * @details Outputs: venousPressure, shortFilteredVenousPressure * @param value override measured venous pressure with (in mmHg) + * @param filtered override filtered value or raw value * @return TRUE if override successful, FALSE if not *************************************************************************/ -BOOL testSetVenousPressureOverride( F32 value ) +BOOL testSetVenousPressureOverride( F32 value, BOOL filtered ) { BOOL result = FALSE; if ( TRUE == isTestingActivated() ) { result = TRUE; - venousPressure.ovData = value; - venousPressure.override = OVERRIDE_KEY; + if ( FALSE == filtered ) + { + venousPressure.ovData = value; + venousPressure.override = OVERRIDE_KEY; + } + else + { + shortFilteredVenousPressure.ovData = value; + shortFilteredVenousPressure.override = OVERRIDE_KEY; + } } return result; @@ -1392,18 +1418,26 @@ * The testResetVenousPressureOverride function resets the override of the * venous pressure. * @details Inputs: none - * @details Outputs: venousPressure + * @details Outputs: venousPressure, shortFilteredVenousPressure * @return TRUE if reset successful, FALSE if not *************************************************************************/ -BOOL testResetVenousPressureOverride( void ) +BOOL testResetVenousPressureOverride( BOOL filtered ) { BOOL result = FALSE; if ( TRUE == isTestingActivated() ) { result = TRUE; - venousPressure.override = OVERRIDE_RESET; - venousPressure.ovData = venousPressure.ovInitData; + if ( FALSE == filtered ) + { + venousPressure.override = OVERRIDE_RESET; + venousPressure.ovData = venousPressure.ovInitData; + } + else + { + shortFilteredVenousPressure.override = OVERRIDE_RESET; + shortFilteredVenousPressure.ovData = shortFilteredVenousPressure.ovInitData; + } } return result;