Index: firmware/App/Controllers/DialysatePumps.c =================================================================== diff -u -r67b9e7ce05b6b2592a0cca8429915dcbfc36734b -rf373dc9242eaf8840fd027e3956e63d5183f874d --- firmware/App/Controllers/DialysatePumps.c (.../DialysatePumps.c) (revision 67b9e7ce05b6b2592a0cca8429915dcbfc36734b) +++ firmware/App/Controllers/DialysatePumps.c (.../DialysatePumps.c) (revision f373dc9242eaf8840fd027e3956e63d5183f874d) @@ -62,11 +62,11 @@ #define DEFAULT_FRESH_DIALYSATE_TARGET_PRESSURE_PSI -12.79F ///< Default degas pump(D18) target pressure (at zero sea level)in psi. #define DEFAULT_SPENT_DIALYSATE_TARGET_PRESSURE_PSI 30.0F ///< Default spent dialysate pump target pressure(D48) in psi. -#define FRESH_DIAL_OPEN_LOOP_SPEED_RPM 2000.0F ///< fresh dialysate pump open loop speed to meet target pressure. -#define SPENT_DIAL_OPEN_LOOP_SPEED_RPM 2500.0F ///< spent dialysate pump open loop speed to meet target pressure. +#define FRESH_DIAL_OPEN_LOOP_SPEED_RPM 2000.0F ///< Fresh dialysate pump open loop speed to meet target pressure. +#define SPENT_DIAL_OPEN_LOOP_SPEED_RPM 2500.0F ///< Spent dialysate pump open loop speed to meet target pressure. #define DIALYSATE_PUMP_SPEED_ZERO_RPM 0 ///< Dialysate pump zero RPM speed. #define SPEED_COUNT_ZERO 0 ///< Measured speed count zero check. -#define SPEED_CONV_FACTOR 1500000 ///< Measured speed count conversion to RPM +#define SPEED_CONV_FACTOR 1500000 ///< Measured speed count conversion to RPM ( in 10us resolution ). #define D12_PUMP_P_COEFFICIENT 20.0F ///< P term for fresh dialysate pump delta pressure control. #define D12_PUMP_I_COEFFICIENT 60.0F ///< I term for fresh dialysate pump delta pressure control. @@ -77,7 +77,7 @@ #define DEGAS_PUMP_INTERCEPT_FACTOR 0.1153F ///< Dialysate pump target pressure addition factor ( b factor in 'y = mx + b' equation) #define MAX_ALLOWED_RPM_OUT_OF_RANGE 300 ///< Maximum allowed RPM out of range from target RPM in open loop. -#define PUMP_TRANS_TO_RAMP_SPEED_THRESHOLD 20.0F ///< Speed change that alters the state to ramp during control state. +#define PUMP_TRANS_TO_RAMP_SPEED_THRESHOLD 100.0F ///< Speed change that alters the state to ramp during control state. #define RPM_OUT_OF_RANGE_TIME_OUT ( 10 * MS_PER_SECOND ) ///< Open loop RPM out of range time out in ms. #define SAFETY_SHUTDOWN_TIMEOUT ( 1 * MS_PER_SECOND ) ///< Dialysate pump safety shutdown activation timeout.