Index: firmware/App/Controllers/BloodFlow.c
===================================================================
diff -u -r4a41a54d255afc5cef0599e2a832927ed2b0ee5d -r22f7bcd7e26dc6be337fdb6adbc9281e8f60dbbc
--- firmware/App/Controllers/BloodFlow.c	(.../BloodFlow.c)	(revision 4a41a54d255afc5cef0599e2a832927ed2b0ee5d)
+++ firmware/App/Controllers/BloodFlow.c	(.../BloodFlow.c)	(revision 22f7bcd7e26dc6be337fdb6adbc9281e8f60dbbc)
@@ -341,12 +341,10 @@
     {
         // set initial PWM duty cycle
         bloodPumpPWMDutyCyclePctSet = BP_PWM_ZERO_OFFSET + MAX_BLOOD_PUMP_PWM_STEP_CHANGE;
-        etpwmSetCmpA( etpwmREG1, (U32)FLOAT_TO_INT_WITH_ROUND( bloodPumpPWMDutyCyclePctSet * (F32)(etpwmREG1->TBPRD) ) );
+        etpwmSetCmpA( etpwmREG1, (U32)( (S32)( ( bloodPumpPWMDutyCyclePctSet * (F32)(etpwmREG1->TBPRD) ) + FLOAT_TO_INT_ROUNDUP_OFFSET ) ) );
         // allow blood pump to run in requested direction
         setBloodPumpDirection( bloodPumpDirection );
         releaseBloodPumpStop();
-        // start PWM for blood pump
-        etpwmStartTBCLK();
         isBloodPumpOn = TRUE;
         result = BLOOD_PUMP_RAMPING_UP_STATE;
     }
@@ -373,7 +371,7 @@
     {
         // start ramp down to stop
         bloodPumpPWMDutyCyclePctSet -= MAX_BLOOD_PUMP_PWM_STEP_CHANGE;
-        etpwmSetCmpA( etpwmREG1, (U32)FLOAT_TO_INT_WITH_ROUND( bloodPumpPWMDutyCyclePctSet * (F32)(etpwmREG1->TBPRD) ) );
+        etpwmSetCmpA( etpwmREG1, (U32)( (S32)( ( bloodPumpPWMDutyCyclePctSet * (F32)(etpwmREG1->TBPRD) ) + FLOAT_TO_INT_ROUNDUP_OFFSET ) ) );
         result = BLOOD_PUMP_RAMPING_DOWN_STATE;
     }
     // have we reached end of ramp up?
@@ -387,7 +385,7 @@
     else
     {
         bloodPumpPWMDutyCyclePctSet += MAX_BLOOD_PUMP_PWM_STEP_CHANGE;
-        etpwmSetCmpA( etpwmREG1, (U32)FLOAT_TO_INT_WITH_ROUND( bloodPumpPWMDutyCyclePctSet * (F32)(etpwmREG1->TBPRD) ) );
+        etpwmSetCmpA( etpwmREG1, (U32)( (S32)( ( bloodPumpPWMDutyCyclePctSet * (F32)(etpwmREG1->TBPRD) ) + FLOAT_TO_INT_ROUNDUP_OFFSET ) ) );
     }
 
     return result;
@@ -424,7 +422,7 @@
     else
     {
         bloodPumpPWMDutyCyclePctSet -= MAX_BLOOD_PUMP_PWM_STEP_CHANGE;
-        etpwmSetCmpA( etpwmREG1, (U32)FLOAT_TO_INT_WITH_ROUND( bloodPumpPWMDutyCyclePctSet * (F32)(etpwmREG1->TBPRD) ) );
+        etpwmSetCmpA( etpwmREG1, (U32)( (S32)( ( bloodPumpPWMDutyCyclePctSet * (F32)(etpwmREG1->TBPRD) ) + FLOAT_TO_INT_ROUNDUP_OFFSET ) ) );
     }
 
     return result;
@@ -452,7 +450,7 @@
     {
         newPWM = runPIController( PI_CONTROLLER_ID_BLOOD_FLOW, tgtFlow, actFlow );
         bloodPumpPWMDutyCyclePctSet = newPWM;
-        etpwmSetCmpA( etpwmREG1, (U32)FLOAT_TO_INT_WITH_ROUND( bloodPumpPWMDutyCyclePctSet * (F32)(etpwmREG1->TBPRD) ) );
+        etpwmSetCmpA( etpwmREG1, (U32)( (S32)( ( bloodPumpPWMDutyCyclePctSet * (F32)(etpwmREG1->TBPRD) ) + FLOAT_TO_INT_ROUNDUP_OFFSET ) ) );
         bpControlTimerCounter = 0;
     }
 
@@ -473,7 +471,6 @@
     isBloodPumpOn = FALSE;
     bloodPumpPWMDutyCyclePctSet = 0.0;
     etpwmSetCmpA( etpwmREG1, 0 );
-    etpwmStopTBCLK();
     SET_BP_STOP();
 }
 
@@ -656,6 +653,7 @@
     flowReadingsTotal = 0.0;
     flowReadingsIdx = 0;
     flowReadingsCount = 0;
+    flowReadingsTmrCtr = 0;
     bpControlTimerCounter = 0;
 }
 
@@ -711,7 +709,7 @@
                 break;
 
             default:
-                // TODO - s/w fault?
+                SET_ALARM_WITH_2_U32_DATA( ALARM_ID_SOFTWARE_FAULT, SW_FAULT_ID_BLOOD_FLOW_INVALID_FILTER_STATE, flowReadingsTmrCtr )
                 break;
         }
     }