Index: firmware/App/Controllers/PresOccl.c
===================================================================
diff -u -rd91a24c730aeb5cd7e3eba9ef4eca78e442911f8 -r37a8a58b766a496b39241dd7ae46dc10dbda35e4
--- firmware/App/Controllers/PresOccl.c	(.../PresOccl.c)	(revision d91a24c730aeb5cd7e3eba9ef4eca78e442911f8)
+++ firmware/App/Controllers/PresOccl.c	(.../PresOccl.c)	(revision 37a8a58b766a496b39241dd7ae46dc10dbda35e4)
@@ -64,8 +64,6 @@
 static PRESSURE_STATE_T presOcclState = PRESSURE_INIT_STATE;                    ///< current state of pressure monitor state machine.
 static U32 presOcclDataPublicationTimerCounter = 0;                             ///< used to schedule pressure data publication to CAN bus.
 
-static OVERRIDE_F32_T measuredBloodFlowRate = { 0.0, 0.0, 0.0, 0 };             ///< measured blood flow rate
-
 static OVERRIDE_U32_T presOcclDataPublishInterval = { PRES_OCCL_DATA_PUB_INTERVAL, PRES_OCCL_DATA_PUB_INTERVAL, 0, 0 }; ///< interval (in ms) at which to publish pressure/occlusion data to CAN bus.
 static OVERRIDE_F32_T arterialPressure = {0.0, 0.0, 0.0, 0 };                   ///< measured arterial pressure.
 static OVERRIDE_F32_T venousPressure = {0.0, 0.0, 0.0, 0 };                     ///< measured venous pressure.
@@ -74,7 +72,7 @@
 static OVERRIDE_F32_T dialOutPumpOcclusion = {0.0, 0.0, 0.0, 0 };               ///< measured dialysate outlet pump occlusion pressure.
 
 static PRESSURE_SELF_TEST_STATE_T presOcclSelfTestState = PRESSURE_SELF_TEST_STATE_START;  ///< current pressure self-test state.
-static U32 bloodPumpSelfTestTimerCount = 0;                                     ///< timer counter for pressure self-test.
+static U32 presOcclSelfTestTimerCount = 0;                                      ///< timer counter for pressure self-test.
 
 static F32 arterialPressureLowLimitmmHG = 0.0;                                  ///< lower alarm limit for arterial pressure.
 static F32 arterialPressureHighLimitmmHG = 0.0;                                 ///< upper alarm limit for arterial pressure.
@@ -96,9 +94,8 @@
 /*********************************************************************//**
  * @brief
  * The initPresOccl function initializes the initPresOccl module.
- * @details
- * Inputs : none
- * Outputs : initPresOccl module initialized.
+ * @details Inputs: none
+ * @details Outputs: Pressures and Occlusions module initialized.
  * @return none
  *************************************************************************/
 void initPresOccl( void )
@@ -110,9 +107,8 @@
  * @brief
  * The setPressureLimits function sets the lower and upper alarm limits
  * for a given pressure sensor.
- * @details
- * Inputs : none
- * Outputs : pressure limits
+ * @details Inputs: none
+ * @details Outputs: pressure limits
  * @param sensor pressure sensor we are setting limits for
  * @param low lower alarm limit (mmHg)
  * @param high upper alarm limit (mmHg)
@@ -142,9 +138,8 @@
  * @brief
  * The setOcclusionThreshold function sets the occlusion pressure threshold
  * for a given occlusion sensor.
- * @details
- * Inputs : none
- * Outputs : pressure threshold
+ * @details Inputs: none
+ * @details Outputs: pressure threshold
  * @param sensor occlusion sensor we are setting threshold for
  * @param threshold pressure threshold above which indicates an occlusion (mmHg)
  * @return none
@@ -174,9 +169,8 @@
 /*********************************************************************//**
  * @brief
  * The execPresOccl function executes the pressure and occlusion monitor.
- * @details
- * Inputs : presOcclState
- * Outputs : presOcclState
+ * @details Inputs: presOcclState
+ * @details Outputs: presOcclState
  * @return none
  *************************************************************************/
 void execPresOccl( void )
@@ -205,9 +199,8 @@
  * @brief
  * The handlePresOcclInitState function handles the pres/occl initialize state
  * of the pressure/occlusion monitor state machine.
- * @details
- * Inputs : TBD
- * Outputs : TBD
+ * @details Inputs: none
+ * @details Outputs: none
  * @return next state
  *************************************************************************/
 static PRESSURE_STATE_T handlePresOcclInitState( void )
@@ -221,9 +214,8 @@
  * @brief
  * The handlePresOcclContReadState function handles the continuous read state
  * of the pressure/occlusion monitor state machine.
- * @details
- * Inputs : TBD
- * Outputs : pressure sensor values updated
+ * @details Inputs: FPGA pressure/occlusion readings
+ * @details Outputs: pressure sensor values updated
  * @return next state
  *************************************************************************/
 static PRESSURE_STATE_T handlePresOcclContReadState( void )
