Index: firmware/App/Controllers/BloodFlow.c
===================================================================
diff -u -r0a0417a975dc931b8eb05c1e4dc0599aab07492c -r90945afbe3866bf383c44c2a1f52438192c267c5
--- firmware/App/Controllers/BloodFlow.c	(.../BloodFlow.c)	(revision 0a0417a975dc931b8eb05c1e4dc0599aab07492c)
+++ firmware/App/Controllers/BloodFlow.c	(.../BloodFlow.c)	(revision 90945afbe3866bf383c44c2a1f52438192c267c5)
@@ -106,13 +106,14 @@
 #define BP_ML_PER_MIN_TO_PUMP_RPM_FACTOR    ( BP_REV_PER_LITER / ML_PER_LITER )     ///< Conversion factor from mL/min to motor RPM.
 #define BP_GEAR_RATIO                       32.0F           ///< Blood pump motor to blood pump gear ratio.
 #define BP_PWM_ZERO_OFFSET                  0.1F            ///< 10 pct PWM duty cycle = zero speed.
+#define BP_100_PCT_PWM_RPM_RANGE            4000.0F         ///< 10-90% PWM range yields 0-3,200 RPM range.  Full 100% PWM range would yield 4,000 RPM range.
 
 /// Conversion macro from mL/min to estimated PWM duty cycle %.
 #define BP_PWM_FROM_ML_PER_MIN(rate)        ( (rate) * BP_ML_PER_MIN_TO_PUMP_RPM_FACTOR * BP_GEAR_RATIO * BP_MOTOR_RPM_TO_PWM_DC_FACTOR + BP_PWM_ZERO_OFFSET )
 /// Conversion from PWM duty cycle % to commanded pump motor speed.
-#define BP_PWM_TO_MOTOR_SPEED_RPM(pwm,dir)  ( ( ((pwm) - BP_PWM_ZERO_OFFSET) * 4000.0F ) * ( dir == MOTOR_DIR_FORWARD ? 1.0F : -1.0F ) )
+#define BP_PWM_TO_MOTOR_SPEED_RPM(pwm,dir)  ( ( ((pwm) - BP_PWM_ZERO_OFFSET) * BP_100_PCT_PWM_RPM_RANGE ) * ( dir == MOTOR_DIR_FORWARD ? 1.0F : -1.0F ) )
 /// Conversion from RPM to PWM duty cycle %.
-#define BP_MOTOR_SPEED_RPM_TO_PWM(rpm)      ( ( (F32)(rpm) / 4000.0F ) + BP_PWM_ZERO_OFFSET )
+#define BP_MOTOR_SPEED_RPM_TO_PWM(rpm)      ( ( (F32)(rpm) / BP_100_PCT_PWM_RPM_RANGE ) + BP_PWM_ZERO_OFFSET )
 /// Conversion macro from mL/min to estimated PWM duty cycle %.
 #define BP_ML_PER_MIN_FROM_PWM(pwm)         ( ( ( pwm - BP_PWM_ZERO_OFFSET ) / ( BP_ML_PER_MIN_TO_PUMP_RPM_FACTOR * BP_GEAR_RATIO * BP_MOTOR_RPM_TO_PWM_DC_FACTOR ) ) )
 
Index: firmware/App/Controllers/DialInFlow.c
===================================================================
diff -u -rc3315e0cc263df74569bbb58591229418b50fe92 -r90945afbe3866bf383c44c2a1f52438192c267c5
--- firmware/App/Controllers/DialInFlow.c	(.../DialInFlow.c)	(revision c3315e0cc263df74569bbb58591229418b50fe92)
+++ firmware/App/Controllers/DialInFlow.c	(.../DialInFlow.c)	(revision 90945afbe3866bf383c44c2a1f52438192c267c5)
@@ -107,11 +107,12 @@
 #define DIP_ML_PER_MIN_TO_PUMP_RPM_FACTOR    ( DIP_REV_PER_LITER / ML_PER_LITER )
 #define DIP_GEAR_RATIO                       32.0F           ///< DialIn pump motor to dialIn pump gear ratio.
 #define DIP_PWM_ZERO_OFFSET                  0.1F            ///< 10% PWM duty cycle = zero speed.
+#define DIP_100_PCT_PWM_RPM_RANGE            4000.0F         ///< 10-90% PWM range yields 0-3,200 RPM range.  Full 100% PWM range would yield 4,000 RPM range.
 
 /// Conversion from PWM duty cycle % to commanded pump motor speed.  PWM range is 10% to 90%.  RPM range is 0 to 3200.  3200 / 0.8 = 4000.
