Index: firmware/App/Drivers/FluidPump.h
===================================================================
diff -u -r830213bc6dcc1a684610caf78c79d55f2cb41e93 -r60693bf21a8a0277eae54cbfcb6cfd68176b079a
--- firmware/App/Drivers/FluidPump.h	(.../FluidPump.h)	(revision 830213bc6dcc1a684610caf78c79d55f2cb41e93)
+++ firmware/App/Drivers/FluidPump.h	(.../FluidPump.h)	(revision 60693bf21a8a0277eae54cbfcb6cfd68176b079a)
@@ -32,10 +32,12 @@
 
 // ********** public definitions **********
 
-#define MAX_FLUID_PUMP_PWM_DUTY_CYCLE           500             ///< Maximum settable boost pump duty cycle magnitude.
-#define MIN_FLUID_PUMP_PWM_DUTY_CYCLE           0               ///< minimum settable boost pump duty cycle magnitude.
+#define MAX_P40_FLUID_PUMP_PWM_DUTY_CYCLE       5000            ///< Maximum settable pump duty cycle magnitude for P40.
+#define MAX_P12_FLUID_PUMP_PWM_DUTY_CYCLE       500             ///< Maximum settable pump duty cycle magnitude for P12.
+#define MIN_FLUID_PUMP_PWM_DUTY_CYCLE           0               ///< Minimum settable pump duty cycle magnitude.
 
-#define MAX_FLUID_PUMP_DUTY_CYCLE_PCT           0.90F           ///< Max duty cycle in percentage.
+#define MAX_P40_FLUID_PUMP_DUTY_CYCLE_PCT       0.98F           ///< Max duty cycle for P40 in percentage
+#define MAX_P12_FLUID_PUMP_DUTY_CYCLE_PCT       0.90F           ///< Max duty cycle for P12 in percentage.
 #define MIN_FLUID_PUMP_DUTY_CYCLE_PCT           0.0F            ///< Min duty cycle in percentage.
 
 /// Enumerations of fluid pumps.
@@ -57,8 +59,8 @@
 U16  getFluidPumpReadPWMDutyCycle( FP_FLUID_PUMP_T pumpID );
 F32  getFluidPumpRPM( FP_FLUID_PUMP_T pumpID );
 
-F32  convertDutyCycleCntToPct( U32 dutyCycleCnt );
-U16  convertDutyCyclePctToCnt( F32 dutyCyclePct );
+F32  convertDutyCycleCntToPct( FP_FLUID_PUMP_T pumpID, U32 dutyCycleCnt );
+U16  convertDutyCyclePctToCnt( FP_FLUID_PUMP_T pumpID, F32 dutyCyclePct );
 BOOL setFluidPumpPctToPWMDutyCycle( FP_FLUID_PUMP_T pumpID, F32 dutyCyclePct);
 void handleFluidPumpU32Data( OVERRIDE_U32_T *ovU32);
 void handleFluidPumpF32Data( OVERRIDE_F32_T *ovF32);