Index: firmware/App/Controllers/SyringePump.c =================================================================== diff -u -r445f5088c5a644f8f6392a8d0817b796ed9ec9b5 -r6d743f84430c0e17011d07fb378de49d86853137 --- firmware/App/Controllers/SyringePump.c (.../SyringePump.c) (revision 445f5088c5a644f8f6392a8d0817b796ed9ec9b5) +++ firmware/App/Controllers/SyringePump.c (.../SyringePump.c) (revision 6d743f84430c0e17011d07fb378de49d86853137) @@ -300,6 +300,7 @@ syringePumpPlungerFound = FALSE; syringeVolumeAdequate = FALSE; syringePumpPrimeCompleted = FALSE; + syringePumpRampUpPct = 0.0; lastSyringePumpADCReadCtr = 0; @@ -1149,7 +1150,7 @@ isPersistentAlarmTriggered( ALARM_ID_HD_SYRINGE_PUMP_ENCODER_DIRECTION_ERROR, FALSE ); isPersistentAlarmTriggered( ALARM_ID_HD_SYRINGE_PUMP_CONTROLLER_DIRECTION_ERROR, FALSE ); // Reset ramp % complete - syringePumpPrimeCompleted = 0.0; + syringePumpRampUpPct = 0.0; // Check for request flags if ( TRUE == syringePumpRetractRequested ) @@ -1770,14 +1771,14 @@ { syringePumpRampUpToggleTime = (U32)((F32)SYRINGE_PUMP_START_RAMP_SPEED / (F32)( ( syringePumpRampTimerCtr * syringePumpRampTimerCtr * syringePumpRampTimerCtr ) / SYRINGE_PUMP_RAMP_DIVISOR ) ); - syringePumpPrimeCompleted = syringePumpSetToggleTime / syringePumpRampUpToggleTime; + syringePumpRampUpPct = syringePumpSetToggleTime / syringePumpRampUpToggleTime; if ( syringePumpRampUpToggleTime > syringePumpSetToggleTime ) { setFPGASyringePumpStepToggleTime( syringePumpRampUpToggleTime ); } else { - syringePumpPrimeCompleted = 1.0; // set to 100% ramp completion + syringePumpRampUpPct = 1.0; // set to 100% ramp completion setFPGASyringePumpStepToggleTime( syringePumpSetToggleTime ); } } @@ -1850,7 +1851,7 @@ *************************************************************************/ static void calcSafetyVolumeDelivered( void ) { - syringePumpSafetyVolumeDelivered += ( syringePumpPrimeCompleted * ( syringePumpSetRate / (F32)( MIN_PER_HOUR * SEC_PER_MIN * ( MS_PER_SECOND / TASK_PRIORITY_INTERVAL ) ) ) ); + syringePumpSafetyVolumeDelivered += ( syringePumpRampUpPct * ( syringePumpSetRate / (F32)( MIN_PER_HOUR * SEC_PER_MIN * ( MS_PER_SECOND / TASK_PRIORITY_INTERVAL ) ) ) ); } /*********************************************************************//**