-#define DIP_PWM_TO_MOTOR_SPEED_RPM(pwm,dir)  ( ( ((pwm) - DIP_PWM_ZERO_OFFSET) * 4000.0F ) * ( dir == MOTOR_DIR_FORWARD ? 1.0F : -1.0F ) )
+#define DIP_PWM_TO_MOTOR_SPEED_RPM(pwm,dir)  ( ( ((pwm) - DIP_PWM_ZERO_OFFSET) * DIP_100_PCT_PWM_RPM_RANGE ) * ( dir == MOTOR_DIR_FORWARD ? 1.0F : -1.0F ) )
 /// Conversion from pump motor speed to PWM duty cycle.
-#define DIP_MOTOR_SPEED_RPM_TO_PWM(rpm)      ( ( (F32)(rpm) / 4000.0F ) + DIP_PWM_ZERO_OFFSET )
+#define DIP_MOTOR_SPEED_RPM_TO_PWM(rpm)      ( ( (F32)(rpm) / DIP_100_PCT_PWM_RPM_RANGE ) + DIP_PWM_ZERO_OFFSET )
 // Macro converts PWM to estimate flow rate needed to achieve it.  TODO - this macro does not reverse the function that estimates PWM from target flow rate - and it should
 #define DIP_ML_PER_MIN_FROM_PWM(pwm)         ( (pwm) - DIP_PWM_ZERO_OFFSET ) / DIP_ML_PER_MIN_TO_PUMP_RPM_FACTOR / DIP_GEAR_RATIO / DIP_MOTOR_RPM_TO_PWM_DC_FACTOR
 
Index: firmware/App/Controllers/DialOutFlow.c
===================================================================
diff -u -rd265eb0baf2ef0d293125dc48177ed3077d20ab8 -r90945afbe3866bf383c44c2a1f52438192c267c5
--- firmware/App/Controllers/DialOutFlow.c	(.../DialOutFlow.c)	(revision d265eb0baf2ef0d293125dc48177ed3077d20ab8)
+++ firmware/App/Controllers/DialOutFlow.c	(.../DialOutFlow.c)	(revision 90945afbe3866bf383c44c2a1f52438192c267c5)
@@ -102,13 +102,14 @@
 #define DOP_ML_PER_MIN_TO_PUMP_RPM_FACTOR       ( DOP_REV_PER_LITER / ML_PER_LITER )   ///< Conversion factor from mL/min to pump motor RPM.
 #define DOP_GEAR_RATIO                          32.0F           ///< Pump motor to pump gear ratio.
 #define DOP_PWM_ZERO_OFFSET                     0.1F            ///< 10% PWM duty cycle = zero speed.
+#define DOP_100_PCT_PWM_RPM_RANGE               4000.0F         ///< 10-90% PWM range yields 0-3,200 RPM range.  Full 100% PWM range would yield 4,000 RPM range.
 
 /// Macro converts a flow rate to an estimated PWM duty cycle %.
 #define DOP_PWM_FROM_ML_PER_MIN(rate)           ( ( ( rate ) * 0.0009F ) + 0.0972F + DOP_PWM_ZERO_OFFSET )
 /// Conversion from PWM duty cycle % to commanded pump motor speed.
-#define DOP_PWM_TO_MOTOR_SPEED_RPM(pwm,dir)     ( ( ( ( pwm ) - DOP_PWM_ZERO_OFFSET) * 4000.0F ) * ( dir == MOTOR_DIR_FORWARD ? 1.0F : -1.0F ) )
+#define DOP_PWM_TO_MOTOR_SPEED_RPM(pwm,dir)     ( ( ( ( pwm ) - DOP_PWM_ZERO_OFFSET) * DOP_100_PCT_PWM_RPM_RANGE ) * ( dir == MOTOR_DIR_FORWARD ? 1.0F : -1.0F ) )
 /// Conversion from RPM to PWM duty cycle %.
-#define DOP_MOTOR_SPEED_RPM_TO_PWM(rpm)         ( ( (F32)(rpm) / 4000.0F ) + DOP_PWM_ZERO_OFFSET )
+#define DOP_MOTOR_SPEED_RPM_TO_PWM(rpm)         ( ( (F32)(rpm) / DOP_100_PCT_PWM_RPM_RANGE ) + DOP_PWM_ZERO_OFFSET )
 /// Macro converts a PWM to an estimated flow rate.
 #define DOP_ML_PER_MIN_FROM_PWM(pwm)            ( ( ( pwm - DOP_PWM_ZERO_OFFSET ) - 0.0972F ) / 0.0009F  )