Index: firmware/App/Controllers/DialOutFlow.c
===================================================================
diff -u -r2039b2a517f7868280bfb762cd4ff3341edd6c21 -r113f804decb50b9511bb8b7365288285fece6628
--- firmware/App/Controllers/DialOutFlow.c	(.../DialOutFlow.c)	(revision 2039b2a517f7868280bfb762cd4ff3341edd6c21)
+++ firmware/App/Controllers/DialOutFlow.c	(.../DialOutFlow.c)	(revision 113f804decb50b9511bb8b7365288285fece6628)
@@ -778,14 +778,13 @@
         dialOutBroadCastVariables.refUFVolMl = getTotalTargetDialOutUFVolumeInMl();
         dialOutBroadCastVariables.measUFVolMl = getTotalMeasuredUFVolumeInMl();
         dialOutBroadCastVariables.measRotSpdRPM = getMeasuredDialOutPumpRotorSpeed();
-#if 1   // TODO - remove test code
-        dialOutBroadCastVariables.measSpdRPM = ufMeasuredRate;
-#else
         dialOutBroadCastVariables.measSpdRPM = getMeasuredDialOutPumpSpeed();
-#endif
         dialOutBroadCastVariables.measMCSpdRPM = getMeasuredDialOutPumpMCSpeed();
         dialOutBroadCastVariables.measMCCurrmA = getMeasuredDialOutPumpMCCurrent();
         dialOutBroadCastVariables.setPWMpct = dialOutPumpPWMDutyCyclePctSet * FRACTION_TO_PERCENT_FACTOR;
+        dialOutBroadCastVariables.dopCorrOffset = dopRateCorrectionOffset;
+        dialOutBroadCastVariables.dopCalcRate = dopMeasuredRate;
+        dialOutBroadCastVariables.ufCalcRate = ufMeasuredRate;
 
         broadcastData( MSG_ID_DIALYSATE_OUT_FLOW_DATA, COMM_BUFFER_OUT_CAN_HD_BROADCAST, (U08*)&dialOutBroadCastVariables, sizeof( DIAL_OUT_FLOW_DATA_T ) );
         dialOutFlowDataPublicationTimerCounter = 0;