Index: firmware/App/Controllers/PresOccl.c =================================================================== diff -u -r7498c77e7f99c2d3854df69f1999244de066a504 -rdc8530d1b15e4b1199cacf0284dbe8f7802e9dde --- firmware/App/Controllers/PresOccl.c (.../PresOccl.c) (revision 7498c77e7f99c2d3854df69f1999244de066a504) +++ firmware/App/Controllers/PresOccl.c (.../PresOccl.c) (revision dc8530d1b15e4b1199cacf0284dbe8f7802e9dde) @@ -706,6 +706,7 @@ // and setOcclusionInstallLevel has been called. if( MODE_PRET == getCurrentOperationMode() ) { + if( getPreTreatmentSubState() > HD_PRE_TREATMENT_CART_INSTALL_STATE && getDrySelfTestsState() > DRY_SELF_TESTS_START_STATE ) { // Check for occlusion @@ -720,8 +721,10 @@ // Check for occlusion in PreTreatment modes where pumps are moving else if( MODE_TREA == getCurrentOperationMode() ) { + if( TREATMENT_STOP_STATE != getTreatmentState()) { + // Check for occlusion if ( bpOccl > ( OCCLUSION_THRESHOLD_OFFSET + bloodPumpOcclusionAfterCartridgeInstall ) ) { Index: firmware/App/Modes/ModePreTreat.c =================================================================== diff -u -r7498c77e7f99c2d3854df69f1999244de066a504 -rdc8530d1b15e4b1199cacf0284dbe8f7802e9dde --- firmware/App/Modes/ModePreTreat.c (.../ModePreTreat.c) (revision 7498c77e7f99c2d3854df69f1999244de066a504) +++ firmware/App/Modes/ModePreTreat.c (.../ModePreTreat.c) (revision dc8530d1b15e4b1199cacf0284dbe8f7802e9dde) @@ -526,6 +526,7 @@ { return reservoirFilledStatus[ reservoirID ]; } + /*********************************************************************//** * @brief * The getPreTreatmentSubState function gets the current Index: firmware/App/Services/Reservoirs.c =================================================================== diff -u -r7498c77e7f99c2d3854df69f1999244de066a504 -rdc8530d1b15e4b1199cacf0284dbe8f7802e9dde --- firmware/App/Services/Reservoirs.c (.../Reservoirs.c) (revision 7498c77e7f99c2d3854df69f1999244de066a504) +++ firmware/App/Services/Reservoirs.c (.../Reservoirs.c) (revision dc8530d1b15e4b1199cacf0284dbe8f7802e9dde) @@ -40,10 +40,6 @@ #define DIA_FLOW_TO_FILL_FLOW_FIRST_ORDER_COEFF 7.5F ///< Dialysate flow rate to fill flow rate first order coefficient. #define DIA_FLOW_TO_FILL_FLOW_CONSTANT 2.0F ///< Dialysate flow rate to fill flow rate constant. -#define DIA_FLOW_TO_FILL_FLOW_SECOND_ORDER_COEFF 10.0 ///< Dialysate flow rate to fill flow rate second order coefficient. -#define DIA_FLOW_TO_FILL_FLOW_FIRST_ORDER_COEFF 7.5 ///< Dialysate flow rate to fill flow rate first order coefficient. -#define DIA_FLOW_TO_FILL_FLOW_CONSTANT 2.0 ///< Dialysate flow rate to fill flow rate constant. - // ********** private data ********** /// States of the treatment reservoir management state machine.