Index: firmware/App/Controllers/BloodFlow.c
===================================================================
diff -u -rd4850547b287cc1f94ea3617a1902c5278ea86b4 -r4b22b45e775c0525bc1d76e83e265af91a59785e
--- firmware/App/Controllers/BloodFlow.c	(.../BloodFlow.c)	(revision d4850547b287cc1f94ea3617a1902c5278ea86b4)
+++ firmware/App/Controllers/BloodFlow.c	(.../BloodFlow.c)	(revision 4b22b45e775c0525bc1d76e83e265af91a59785e)
@@ -21,6 +21,10 @@
 #include "can.h"
 #include "etpwm.h"
 
+// TODO - test includes - remove later
+#include "DialInFlow.h"
+#include "PresOccl.h"
+
 #include "FPGA.h"
 #include "InternalADC.h"
 #include "OperationModes.h"
@@ -799,28 +803,29 @@
 static void publishBloodFlowData( void )
 {
     // publish blood flow data on interval
+#ifndef READ_FPGA_ASYNC_DATA
     if ( ++bloodFlowDataPublicationTimerCounter >= getPublishBloodFlowDataInterval() )
+#endif
     {
         S32 flowStPt = (S32)getTargetBloodFlowRate();
-#ifndef SHOW_RAW_FLOW_VALUES
         F32 measFlow = getMeasuredBloodFlowRate();
-#else
-        F32 measFlow = getFPGABloodFlow();
-#endif
         F32 measRotSpd = getMeasuredBloodPumpRotorSpeed();
         F32 measSpd = getMeasuredBloodPumpSpeed();
         F32 measMCSpd = getMeasuredBloodPumpMCSpeed();
         F32 measMCCurr = getMeasuredBloodPumpMCCurrent();
         F32 pumpPWMPctDutyCycle = bloodPumpPWMDutyCyclePctSet * FRACTION_TO_PERCENT_FACTOR;
-#ifdef DEBUG_ENABLED
+#ifdef READ_FPGA_ASYNC_DATA
         // TODO - temporary debug code - remove later
         char debugFlowStr[ 256 ];
 
-//        F32 measFlowRaw = getFPGABloodFlow();
-//        F32 dialFlow = getMeasuredDialInFlowRate();
-//        F32 dialFlowRaw = getFPGADialysateFlow();
-        sprintf( debugFlowStr, "Tgt:%5d, Flow:%5d, Speed-MC:%5d RPM, Speed:%5d RPM, Rotor:%5d RPM, Curr:%5d mA, PWM:%5d \n", flowStPt, (S32)measFlow, (S32)measMCSpd, (S32)measSpd, (S32)measRotSpd, (S32)measMCCurr, (S32)pumpPWMPctDutyCycle );
-//        sprintf( debugFlowStr, "Blood: %5d, %5d     Dial: %5d, %5d\n", (S32)measFlowRaw, (S32)measFlow, (S32)dialFlowRaw, (S32)dialFlow );
+        F32 measFlowSig = getFPGABloodFlowSignalStrength() * 10000.0;
+        F32 dialFlow = getMeasuredDialInFlowRate();
+        F32 dialFlowSig = getFPGADialysateFlowSignalStrength() * 10000.0;
+        F32 bldOccl = getMeasuredBloodPumpOcclusion();
+        F32 dpiOccl = getMeasuredDialInPumpOcclusion();
+        F32 dpoOccl = getMeasuredDialOutPumpOcclusion();
+
+        sprintf( debugFlowStr, "Blood: %5d, %5d, %5d     Dial-I: %5d, %5d, %5d    Dial-O: %5d\n", (S32)measFlowSig, (S32)measFlow, (S32)bldOccl, (S32)dialFlowSig, (S32)dialFlow, (S32)dpiOccl, (S32)dpoOccl );
         sendDebugData( (U08*)debugFlowStr, strlen(debugFlowStr) );
 #endif
         broadcastBloodFlowData( flowStPt, measFlow, measRotSpd, measSpd, measMCSpd, measMCCurr, pumpPWMPctDutyCycle );