Index: firmware/App/Controllers/BloodFlow.c
===================================================================
diff -u -rdf1640ceeb08887cd506c4e1b7148db66e1b6200 -rb9eccdfcf1727112664b85977a16a18811b9fde7
--- firmware/App/Controllers/BloodFlow.c	(.../BloodFlow.c)	(revision df1640ceeb08887cd506c4e1b7148db66e1b6200)
+++ firmware/App/Controllers/BloodFlow.c	(.../BloodFlow.c)	(revision b9eccdfcf1727112664b85977a16a18811b9fde7)
@@ -380,7 +380,7 @@
  * hall sensor detection.  Calculates rotor speed (in RPM).  Stops pump if
  * there is a pending request to home the pump.
  * @details Inputs: bpRotorRevStartTime, bpStopAtHomePosition
- * @details Outputs: bpRotorRevStartTime, bloodPumpRotorSpeedRPM
+ * @details Outputs: bpRotorRevStartTime, bloodPumpRotorSpeedRPM, bloodPumpRotorCounter
  * @return none
  *************************************************************************/
 void signalBloodPumpRotorHallSensor( void )
@@ -1137,8 +1137,8 @@
  * @brief
  * The checkBloodPumpMCCurrent function checks the measured MC current vs.
  * the set state of the blood pump (stopped or running).
- * @details Inputs:
- * @details Outputs:
+ * @details Inputs: BP motor controller measured current.
+ * @details Outputs: Alarm triggered it current too high.
  * @return none
  *************************************************************************/
 static void checkBloodPumpMCCurrent( void )
Index: firmware/App/Controllers/DialInFlow.c
===================================================================
diff -u -r8bd1ae47aa13a843aa8abd6321ddc050deacb4a6 -rb9eccdfcf1727112664b85977a16a18811b9fde7
--- firmware/App/Controllers/DialInFlow.c	(.../DialInFlow.c)	(revision 8bd1ae47aa13a843aa8abd6321ddc050deacb4a6)
+++ firmware/App/Controllers/DialInFlow.c	(.../DialInFlow.c)	(revision b9eccdfcf1727112664b85977a16a18811b9fde7)
@@ -402,10 +402,6 @@
     HD_OP_MODE_T opMode = getCurrentOperationMode();
     U16 dipRPM = getIntADCReading( INT_ADC_DIAL_IN_PUMP_SPEED );
     U16 dipmA = getIntADCReading( INT_ADC_DIAL_IN_PUMP_MOTOR_CURRENT );
-    U08 fpReadCtr = getFPGADialysateFlowFastPacketReadCounter();
-    U08 spReadCtr = getFPGADialysateFlowSlowPacketReadCounter();
-    U08 flowErrorCtr = getFPGADialysateFlowErrorCounter();
-    U08 flowStatus = getFPGADialysateFlowMeterStatus();
     F64 dipFlow;
 
     // Process new dialysate flow readings
Index: firmware/App/Controllers/PresOccl.c
===================================================================
diff -u -r8bd1ae47aa13a843aa8abd6321ddc050deacb4a6 -rb9eccdfcf1727112664b85977a16a18811b9fde7
--- firmware/App/Controllers/PresOccl.c	(.../PresOccl.c)	(revision 8bd1ae47aa13a843aa8abd6321ddc050deacb4a6)
+++ firmware/App/Controllers/PresOccl.c	(.../PresOccl.c)	(revision b9eccdfcf1727112664b85977a16a18811b9fde7)
@@ -789,7 +789,7 @@
  * @brief
  * The execPresOcclDryTest function executes the PresOccl dry self-test.
  * @details Inputs: none
- * @details Outputs: none
+ * @details Outputs: Triggers no cartridge loaded alarm if no cartridge detected.
  * @return the result of the PresOccl dry self-test.
  *************************************************************************/
 SELF_TEST_STATUS_T execPresOcclDryTest( void )