@@ -257,9 +249,8 @@
  * @brief
  * The checkPressureLimits function gets the pressure/occlusion data
  * publication interval.
- * @details
- * Inputs : occlusion pressures for the pumps
- * Outputs :
+ * @details Inputs: occlusion pressures for the pumps
+ * @details Outputs: alarm(s) may be triggered
  * @return none
  *************************************************************************/
 static void checkOcclusions( void )
@@ -291,29 +282,26 @@
  * @brief
  * The getPublishPresOcclDataInterval function gets the pressure/occlusion data
  * publication interval.
- * @details
- * Inputs : presOcclDataPublishInterval
- * Outputs : none
+ * @details Inputs: presOcclDataPublishInterval
+ * @details Outputs: none
  * @return the current pressure/occlusion data publication interval (in task intervals).
  *************************************************************************/
 DATA_GET( U32, getPublishPresOcclDataInterval, presOcclDataPublishInterval )
 
 /*********************************************************************//**
  * @brief
  * The getMeasuredArterialPressure function gets the current arterial pressure.
- * @details
- * Inputs : arterialPressure
- * Outputs : none
+ * @details Inputs: arterialPressure
+ * @details Outputs: none
  * @return the current arterial pressure (in mmHg).
  *************************************************************************/
 DATA_GET( F32, getMeasuredArterialPressure, arterialPressure )
 
 /*********************************************************************//**
  * @brief
  * The getMeasuredVenousPressure function gets the measured venous pressure.
- * @details
- * Inputs : venousPressure
- * Outputs : none
+ * @details Inputs: venousPressure
+ * @details Outputs: none
  * @return the current venous pressure (in mmHg).
  *************************************************************************/
 DATA_GET( F32, getMeasuredVenousPressure, venousPressure )
@@ -322,9 +310,8 @@
  * @brief
  * The getMeasuredBloodPumpOcclusion function gets the measured blood pump
  * occlusion pressure.
- * @details
- * Inputs : bloodPumpOcclusion
- * Outputs : none
+ * @details Inputs: bloodPumpOcclusion
+ * @details Outputs: none
  * @return the current blood pump occlusion pressure (in mmHg).
  *************************************************************************/
 DATA_GET( F32, getMeasuredBloodPumpOcclusion, bloodPumpOcclusion )
@@ -333,9 +320,8 @@
  * @brief
  * The getMeasuredDialInPumpOcclusion function gets the measured dialysate
  * inlet pump occlusion pressure.
- * @details
- * Inputs : dialInPumpOcclusion
- * Outputs : none
+ * @details Inputs: dialInPumpOcclusion
+ * @details Outputs: none
  * @return the current dialysis inlet pump occlusion pressure (in mmHg).
  *************************************************************************/
 DATA_GET( F32, getMeasuredDialInPumpOcclusion, dialInPumpOcclusion )
@@ -344,9 +330,8 @@
  * @brief
  * The getMeasuredDialOutPumpOcclusion function gets the measured dialysate
  * outlet pump occlusion pressure.
- * @details
- * Inputs : dialOutPumpOcclusion
- * Outputs : none
+ * @details Inputs: dialOutPumpOcclusion
+ * @details Outputs: none
  * @return the current dialysis outlet pump occlusion pressure (in mmHg).
  *************************************************************************/
 DATA_GET( F32, getMeasuredDialOutPumpOcclusion, dialOutPumpOcclusion )
@@ -355,9 +340,8 @@
  * @brief
  * The publishPresOcclData function publishes pressure/occlusion data at the
  * set interval.
- * @details
- * Inputs : TBD
- * Outputs : Pressure/occlusion data are published to CAN bus.
+ * @details Inputs: latest pressure and occlusion readings
+ * @details Outputs: Pressure/occlusion data are published to CAN bus.
  * @return none
  *************************************************************************/
 static void publishPresOcclData( void )
@@ -380,9 +364,8 @@
  * @brief
  * The execPresOcclTest function executes the state machine for the
  * PresOccl self-test.
- * @details
- * Inputs : none
- * Outputs : none
+ * @details Inputs: none
+ * @details Outputs: none
  * @return the current state of the PresOccl self-test.
  *************************************************************************/
 SELF_TEST_STATUS_T execPresOcclTest( void )
@@ -404,9 +387,8 @@
  * @brief
  * The testSetPresOcclDataPublishIntervalOverride function overrides the
  * pressure and occlusion data publish interval.
- * @details
- * Inputs : none
- * Outputs : presOcclDataPublishInterval
+ * @details Inputs: none
+ * @details Outputs: presOcclDataPublishInterval
  * @param value override pressure and occlusion data publish interval with (in ms)
  * @return TRUE if override successful, FALSE if not
  *************************************************************************/
@@ -430,9 +412,8 @@
  * @brief
  * The testResetPresOcclDataPublishIntervalOverride function resets the override
  * of the pressure and occlusion data publish interval.
