Index: firmware/App/Controllers/PresOccl.c =================================================================== diff -u -rf0c16ca7223ad48b7bdb86b8f010b74b550c0051 -rf5d1bb355b444e008cd495c354b1d9f714cd2ef9 --- firmware/App/Controllers/PresOccl.c (.../PresOccl.c) (revision f0c16ca7223ad48b7bdb86b8f010b74b550c0051) +++ firmware/App/Controllers/PresOccl.c (.../PresOccl.c) (revision f5d1bb355b444e008cd495c354b1d9f714cd2ef9) @@ -7,8 +7,8 @@ * * @file PresOccl.c * -* @author (last) Sean Nash -* @date (last) 15-Aug-2023 +* @author (last) Darren Cox +* @date (last) 24-Aug-2023 * * @author (original) Sean * @date (original) 15-Jan-2020 @@ -43,6 +43,7 @@ #define PRES_OCCL_DATA_PUB_INTERVAL ( MS_PER_SECOND / TASK_GENERAL_INTERVAL ) ///< Interval (ms/task time) at which the pressure/occlusion data is published on the CAN bus. #define PRES_LIMIT_STABILIZATION_TIME_MS ( 60 * MS_PER_SECOND ) ///< Duration of pressure limit stabilization period (in ms). +#define PRES_LIMIT_SHORT_STABILIZE_TIME_MS ( 5 * MS_PER_SECOND ) ///< Duration of pressure limit short stabilization period (in ms). #define PRES_LIMIT_RESTABILIZE_TIME_MS ( 30 * SEC_PER_MIN * MS_PER_SECOND ) ///< Duration of pressure limit re-stabilize period (in ms). #define ARTERIAL_PRESSURE_CONVERSION_OFFSET 0x800000 ///< Arterial pressure conversion coefficient. @@ -168,9 +169,10 @@ 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. @@ -251,13 +253,14 @@ 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; bloodPumpOcclusionAfterCartridgeInstall = 0; + useShortStabilizeTime = USE_NORMAL_STABILIZATION_PERIOD; } /*********************************************************************//** @@ -402,17 +405,30 @@ * will be in effect immediately (next monitor pass). If treatment paused, * resume will start a new stabilization period ending in another set of * stable pressures before windowed limits recalculated. - * @details Inputs: none + * @details Inputs: useShortStabilizeTime * @details Outputs: stableArterialPressure, stableVenousPressure * @return none *************************************************************************/ void updatePressureLimitWindows( void ) { - F32 filtArt = getLongFilteredArterialPressure(); - F32 filtVen = getLongFilteredVenousPressure(); - S32 curArtPres = FLOAT_TO_INT_WITH_ROUND( filtArt ); - S32 curVenPres = FLOAT_TO_INT_WITH_ROUND( filtVen ); + F32 filtArt; + F32 filtVen; + S32 curArtPres; + S32 curVenPres; + if ( USE_SHORT_STABILIZATION_PERIOD == useShortStabilizeTime ) + { + filtArt = getFilteredArterialPressure(); + filtVen = getFilteredVenousPressure(); + } + else + { + F32 filtArt = getLongFilteredArterialPressure(); + F32 filtVen = getLongFilteredVenousPressure(); + } + + curArtPres = FLOAT_TO_INT_WITH_ROUND( filtArt ); + curVenPres = FLOAT_TO_INT_WITH_ROUND( filtVen ); stableArterialPressure = curArtPres; stableVenousPressure = curVenPres; @@ -425,12 +441,17 @@ * The signalInitiatePressureStabilization function signals that user has * changed the blood and/or dialysate flow rate. If pressure limits state * was stable, a rate change will kick us back to stabilization state. - * @details Inputs: none - * @details Outputs: currPresLimitsState, stabilizationStartTimeMs + * Else reset stabilize counter. + * @details Inputs: currPresLimitsState + * @details Outputs: currPresLimitsState, stabilizationStartTimeMs, useShortStabilizeTime + * @param useShort Flag to use short stabilization period. Use defines: + * USE_NORMAL_STABILIZATION_PERIOD, USE_SHORT_STABILIZATION_PERIOD * @return none *************************************************************************/ -void signalInitiatePressureStabilization( void ) +void signalInitiatePressureStabilization( BOOL useShort ) { + useShortStabilizeTime = useShort; + // User update of blood/dialysate flow rate or UF rate or initiates/resets a stabilization period (if we were in stabilization or stable state) if ( PRESSURE_LIMITS_STATE_STABILIZATION == currPresLimitsState ) { @@ -574,6 +595,7 @@ BOOL bpRampComplete = isBloodPumpRampComplete(); HD_OP_MODE_T currMode = getCurrentOperationMode(); TREATMENT_STATE_T currTxState = getTreatmentState(); + U32 stabilizeTime = PRES_LIMIT_STABILIZATION_TIME_MS; if ( currMode != MODE_TREA ) { @@ -583,7 +605,7 @@ switch ( currPresLimitsState ) { case PRESSURE_LIMITS_STATE_OFF: - if ( MODE_TREA == currMode ) + if ( ( MODE_TREA == currMode ) && ( currTxState != TREATMENT_RECIRC_STATE ) ) { // Tx mode starts in blood prime - want wide limits in that state currPresLimitsState = PRESSURE_LIMITS_STATE_WIDE; } @@ -604,11 +626,25 @@ else if ( ( TREATMENT_DIALYSIS_STATE == currTxState ) || ( TREATMENT_STOP_STATE == currTxState ) ) { stabilizationStartTimeMs = getMSTimerCount(); + useShortStabilizeTime = USE_NORMAL_STABILIZATION_PERIOD; currPresLimitsState = PRESSURE_LIMITS_STATE_STABILIZATION; } + else if ( currTxState == TREATMENT_RECIRC_STATE ) + { + currPresLimitsState = PRESSURE_LIMITS_STATE_OFF; + } break; case PRESSURE_LIMITS_STATE_STABILIZATION: + if ( USE_SHORT_STABILIZATION_PERIOD == useShortStabilizeTime ) + { + stabilizeTime = PRES_LIMIT_SHORT_STABILIZE_TIME_MS; + } + else + { + stabilizeTime = PRES_LIMIT_STABILIZATION_TIME_MS; + } + if ( bpRunning != TRUE ) { currPresLimitsState = PRESSURE_LIMITS_STATE_IDLE; @@ -617,10 +653,11 @@ { currPresLimitsState = PRESSURE_LIMITS_STATE_WIDE; } - else if ( TRUE == didTimeout( stabilizationStartTimeMs, PRES_LIMIT_STABILIZATION_TIME_MS ) ) + else if ( TRUE == didTimeout( stabilizationStartTimeMs, stabilizeTime ) ) { updatePressureLimitWindows(); stabilizationStartTimeMs = getMSTimerCount(); + useShortStabilizeTime = USE_NORMAL_STABILIZATION_PERIOD; currPresLimitsState = PRESSURE_LIMITS_STATE_STABLE; } break; @@ -637,6 +674,7 @@ else if ( TRUE == didTimeout( stabilizationStartTimeMs, PRES_LIMIT_RESTABILIZE_TIME_MS ) ) { stabilizationStartTimeMs = getMSTimerCount(); + useShortStabilizeTime = USE_NORMAL_STABILIZATION_PERIOD; currPresLimitsState = PRESSURE_LIMITS_STATE_STABILIZATION; } break; @@ -964,7 +1002,7 @@ *************************************************************************/ F32 getFilteredArterialPressure( void ) { - return shortFilteredArterialPressure; + return getF32OverrideValue( &shortFilteredArterialPressure ); } /*********************************************************************//** @@ -1007,7 +1045,7 @@ *************************************************************************/ F32 getFilteredVenousPressure( void ) { - return shortFilteredVenousPressure; + return getF32OverrideValue( &shortFilteredVenousPressure ); } /*********************************************************************//** @@ -1078,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 ) @@ -1100,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; } /*********************************************************************//** @@ -1118,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; @@ -1286,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; @@ -1309,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; @@ -1331,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; @@ -1354,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;