Index: firmware/App/Controllers/BloodFlow.h
===================================================================
diff -u -r02fa169f02dd5a8caf27d1ea4441c74ba38317e8 -r8cebc7f282f403c99f712d422454c15414b6fc73
--- firmware/App/Controllers/BloodFlow.h	(.../BloodFlow.h)	(revision 02fa169f02dd5a8caf27d1ea4441c74ba38317e8)
+++ firmware/App/Controllers/BloodFlow.h	(.../BloodFlow.h)	(revision 8cebc7f282f403c99f712d422454c15414b6fc73)
@@ -48,7 +48,7 @@
     F32 measMCSpd;
     F32 measMCCurr;
     F32 pwmDC;
-    F32 flowSigStrength;
+    U32 rotorCount;
 } BLOOD_PUMP_STATUS_PAYLOAD_T;
 
 // ********** public function prototypes **********
@@ -69,9 +69,6 @@
 SELF_TEST_STATUS_T execBloodFlowTest( void );
 
 F32  getMeasuredBloodFlowRate( void );
-#ifdef USE_FMB_FLOW_SENSOR
-F32  getMeasuredBloodFlowSignalStrength( void);
-#endif
 F32  getMeasuredBloodPumpRotorSpeed( void );
 F32  getMeasuredBloodPumpSpeed( void );
 F32  getMeasuredBloodPumpMCSpeed( void );
@@ -90,10 +87,8 @@
 BOOL testResetMeasuredBloodPumpMCSpeedOverride( void );
 BOOL testSetMeasuredBloodPumpMCCurrentOverride( F32 value );
 BOOL testResetMeasuredBloodPumpMCCurrentOverride( void );
-#ifdef USE_FMB_FLOW_SENSOR
-BOOL testSetMeasuredBloodFlowSignalStrengthOverride( F32 value );
-BOOL testResetMeasuredBloodFlowSignalStrengthOverride( void );
-#endif
+BOOL testSetBloodPumpRotorCountOverride( U32 value );
+BOOL testResetBloodPumpRotorCountOverride( void );
 
 /**@}*/