- * @details
- * Inputs : none
- * Outputs : presOcclDataPublishInterval
+ * @details Inputs: none
+ * @details Outputs: presOcclDataPublishInterval
  * @return TRUE if override reset successful, FALSE if not
  *************************************************************************/
 BOOL testResetPresOcclDataPublishIntervalOverride( void )
@@ -453,9 +434,8 @@
  * @brief
  * The testSetArterialPressureOverride function overrides the measured arterial
  * pressure.
- * @details
- * Inputs : none
- * Outputs : arterialPressure
+ * @details Inputs: none
+ * @details Outputs: arterialPressure
  * @param value override arterial pressure (in mmHg)
  * @return TRUE if override successful, FALSE if not
  *************************************************************************/
@@ -477,9 +457,8 @@
  * @brief
  * The testResetArterialPressureOverride function resets the override of the
  * arterial pressure.
- * @details
- * Inputs : none
- * Outputs : arterialPressure
+ * @details Inputs: none
+ * @details Outputs: arterialPressure
  * @return TRUE if reset successful, FALSE if not
  *************************************************************************/
 BOOL testResetArterialPressureOverride( void )
@@ -500,9 +479,8 @@
  * @brief
  * The testSetVenousPressureOverride function overrides the measured venous
  * pressure.
- * @details
- * Inputs : none
- * Outputs : venousPressure
+ * @details Inputs: none
+ * @details Outputs: venousPressure
  * @param value override measured venous pressure with (in mmHg)
  * @return TRUE if override successful, FALSE if not
  *************************************************************************/
@@ -524,9 +502,8 @@
  * @brief
  * The testResetVenousPressureOverride function resets the override of the
  * venous pressure.
- * @details
- * Inputs : none
- * Outputs : venousPressure
+ * @details Inputs: none
+ * @details Outputs: venousPressure
  * @return TRUE if reset successful, FALSE if not
  *************************************************************************/
 BOOL testResetVenousPressureOverride( void )
@@ -547,9 +524,8 @@
  * @brief
  * The testSetBloodPumpOcclusionOverride function overrides the measured
  * blood pump occlusion pressure.n
- * @details
- * Inputs : none
- * Outputs : bloodPumpOcclusion
+ * @details Inputs: none
+ * @details Outputs: bloodPumpOcclusion
  * @param value override measured blood pump occlusion pressure with (in mmHg)
  * @return TRUE if override successful, FALSE if not
  *************************************************************************/
@@ -571,9 +547,8 @@
  * @brief
  * The testResetBloodPumpOcclusionOverride function resets the override of the
  * measured blood pump occlusion pressure.
- * @details
- * Inputs : none
- * Outputs : bloodPumpOcclusion
+ * @details Inputs: none
+ * @details Outputs: bloodPumpOcclusion
  * @return TRUE if reset successful, FALSE if not
  *************************************************************************/
 BOOL testResetBloodPumpOcclusionOverride( void )
@@ -594,9 +569,8 @@
  * @brief
  * The testSetDialInPumpOcclusionOverride function overrides the measured
  * dialysate inlet pump occlusion pressure.n
- * @details
- * Inputs : none
- * Outputs : dialInPumpOcclusion
+ * @details Inputs: none
+ * @details Outputs: dialInPumpOcclusion
  * @param value override measured dialysate inlet pump occlusion pressure (in mmHg)
  * @return TRUE if override successful, FALSE if not
  *************************************************************************/
@@ -618,9 +592,8 @@
  * @brief
  * The testResetDialInPumpOcclusionOverride function resets the override of the
  * measured dialysate inlet pump occlusion pressure.
- * @details
- * Inputs : none
- * Outputs : dialInPumpOcclusion
+ * @details Inputs: none
+ * @details Outputs: dialInPumpOcclusion
  * @return TRUE if reset successful, FALSE if not
  *************************************************************************/
 BOOL testResetDialInPumpOcclusionOverride( void )
@@ -641,9 +614,8 @@
  * @brief
  * The testSetDialOutPumpOcclusionOverride function overrides the measured
  * dialysate outlet pump occlusion pressure.
- * @details
- * Inputs : none
- * Outputs : dialOutPumpOcclusion
+ * @details Inputs: none
+ * @details Outputs: dialOutPumpOcclusion
  * @param value override measured dialysate outlet pump occlusion pressure (in mmHg)
  * @return TRUE if override successful, FALSE if not
  *************************************************************************/
@@ -665,9 +637,8 @@
  * @brief
  * The testResetDialOutPumpOcclusionOverride function resets the override of the
  * measured dialysate outlet pump occlusion pressure.
- * @details
- * Inputs : none
- * Outputs : dialOutPumpOcclusion
+ * @details Inputs: none
+ * @details Outputs: dialOutPumpOcclusion
  * @return TRUE if reset successful, FALSE if not
  *************************************************************************/
 BOOL testResetDialOutPumpOcclusionOverride( void )