Index: firmware/App/Controllers/BloodFlow.c =================================================================== diff -u -r893b25a778d71b4d779ff14aa7361914f388e87e -r2eacb97f43f15f317779635681ed81051828af4f --- firmware/App/Controllers/BloodFlow.c (.../BloodFlow.c) (revision 893b25a778d71b4d779ff14aa7361914f388e87e) +++ firmware/App/Controllers/BloodFlow.c (.../BloodFlow.c) (revision 2eacb97f43f15f317779635681ed81051828af4f) @@ -101,7 +101,7 @@ /// Macro converts 12 bit ADC value to signed 16-bit value. #define SIGN_FROM_12_BIT_VALUE(v) ( (S16)(v) - (S16)BLOODPUMP_ADC_ZERO ) -#define BP_SPEED_ADC_TO_RPM_FACTOR 1.601601 ///< Conversion factor from ADC counts to RPM for blood pump motor (3200 RPM/1998 counts). +#define BP_SPEED_ADC_TO_RPM_FACTOR 1.751752 ///< Conversion factor from ADC counts to RPM for blood pump motor (3500 RPM/1998 counts). #define BP_MOTOR_RPM_TO_PWM_DC_FACTOR 0.000238 ///< ~42 BP motor RPM = 1% PWM duty cycle. #define BP_CURRENT_ADC_TO_MA_FACTOR 3.002 ///< Conversion factor from ADC counts to mA for blood pump motor. Index: firmware/App/Controllers/DialInFlow.c =================================================================== diff -u -r893b25a778d71b4d779ff14aa7361914f388e87e -r2eacb97f43f15f317779635681ed81051828af4f --- firmware/App/Controllers/DialInFlow.c (.../DialInFlow.c) (revision 893b25a778d71b4d779ff14aa7361914f388e87e) +++ firmware/App/Controllers/DialInFlow.c (.../DialInFlow.c) (revision 2eacb97f43f15f317779635681ed81051828af4f) @@ -96,7 +96,7 @@ ///< Macro converts a 12-bit ADC reading to a signed 16-bit value. #define SIGN_FROM_12_BIT_VALUE(v) ( (S16)(v) - (S16)DIAL_IN_PUMP_ADC_ZERO ) -#define DIP_SPEED_ADC_TO_RPM_FACTOR 1.601601 ///< Conversion factor from ADC counts to RPM for dialIn pump motor (3200 RPM/1998 counts). +#define DIP_SPEED_ADC_TO_RPM_FACTOR 1.751752 ///< Conversion factor from ADC counts to RPM for dialIn pump motor (3500 RPM/1998 counts). #define DIP_MOTOR_RPM_TO_PWM_DC_FACTOR 0.000193 ///< ~52 BP motor RPM = 1% PWM duty cycle #define DIP_CURRENT_ADC_TO_MA_FACTOR 3.002 ///< Conversion factor from ADC counts to mA for dialIn pump motor. Index: firmware/App/Controllers/DialOutFlow.c =================================================================== diff -u -r893b25a778d71b4d779ff14aa7361914f388e87e -r2eacb97f43f15f317779635681ed81051828af4f --- firmware/App/Controllers/DialOutFlow.c (.../DialOutFlow.c) (revision 893b25a778d71b4d779ff14aa7361914f388e87e) +++ firmware/App/Controllers/DialOutFlow.c (.../DialOutFlow.c) (revision 2eacb97f43f15f317779635681ed81051828af4f) @@ -87,7 +87,7 @@ #define DOP_ADC_ZERO 1998 ///< Mid-point (zero) for ADC readings. #define SIGN_FROM_12_BIT_VALUE(v) ( (S16)(v) - (S16)DOP_ADC_ZERO ) ///< Macro converts a 12-bit ADC reading to a signed 16-bit value. -#define DOP_SPEED_ADC_TO_RPM_FACTOR 1.601601 ///< Conversion factor from ADC counts to RPM for dialysate outlet pump motor (3200 RPM/1998 counts). +#define DOP_SPEED_ADC_TO_RPM_FACTOR 1.751752 ///< Conversion factor from ADC counts to RPM for dialysate outlet pump motor (3500 RPM/1998 counts). #define DOP_MOTOR_RPM_TO_PWM_DC_FACTOR 0.000193 ///< ~52 BP motor RPM = 1% PWM duty cycle #define DOP_CURRENT_ADC_TO_MA_FACTOR 3.002 ///< Conversion factor from ADC counts to mA for dialysate outlet pump motor.