Index: firmware/App/Controllers/SyringePump.c
===================================================================
diff -u -r8bd1ae47aa13a843aa8abd6321ddc050deacb4a6 -rb9eccdfcf1727112664b85977a16a18811b9fde7
--- firmware/App/Controllers/SyringePump.c	(.../SyringePump.c)	(revision 8bd1ae47aa13a843aa8abd6321ddc050deacb4a6)
+++ firmware/App/Controllers/SyringePump.c	(.../SyringePump.c)	(revision b9eccdfcf1727112664b85977a16a18811b9fde7)
@@ -1769,12 +1769,12 @@
  *************************************************************************/
 static void calcStepperToggleTimeForTargetRate( F32 rate )
 {
-    double temp;
+    F64 temp;
     F32 conv;
 
     // Convert given rate to stepper toggle period
-    temp = (double)rate * SYRINGE_MICRO_STEPS_PER_ML;        // = uSteps/hr
-    temp /= (double)( MIN_PER_HOUR * SEC_PER_MIN);           // = uSteps/sec
+    temp = (F64)rate * SYRINGE_MICRO_STEPS_PER_ML;           // = uSteps/hr
+    temp /= (F64)( MIN_PER_HOUR * SEC_PER_MIN);              // = uSteps/sec
     temp /= MICRO_SECONDS_PER_SECOND;                        // = uSteps/uSec
     conv = (F32)temp * SYRINGE_TOGGLES_PER_STEP;             // = toggles/uSec
     conv = 1.0 / conv;                                       // = uSec/toggle
@@ -1803,7 +1803,7 @@
         U32 nextIdx = INC_WRAP( syringePumpMotorSpeedCalcIdx, 0, SYRINGE_PUMP_SPEED_CALC_BUFFER_LEN - 1 );
         S32 countsPerSec = pos - syringePumpLastPositions[ syringePumpMotorSpeedCalcIdx ];     // Calc delta between pos 1 second ago and pos now
         S32 countsPerHr = countsPerSec * ( MIN_PER_HOUR * SEC_PER_MIN);
-        F32 mLPerHr = (F32)((double)countsPerHr / (double)SYRINGE_ENCODER_COUNTS_PER_ML);
+        F32 mLPerHr = (F32)((F64)countsPerHr / (F64)SYRINGE_ENCODER_COUNTS_PER_ML);
 
         // Set latest measured rate
         syringePumpMeasRate.data = mLPerHr;
Index: firmware/App/Controllers/Voltages.c
===================================================================
diff -u -r8bd1ae47aa13a843aa8abd6321ddc050deacb4a6 -rb9eccdfcf1727112664b85977a16a18811b9fde7
--- firmware/App/Controllers/Voltages.c	(.../Voltages.c)	(revision 8bd1ae47aa13a843aa8abd6321ddc050deacb4a6)
+++ firmware/App/Controllers/Voltages.c	(.../Voltages.c)	(revision b9eccdfcf1727112664b85977a16a18811b9fde7)
@@ -171,17 +171,17 @@
     VOLTAGES_STATE_T result = VOLTAGES_MONITOR_STATE;
 
     // Get latest signal levels
-    voltages[ MONITORED_LINE_1_2V ].data                 = getIntADCVoltageConverted( INT_ADC_1_2V_PROCESSOR );
-    voltages[ MONITORED_LINE_3_3V ].data                 = getIntADCVoltageConverted( INT_ADC_3_3V );
-    voltages[ MONITORED_LINE_5V_LOGIC ].data             = getIntADCVoltageConverted( INT_ADC_5V_LOGIC );
-    voltages[ MONITORED_LINE_5V_SENSORS ].data           = getIntADCVoltageConverted( INT_ADC_5V_SENSORS );
-    voltages[ MONITORED_LINE_24V ].data                  = getIntADCVoltageConverted( INT_ADC_24V_ACTUATORS );
-    voltages[ MONITORED_LINE_24V_REGEN ].data            = getIntADCVoltageConverted( INT_ADC_24V_ACTUATORS_REG );
-    voltages[ MONITORED_LINE_FPGA_REF_V ].data           = getIntADCVoltageConverted( INT_ADC_1_25_FPGA_ADC_REF );
-    voltages[ MONITORED_LINE_PBA_REF_V ].data            = getIntADCVoltageConverted( INT_ADC_PBA_ADC_REF );
-    voltages[ MONITORED_LINE_FPGA_VCC_V ].data           = getFPGAVcc();
-    voltages[ MONITORED_LINE_FPGA_AUX_V ].data           = getFPGAVccAux();
-    voltages[ MONITORED_LINE_FPGA_PVN_V ].data           = getFPGAVpvn();
+    voltages[ MONITORED_LINE_1_2V ].data       = getIntADCVoltageConverted( INT_ADC_1_2V_PROCESSOR );
+    voltages[ MONITORED_LINE_3_3V ].data       = getIntADCVoltageConverted( INT_ADC_3_3V );
+    voltages[ MONITORED_LINE_5V_LOGIC ].data   = getIntADCVoltageConverted( INT_ADC_5V_LOGIC );
+    voltages[ MONITORED_LINE_5V_SENSORS ].data = getIntADCVoltageConverted( INT_ADC_5V_SENSORS );
+    voltages[ MONITORED_LINE_24V ].data        = getIntADCVoltageConverted( INT_ADC_24V_ACTUATORS );
+    voltages[ MONITORED_LINE_24V_REGEN ].data  = getIntADCVoltageConverted( INT_ADC_24V_ACTUATORS_REG );
+    voltages[ MONITORED_LINE_FPGA_REF_V ].data = getIntADCVoltageConverted( INT_ADC_1_25_FPGA_ADC_REF );
+    voltages[ MONITORED_LINE_PBA_REF_V ].data  = getIntADCVoltageConverted( INT_ADC_PBA_ADC_REF );
+    voltages[ MONITORED_LINE_FPGA_VCC_V ].data = getFPGAVcc();
+    voltages[ MONITORED_LINE_FPGA_AUX_V ].data = getFPGAVccAux();
+    voltages[ MONITORED_LINE_FPGA_PVN_V ].data = getFPGAVpvn();
 
     // Check voltage ranges
     checkVoltageRanges();