Index: firmware/App/Controllers/ROPump.c
===================================================================
diff -u -ra4ca1bca4db0268fad8ea2228f6cf9db52b69330 -r73fb20333b1987ed00456d32f41ecbf06b0d1b9e
--- firmware/App/Controllers/ROPump.c	(.../ROPump.c)	(revision a4ca1bca4db0268fad8ea2228f6cf9db52b69330)
+++ firmware/App/Controllers/ROPump.c	(.../ROPump.c)	(revision 73fb20333b1987ed00456d32f41ecbf06b0d1b9e)
@@ -646,12 +646,12 @@
         pumpData.p12PumpState           = (U32)roPumpState;
         pumpData.p12PumpDutyCycle       = (U32)getFluidPumpPWMDutyCycle( P12_PUMP );
         pumpData.p12PumpFBDutyCycle     = (U32)getFluidPumpReadPWMDutyCycle( P12_PUMP );
-        pumpData.p12PumpSpeed           = getFluidPumpRPM( P12_PUMP );
-        pumpData.p12TargetPressure      = getTargetROPumpPressure();
+        pumpData.p12PumpSpeed           = getPIControllerSignals(PI_CONTROLLER_ID_RO_PUMP_FLOW,CONTROLLER_SIGNAL_CONTROL);
+        pumpData.p12TargetPressure      = getPIControllerSignals(PI_CONTROLLER_ID_RO_PUMP_FLOW, CONTROLLER_SIGNAL_ERROR);
         pumpData.p12TargetFlow          = getTargetROPumpFlowRateMLPM();
-        pumpData.p12TargetDutyCycle     = getTargetROPumpDutyCyclePCT();
-        pumpData.p12PumpDutyCyclePct    = convertDutyCycleCntToPct( (U32)getFluidPumpPWMDutyCycle( P12_PUMP ) );
-        pumpData.p12PumpFBDutyCyclePct  = convertDutyCycleCntToPct( (U32)getFluidPumpReadPWMDutyCycle( P12_PUMP ) );
+        pumpData.p12TargetDutyCycle     = getPIControllerSignals(PI_CONTROLLER_ID_RO_PUMP_FLOW, CONTROLLER_SIGNAL_PROPORTIONAL_OUTPUT);
+        pumpData.p12PumpDutyCyclePct    = getPIControllerSignals(PI_CONTROLLER_ID_RO_PUMP_FLOW, CONTROLLER_SIGNAL_INTEGRAL_OUTPUT);
+        pumpData.p12PumpFBDutyCyclePct  = getPIControllerSignals(PI_CONTROLLER_ID_RO_PUMP_FLOW, CONTROLLER_SIGNAL_ERROR_SUM_AFTER_WINDUP);
 
         broadcastData( MSG_ID_FP_RO_PUMP_DATA, COMM_BUFFER_OUT_CAN_FP_BROADCAST, (U08*)&pumpData, sizeof( RO_PUMP_DATA_T ) );
         roPumpDataPublicationTimerCounter = 0;