Index: firmware/App/Controllers/BoostPump.c
===================================================================
diff -u -r9c9d42f9e72b773aa4c9c359399572da2081bd57 -r60693bf21a8a0277eae54cbfcb6cfd68176b079a
--- firmware/App/Controllers/BoostPump.c	(.../BoostPump.c)	(revision 9c9d42f9e72b773aa4c9c359399572da2081bd57)
+++ firmware/App/Controllers/BoostPump.c	(.../BoostPump.c)	(revision 60693bf21a8a0277eae54cbfcb6cfd68176b079a)
@@ -52,7 +52,7 @@
 #define DATA_PUBLISH_COUNTER_START_COUNT                 10                                           ///< Data publish counter start count.
 
 /// PWM line equation for pressure. converted to percentage.
-#define ROP_PRESSURE_TO_PWM_PCT(pres)                ( ( BOOST_PRESSURE_TO_PWM_SLOPE * pres + BOOST_PRESSURE_TO_PWM_INTERCEPT ) / MAX_FLUID_PUMP_PWM_DUTY_CYCLE )
+#define ROP_PRESSURE_TO_PWM_PCT(pres)                ( ( BOOST_PRESSURE_TO_PWM_SLOPE * pres + BOOST_PRESSURE_TO_PWM_INTERCEPT ) / MAX_P40_FLUID_PUMP_PWM_DUTY_CYCLE )
 
 // ********** private data **********
 
@@ -94,11 +94,11 @@
 
     // Initialize Boost pump PI controller to flow
     initializePIController( PI_CONTROLLER_ID_BOOST_PUMP_FLOW, MIN_FLUID_PUMP_DUTY_CYCLE_PCT, BOOST_FLOW_CONTROL_P_COEFFICIENT, BOOST_FLOW_CONTROL_I_COEFFICIENT,
-                            MIN_FLUID_PUMP_DUTY_CYCLE_PCT, MAX_FLUID_PUMP_DUTY_CYCLE_PCT, FALSE, 0 );
+                            MIN_FLUID_PUMP_DUTY_CYCLE_PCT, MAX_P40_FLUID_PUMP_DUTY_CYCLE_PCT, FALSE, 0 );
 
     // Initialize Boost pump PI controller to target pressure
     initializePIController( PI_CONTROLLER_ID_BOOST_PUMP_PRES, MIN_FLUID_PUMP_DUTY_CYCLE_PCT, BOOST_PRESSURE_CONTROL_P_COEFFICIENT, BOOST_PRESSURE_CONTROL_I_COEFFICIENT,
-                            MIN_FLUID_PUMP_DUTY_CYCLE_PCT, MAX_FLUID_PUMP_DUTY_CYCLE_PCT, FALSE, 0 );
+                            MIN_FLUID_PUMP_DUTY_CYCLE_PCT, MAX_P40_FLUID_PUMP_DUTY_CYCLE_PCT, FALSE, 0 );
 
     boostPumpState                                  = BOOST_PUMP_OFF_STATE;
     isBoostPumpOn                                   = FALSE;
@@ -292,7 +292,7 @@
     else if ( ++boostControlTimerCounter >= BOOST_CONTROL_INTERVAL )
     {
         boostPumpDutyCyclePctSet = runPIController( PI_CONTROLLER_ID_BOOST_PUMP_FLOW, (F32)getTargetBoostPumpFlowRateMLPM(), getFilteredFlow( P7_FLOW ) );
-        boostPumpDutyCyclePctSet = MIN( boostPumpDutyCyclePctSet, ( MAX_FLUID_PUMP_PWM_DUTY_CYCLE * MAX_FLUID_PUMP_DUTY_CYCLE_PCT ) );
+        boostPumpDutyCyclePctSet = MIN( boostPumpDutyCyclePctSet, ( MAX_P40_FLUID_PUMP_PWM_DUTY_CYCLE * MAX_P40_FLUID_PUMP_DUTY_CYCLE_PCT ) );
         setFluidPumpPctToPWMDutyCycle( P40_PUMP, boostPumpDutyCyclePctSet );
         boostControlTimerCounter = 0;
     }
@@ -467,7 +467,7 @@
     BOOL result = FALSE;
     BOOL skipSet = FALSE;
 
-    if ( ( dutyCycle >= MIN_FLUID_PUMP_DUTY_CYCLE_PCT ) && ( dutyCycle <= MAX_FLUID_PUMP_DUTY_CYCLE_PCT ) )
+    if ( ( dutyCycle >= MIN_FLUID_PUMP_DUTY_CYCLE_PCT ) && ( dutyCycle <= MAX_P40_FLUID_PUMP_DUTY_CYCLE_PCT ) )
     {
         if ( firmwareCall == TRUE ) // firmware call
         {
@@ -536,7 +536,7 @@
  *************************************************************************/
 F32 getCurrentBoostPumpDutyCyclePCT( void )
 {
-    F32 dutyCyclePct = convertDutyCycleCntToPct( getFluidPumpReadPWMDutyCycle( P40_PUMP ) );
+    F32 dutyCyclePct = convertDutyCycleCntToPct( P40_PUMP, getFluidPumpReadPWMDutyCycle( P40_PUMP ) );
 
     return dutyCyclePct;
 }
@@ -683,8 +683,8 @@
         pumpData.p40TargetPressure      = getTargetBoostPumpPressure();
         pumpData.p40TargetFlow          = getTargetBoostPumpFlowRateMLPM();
         pumpData.p40TargetDutyCycle     = getTargetBoostPumpDutyCyclePCT();
-        pumpData.p40PumpDutyCyclePct    = convertDutyCycleCntToPct( (U32)getFluidPumpPWMDutyCycle( P40_PUMP ) );
-        pumpData.p40PumpFBDutyCyclePct  = convertDutyCycleCntToPct( (U32)getFluidPumpReadPWMDutyCycle( P40_PUMP ) );
+        pumpData.p40PumpDutyCyclePct    = convertDutyCycleCntToPct( P40_PUMP, (U32)getFluidPumpPWMDutyCycle( P40_PUMP ) );
+        pumpData.p40PumpFBDutyCyclePct  = convertDutyCycleCntToPct( P40_PUMP, (U32)getFluidPumpReadPWMDutyCycle( P40_PUMP ) );
 
         broadcastData( MSG_ID_FP_BOOST_PUMP_DATA, COMM_BUFFER_OUT_CAN_FP_BROADCAST, (U08*)&pumpData, sizeof( BOOST_PUMP_DATA_T ) );
         boostPumpDataPublicationTimerCounter = 0;