Index: firmware/App/Controllers/PresOccl.c =================================================================== diff -u -rda7e8c1b71db9273f83e9d0ba7d20e74e758a8ad -r221f2d32da9044362aa7a30761e1fc9e7a218a86 --- firmware/App/Controllers/PresOccl.c (.../PresOccl.c) (revision da7e8c1b71db9273f83e9d0ba7d20e74e758a8ad) +++ firmware/App/Controllers/PresOccl.c (.../PresOccl.c) (revision 221f2d32da9044362aa7a30761e1fc9e7a218a86) @@ -17,7 +17,8 @@ #include "PresOccl.h" #include "AirPump.h" -#include "AlarmMgmt.h" +#include "AlarmMgmt.h" +#include "BloodFlow.h" #include "FPGA.h" #include "ModeTreatmentParams.h" #include "NVDataMgmt.h" @@ -644,7 +645,8 @@ // and setOcclusionInstallLevel has been called. if ( MODE_PRET == getCurrentOperationMode() ) { - if ( getPreTreatmentSubState() > HD_PRE_TREATMENT_CART_INSTALL_STATE && getDrySelfTestsState() > DRY_SELF_TESTS_START_STATE ) + if ( ( TRUE == isBloodPumpRunning() ) && ( getPreTreatmentSubState() > HD_PRE_TREATMENT_CART_INSTALL_STATE ) + && ( getDrySelfTestsState() > DRY_SELF_TESTS_START_STATE ) ) { // Check for occlusion if ( bpOccl > ( OCCLUSION_THRESHOLD_OFFSET + bloodPumpOcclusionAfterCartridgeInstall ) ) @@ -658,7 +660,7 @@ // Check for occlusion in Treatment modes where pumps are moving else if ( MODE_TREA == getCurrentOperationMode() ) { - if ( TREATMENT_STOP_STATE != getTreatmentState() ) + if ( ( TRUE == isBloodPumpRunning() ) && TREATMENT_STOP_STATE != getTreatmentState() ) { // Check for occlusion if ( bpOccl > ( OCCLUSION_THRESHOLD_OFFSET + bloodPumpOcclusionAfterCartridgeInstall ) )