Index: firmware/App/Controllers/SyringePump.c =================================================================== diff -u -r056ef172979282cacadfe7a58842821ea431cc50 -r40959111de79e7cc3b1dfed5d244d5038e3c375c --- firmware/App/Controllers/SyringePump.c (.../SyringePump.c) (revision 056ef172979282cacadfe7a58842821ea431cc50) +++ firmware/App/Controllers/SyringePump.c (.../SyringePump.c) (revision 40959111de79e7cc3b1dfed5d244d5038e3c375c) @@ -100,7 +100,7 @@ #define SYRINGE_PUMP_RETRACT_POS_MIN ( SYRINGE_ENCODER_COUNTS_PER_ML * -0.5 ) #define SYRINGE_PUMP_START_RAMP_SPEED 300000 ///< Starting speed for all syringe pump operations to ramp up from. -#define SYRINGE_PUMP_RAMP_DIVISOR 15 ///< Used for ramping profile. +#define SYRINGE_PUMP_RAMP_DIVISOR 5 ///< Used for ramping profile. #define SYRINGE_PUMP_RATE_CHECK_MARGIN 0.05 ///< 5 pct margin on commanded vs. measured rate check. #define SYRINGE_PUMP_VOLUME_CHECK_MARGIN 0.05 ///< 5 pct margin on commanded vs. encoder based volume check. @@ -1601,12 +1601,14 @@ F32 delta = max - min; F32 error = ( max > 0.0 ? ( 1.0 - fabs( min / max ) ) : 0.0 ); +#ifndef DISABLE_SYRINGE_PUMP_ALARMS // Alarm on rate if off by more than 5% or 0.1 mL/hr, whichever is greater if ( TRUE == isPersistentAlarmTriggered( ALARM_ID_HD_SYRINGE_PUMP_SPEED_ERROR, ( ( error > pctMargin ) && ( delta > SYRINGE_PUMP_MAX_RATE_ERROR_ML_HR ) ) ) ) { result = TRUE; SET_ALARM_WITH_2_F32_DATA( ALARM_ID_HD_SYRINGE_PUMP_SPEED_ERROR, syringePumpSetRate, rate ) } +#endif return result; } @@ -1754,7 +1756,7 @@ U32 nextIdx = INC_WRAP( syringePumpMotorSpeedCalcIdx, 0, SYRINGE_PUMP_SPEED_CALC_BUFFER_LEN - 1 ); S32 countsPerSec = pos - syringePumpLastPositions[ nextIdx ]; // Calc delta between pos 1 second ago and pos now S32 countsPerHr = countsPerSec * ( MIN_PER_HOUR * SEC_PER_MIN); - F32 mLPerHr = (F32)countsPerHr / SYRINGE_ENCODER_COUNTS_PER_ML; + F32 mLPerHr = (F32)((double)countsPerHr / (double)SYRINGE_ENCODER_COUNTS_PER_ML); // Set latest measured rate syringePumpMeasRate.data = mLPerHr; Index: firmware/App/HDCommon.h =================================================================== diff -u -r056ef172979282cacadfe7a58842821ea431cc50 -r40959111de79e7cc3b1dfed5d244d5038e3c375c --- firmware/App/HDCommon.h (.../HDCommon.h) (revision 056ef172979282cacadfe7a58842821ea431cc50) +++ firmware/App/HDCommon.h (.../HDCommon.h) (revision 40959111de79e7cc3b1dfed5d244d5038e3c375c) @@ -25,7 +25,7 @@ #define HD_VERSION_MAJOR 0 #define HD_VERSION_MINOR 5 #define HD_VERSION_MICRO 0 -#define HD_VERSION_BUILD 9036 +#define HD_VERSION_BUILD 9037 // ********** development build switches **********