Index: firmware/App/Controllers/SyringePump.c =================================================================== diff -u -r0665111ae0d4a2446656f30d653f100eae017fbe -rae552ee28c425dccf069b1d80ce7f93a34c06063 --- firmware/App/Controllers/SyringePump.c (.../SyringePump.c) (revision 0665111ae0d4a2446656f30d653f100eae017fbe) +++ firmware/App/Controllers/SyringePump.c (.../SyringePump.c) (revision ae552ee28c425dccf069b1d80ce7f93a34c06063) @@ -1692,7 +1692,7 @@ stopPump = checkSyringeEmpty( stopPump ); // Check for occlusion - stopPump = checkForSyringeOcclusion(); + stopPump = checkForSyringeOcclusion( stopPump ); // Check position > empty + 0.5 mL stopPump = checkMaxTravel( stopPump, SYRINGE_PUMP_EMPTY_POS + SYRINGE_PUMP_EMPTY_POS_MARGIN ); @@ -1851,11 +1851,12 @@ * pressure. Would indicate occlusion or jam or empty syringe. * @details Inputs: syringePumpMeasForce.data, syringePumpPosition.data * @details Outputs: alarm triggered if max force detected + * @param stopPump flag passed in by caller indicating whether pump should be stopped * @return TRUE if pump should be stopped, FALSE if not *************************************************************************/ -BOOL checkForSyringeOcclusion( void ) +BOOL checkForSyringeOcclusion( BOOL stopPump ) { - BOOL result = FALSE; // Return FALSE if no occlusion is detected + BOOL result = stopPump; F32 currentForceV = getSyringePumpForceV(); // Read the force sensor at the end of the priming F32 forceDelta = currentForceV - forceAtEndOfSeek; // Occlusion is detected if force at end of prime is > than force at end of seek by 0.5 volts or more BOOL occlusionDetected = FALSE;