Index: firmware/App/Controllers/DialInFlow.c =================================================================== diff -u -r0902a15ea36ad1cc1faa9ecc9422d557a0c680a4 -r1b6b84d8a24a19984ec4a2d89db017e7247ad46c --- firmware/App/Controllers/DialInFlow.c (.../DialInFlow.c) (revision 0902a15ea36ad1cc1faa9ecc9422d557a0c680a4) +++ firmware/App/Controllers/DialInFlow.c (.../DialInFlow.c) (revision 1b6b84d8a24a19984ec4a2d89db017e7247ad46c) @@ -51,7 +51,7 @@ #define MAX_DIAL_IN_PUMP_PWM_STEP_UP_CHANGE 0.01064F ///< Max duty cycle change when ramping up. #define MAX_DIAL_IN_PUMP_PWM_STEP_DN_CHANGE 0.016F ///< Max duty cycle change when ramping down. -#define MAX_DIAL_IN_PUMP_PWM_DUTY_CYCLE_SET 0.78F ///< Max duty cycle is 78% to cap pump speed to 3,400 RPM to prevent rotor speed errors. +#define MAX_DIAL_IN_PUMP_PWM_DUTY_CYCLE_SET 0.82F ///< Max duty cycle is 82% to cap pump speed to 3,600 RPM during treatment. #define MAX_DIAL_IN_PUMP_PWM_DUTY_CYCLE 0.90F ///< Controller will error if PWM duty cycle > 90%, so set max to 90%. #define MIN_DIAL_IN_PUMP_PWM_DUTY_CYCLE 0.10F ///< Controller will error if PWM duty cycle < 10%, so set min to 10%. #define MIN_DG_DIAL_FLOW_RATE 10.0F ///< Minimum DG Dialysate Flow Rate (mL/Min) @@ -76,6 +76,7 @@ #define DIP_MAX_ROTOR_VS_MOTOR_DIFF_RPM 5.0F ///< Maximum difference in speed between motor and rotor (in rotor RPM). #define DIP_MAX_MOTOR_SPEED_ERROR_RPM 300.0F ///< Maximum difference in speed between measured and commanded RPM. #define DIP_MAX_MOTOR_SPEED_VS_TRGT_DIFF_PCT 0.15F ///< Maximum motor speed vs target difference in percent. +#define DIP_MIN_ROTOR_SPEED_VS_MOTOR_PCT -0.6F ///< Minimum rotor speed vs target difference in percent. /// Persist time (ms) for unexpected flow check failure condition. static const U32 DIP_NO_FLOW_CHK_PERSIST = (10 * MS_PER_SECOND); @@ -1351,8 +1352,8 @@ F32 deltaMCMotorSpeed = fabs( measMCMotorSpeed - cmdMotorSpeed ); F32 measRotorSpeed = fabs( getMeasuredDialInPumpRotorSpeed() ); F32 measMotorSpeedInRotorRPM = fabs( measMotorSpeed / DIP_GEAR_RATIO ); - F32 deltaRotorSpeed = fabs( measRotorSpeed - measMotorSpeedInRotorRPM ); - F32 measMotorSpeedDeltaPct = fabs( deltaRotorSpeed / measMotorSpeedInRotorRPM ); + F32 deltaRotorSpeed = ( measRotorSpeed - measMotorSpeedInRotorRPM ); + F32 measMotorSpeedDeltaPct = ( deltaRotorSpeed / measMotorSpeedInRotorRPM ); // Check measured motor speed vs. commanded motor speed while controlling to target if ( ( deltaMotorSpeed > DIP_MAX_MOTOR_SPEED_ERROR_RPM ) || ( deltaMCMotorSpeed > DIP_MAX_MOTOR_SPEED_ERROR_RPM ) ) @@ -1373,7 +1374,8 @@ } // Check measured rotor speed vs. measured motor speed while controlling to target - if ( ( deltaRotorSpeed > DIP_MAX_ROTOR_VS_MOTOR_DIFF_RPM ) && ( measMotorSpeedDeltaPct > DIP_MAX_MOTOR_SPEED_VS_TRGT_DIFF_PCT ) ) + if ( ( ( deltaRotorSpeed > DIP_MAX_ROTOR_VS_MOTOR_DIFF_RPM ) && ( measMotorSpeedDeltaPct > DIP_MAX_MOTOR_SPEED_VS_TRGT_DIFF_PCT ) ) || + ( measMotorSpeedDeltaPct < DIP_MIN_ROTOR_SPEED_VS_MOTOR_PCT ) ) { if ( ++errorDialInRotorSpeedPersistTimerCtr >= ( getPumpRotorErrorPersistTime( measMotorSpeed, DIP_GEAR_RATIO ) / TASK_PRIORITY_INTERVAL ) ) {