Index: firmware/App/Controllers/DialOutFlow.c =================================================================== diff -u -r0902a15ea36ad1cc1faa9ecc9422d557a0c680a4 -r1b6b84d8a24a19984ec4a2d89db017e7247ad46c --- firmware/App/Controllers/DialOutFlow.c (.../DialOutFlow.c) (revision 0902a15ea36ad1cc1faa9ecc9422d557a0c680a4) +++ firmware/App/Controllers/DialOutFlow.c (.../DialOutFlow.c) (revision 1b6b84d8a24a19984ec4a2d89db017e7247ad46c) @@ -57,7 +57,7 @@ #define MAX_DIAL_OUT_PUMP_PWM_CHANGE 0.05F ///< Maximum duty cycle change allowed. #define MAX_DIAL_OUT_PUMP_PWM_STEP_UP_CHANGE 0.01064F ///< Maximum duty cycle change when ramping up. #define MAX_DIAL_OUT_PUMP_PWM_STEP_DN_CHANGE 0.016F ///< Maximum duty cycle change when ramping down. -#define MAX_DIAL_OUT_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_OUT_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_OUT_PUMP_PWM_DUTY_CYCLE 0.90F ///< Controller will error if PWM duty cycle > 90%, so set max to 90%. #define MIN_DIAL_OUT_PUMP_PWM_DUTY_CYCLE 0.10F ///< Controller will error if PWM duty cycle < 10%, so set min to 10%. #define MIN_DIAL_OUT_CL_PWM_DUTY_CYCLE 0.11F ///< Dial outlet pump Closed Loop minimum PWM duty cycle. @@ -86,6 +86,7 @@ #define DOP_MAX_ROTOR_VS_MOTOR_DIFF_RPM 5.0F ///< Maximum difference in speed between motor and rotor (in rotor RPM). #define DOP_MAX_MOTOR_SPEED_ERROR_RPM 300.0F ///< Maximum difference in speed between measured and commanded RPM. #define DOP_MAX_MOTOR_SPEED_VS_TRGT_DIFF_PCT 0.15F ///< Maximum motor speed vs target difference in percent. +#define DOP_MIN_ROTOR_SPEED_VS_MOTOR_PCT -0.6F ///< Minimum rotor speed vs target difference in percent. /// Persist time (task intervals) for motor off error condition. static const U32 DOP_OFF_ERROR_PERSIST = ((5 * MS_PER_SECOND) / TASK_PRIORITY_INTERVAL); @@ -1172,8 +1173,8 @@ F32 deltaMCMotorSpeed = fabs( measMCMotorSpeed - cmdMotorSpeed ); F32 measRotorSpeed = fabs( getMeasuredDialOutPumpRotorSpeed() ); F32 measMotorSpeedInRotorRPM = fabs( measMotorSpeed / DOP_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 > DOP_MAX_MOTOR_SPEED_ERROR_RPM ) || ( deltaMCMotorSpeed > DOP_MAX_MOTOR_SPEED_ERROR_RPM ) ) @@ -1194,7 +1195,8 @@ } // Check measured rotor speed vs. measured motor speed while controlling to target - if ( ( deltaRotorSpeed > DOP_MAX_ROTOR_VS_MOTOR_DIFF_RPM ) && ( measMotorSpeedDeltaPct > DOP_MAX_MOTOR_SPEED_VS_TRGT_DIFF_PCT ) ) + if ( ( ( deltaRotorSpeed > DOP_MAX_ROTOR_VS_MOTOR_DIFF_RPM ) && ( measMotorSpeedDeltaPct > DOP_MAX_MOTOR_SPEED_VS_TRGT_DIFF_PCT ) ) || + ( measMotorSpeedDeltaPct < DOP_MIN_ROTOR_SPEED_VS_MOTOR_PCT ) ) { if ( ++errorDialOutRotorSpeedPersistTimerCtr >= ( getPumpRotorErrorPersistTime( measMotorSpeed, DOP_GEAR_RATIO ) / TASK_PRIORITY_INTERVAL ) ) {