Index: firmware/App/Controllers/ROPump.c
===================================================================
diff -u -rfd21f03d28eec499fb5c01bf595c57893db94406 -r60693bf21a8a0277eae54cbfcb6cfd68176b079a
--- firmware/App/Controllers/ROPump.c	(.../ROPump.c)	(revision fd21f03d28eec499fb5c01bf595c57893db94406)
+++ firmware/App/Controllers/ROPump.c	(.../ROPump.c)	(revision 60693bf21a8a0277eae54cbfcb6cfd68176b079a)
@@ -61,11 +61,11 @@
 #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)           ( ( ROP_PRESSURE_TO_PWM_SLOPE * pres + ROP_PRESSURE_TO_PWM_INTERCEPT ) / MAX_FLUID_PUMP_PWM_DUTY_CYCLE )
+#define ROP_PRESSURE_TO_PWM_PCT(pres)           ( ( ROP_PRESSURE_TO_PWM_SLOPE * pres + ROP_PRESSURE_TO_PWM_INTERCEPT ) / MAX_P12_FLUID_PUMP_PWM_DUTY_CYCLE )
 /// PWM log equation for flow converted to percentage.
-#define ROP_FLOW_TO_PWM_LOG_PCT(slope, intercept, flow) ( ( slope * log(flow) + intercept ) / MAX_FLUID_PUMP_PWM_DUTY_CYCLE )
+#define ROP_FLOW_TO_PWM_LOG_PCT(slope, intercept, flow) ( ( slope * log(flow) + intercept ) / MAX_P12_FLUID_PUMP_PWM_DUTY_CYCLE )
 /// PWM line equation for flow converted to percentage.
-#define ROP_FLOW_TO_PWM_LIN_PCT(slope, intercept, flow) ( ( slope * flow + intercept ) / MAX_FLUID_PUMP_PWM_DUTY_CYCLE )
+#define ROP_FLOW_TO_PWM_LIN_PCT(slope, intercept, flow) ( ( slope * flow + intercept ) / MAX_P12_FLUID_PUMP_PWM_DUTY_CYCLE )
 
 #define FP_FLOW_RATE_BELOW_TARGET_TIMEOUT_MS        ( 10 * MS_PER_SECOND )                                              ///< Timeout for flow rate below 75% of target flow rate
 #define FP_FLOW_RATE_BELOW_TARGET_CLEAR_MS          ( 10 * MS_PER_SECOND )                                              ///< Clear timeout for flow rate below target flow rate
@@ -116,7 +116,7 @@
 
     // Initialize RO pump PI controller to target pressure
     initializePIController( PI_CONTROLLER_ID_RO_PUMP_PRES, MIN_FLUID_PUMP_DUTY_CYCLE_PCT, ROP_PRESSURE_CONTROL_P_COEFFICIENT, ROP_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_P12_FLUID_PUMP_DUTY_CYCLE_PCT, FALSE, 0 );
 
     roPumpState                                 = RO_PUMP_OFF_STATE;
     isROPumpOn                                  = FALSE;
@@ -330,7 +330,7 @@
         if( ( TRUE == roPumpStartControl ) || ( currentFlowRate >= ( minRequiredFlowRate ) ) )
         {
             roPumpDutyCyclePctSet = runPIDController( PID_CONTROLLER_ID_RO_PUMP_FLOW, (F32)getTargetROPumpFlowRateMLPM(), currentFlowRate );
-            roPumpDutyCyclePctSet = MIN( roPumpDutyCyclePctSet, ( MAX_FLUID_PUMP_PWM_DUTY_CYCLE * MAX_FLUID_PUMP_DUTY_CYCLE_PCT ) );
+            roPumpDutyCyclePctSet = MIN( roPumpDutyCyclePctSet, ( MAX_P12_FLUID_PUMP_PWM_DUTY_CYCLE * MAX_P12_FLUID_PUMP_DUTY_CYCLE_PCT ) );
             setFluidPumpPctToPWMDutyCycle( P12_PUMP, roPumpDutyCyclePctSet );
 
             if ( FALSE == roPumpStartControl )
@@ -509,7 +509,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_P12_FLUID_PUMP_DUTY_CYCLE_PCT ) )
     {
         if ( firmwareCall == TRUE ) // firmware call
         {
@@ -578,7 +578,7 @@
  *************************************************************************/
 F32 getCurrentROPumpDutyCyclePCT( void )
 {
-    F32 dutyCyclePct = convertDutyCycleCntToPct( getFluidPumpReadPWMDutyCycle( P12_PUMP ) );
+    F32 dutyCyclePct = convertDutyCycleCntToPct( P12_PUMP, getFluidPumpReadPWMDutyCycle( P12_PUMP ) );
 
     return dutyCyclePct;
 }
@@ -782,8 +782,8 @@
         pumpData.p12TargetPressure      = getTargetROPumpPressure();
         pumpData.p12TargetFlow          = getTargetROPumpFlowRateMLPM();
         pumpData.p12TargetDutyCycle     = getTargetROPumpDutyCyclePCT();
-        pumpData.p12PumpDutyCyclePct    = convertDutyCycleCntToPct( (U32)getFluidPumpPWMDutyCycle( P12_PUMP ) );
-        pumpData.p12PumpFBDutyCyclePct  = convertDutyCycleCntToPct( (U32)getFluidPumpReadPWMDutyCycle( P12_PUMP ) );
+        pumpData.p12PumpDutyCyclePct    = convertDutyCycleCntToPct( P12_PUMP, (U32)getFluidPumpPWMDutyCycle( P12_PUMP ) );
+        pumpData.p12PumpFBDutyCyclePct  = convertDutyCycleCntToPct( P12_PUMP, (U32)getFluidPumpReadPWMDutyCycle( P12_PUMP ) );
 
         broadcastData( MSG_ID_FP_RO_PUMP_DATA, COMM_BUFFER_OUT_CAN_FP_BROADCAST, (U08*)&pumpData, sizeof( RO_PUMP_DATA_T ) );
         roPumpDataPublicationTimerCounter = 0;