Index: firmware/App/Controllers/BloodFlow.c =================================================================== diff -u -rb5756e5b5041288a2e95585990cce5a93756d693 -r848865316d989b1e541b234aefcb99891c92a481 --- firmware/App/Controllers/BloodFlow.c (.../BloodFlow.c) (revision b5756e5b5041288a2e95585990cce5a93756d693) +++ firmware/App/Controllers/BloodFlow.c (.../BloodFlow.c) (revision 848865316d989b1e541b234aefcb99891c92a481) @@ -819,14 +819,14 @@ // TODO - temporary debug code - remove later char debugFlowStr[ 256 ]; - F32 measFlowSig = getFPGABloodFlowSignalStrength() * 10000.0; + F32 measFlowSig = getFPGABloodFlowSignalStrength() * 100.0; F32 dialFlow = getMeasuredDialInFlowRate(); - F32 dialFlowSig = getFPGADialysateFlowSignalStrength() * 10000.0; + F32 dialFlowSig = getFPGADialysateFlowSignalStrength() * 100.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 ); + sprintf( debugFlowStr, "Blood: %5.1f, %6.1f, %6.1f Dial-I: %5.1f, %6.1f, %6.1f Dial-O: %6.1f\n", measFlowSig, measFlow, bldOccl, dialFlowSig, dialFlow, dpiOccl, dpoOccl ); sendDebugData( (U08*)debugFlowStr, strlen(debugFlowStr) ); #else broadcastBloodFlowData( flowStPt, measFlow, measRotSpd, measSpd, measMCSpd, measMCCurr, pumpPWMPctDutyCycle ); @@ -864,6 +864,7 @@ *************************************************************************/ static void filterBloodFlowReadings( F32 flow ) { +#ifndef RAW_FLOW_SENSOR_DATA if ( flowReadingsCount >= SIZE_OF_ROLLING_AVG ) { flowReadingsTotal -= flowReadings[ flowReadingsIdx ]; @@ -873,6 +874,9 @@ flowReadingsIdx = INC_WRAP( flowReadingsIdx, 0, SIZE_OF_ROLLING_AVG - 1 ); flowReadingsCount = INC_CAP( flowReadingsCount, SIZE_OF_ROLLING_AVG ); measuredBloodFlowRate.data = flowReadingsTotal / (F32)flowReadingsCount; +#else + measuredBloodFlowRate.data = flow; +#endif } /*********************************************************************//**