Index: firmware/App/Controllers/PresOccl.c
===================================================================
diff -u -rc67def50892f9a7c2f1f22985b5351465a8f6773 -r1a685471524555a374854c0c9ec8e208e71fe2df
--- firmware/App/Controllers/PresOccl.c	(.../PresOccl.c)	(revision c67def50892f9a7c2f1f22985b5351465a8f6773)
+++ firmware/App/Controllers/PresOccl.c	(.../PresOccl.c)	(revision 1a685471524555a374854c0c9ec8e208e71fe2df)
@@ -40,7 +40,9 @@
 #define VENOUS_PRESSURE_OFFSET              ( 1638 )                                        ///< Offset for 14-bit venous pressure sensor reading.
 #define VENOUS_PRESSURE_SCALE               ( 14745 - VENOUS_PRESSURE_OFFSET )              ///< Scale for venous pressure sensor.
 #define VENOUS_PRESSURE_MIN                 ( 30.0 )                                        ///< Minimum of scale for venous pressure sensor reading (in TBD u/m).
-#define VENOUS_PRESSURE_MAX                 ( 90.0 )                                        ///< Maximum of scale for venous pressure sensor reading (in TBD u/m).
+#define VENOUS_PRESSURE_MAX                 ( 90.0 )                                        ///< Maximum of scale for venous pressure sensor reading (in TBD u/m).
+
+#define PSI_TO_MMHG                         ( 51.7149 )                                     ///< Conversion factor (mmHg/PSI) for converting PSI to mmHg.
 
 /// Defined states for the pressure and occlusion monitor state machine.
 typedef enum PresOccl_States
@@ -74,10 +76,6 @@
 static PRESSURE_SELF_TEST_STATE_T presOcclSelfTestState = PRESSURE_SELF_TEST_STATE_START;  ///< current pressure self-test state.
 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.
-static F32 venousPressureLowLimitmmHG = 0.0;                                    ///< lower alarm limit for venous pressure.
-static F32 venousPressureHighLimitmmHG = 0.0;                                   ///< upper alarm limit for venous pressure.
 // TODO - set thresholds for occlusions
 static F32 bloodPumpOcclusionPressureThresholdmmHG = 50.0;                      ///< pressure threshold for blood pump occlusion.
 static F32 dialInPumpOcclusionPressureThresholdmmHG = 50.0;                     ///< pressure threshold for dialysate inlet pump occlusion.
@@ -105,37 +103,6 @@
 
 /*********************************************************************//**
  * @brief
- * The setPressureLimits function sets the lower and upper alarm limits
- * for a given pressure sensor.
- * @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)
- * @return none
- *************************************************************************/
-void setPressureLimits( PRESSURE_SENSORS_T sensor, F32 low, F32 high )
-{
-    switch ( sensor )   // TODO - will low/high limits be range checked by caller or should we do it here?  what are valid ranges?
-    {
-        case PRESSURE_SENSOR_ARTERIAL:
-            arterialPressureLowLimitmmHG = low;
-            arterialPressureHighLimitmmHG = high;
-            break;
-
-        case PRESSURE_SENSOR_VENOUS:
-            venousPressureLowLimitmmHG = low;
-            venousPressureHighLimitmmHG = high;
-            break;
-
-        default:
-            SET_ALARM_WITH_2_U32_DATA( ALARM_ID_HD_SOFTWARE_FAULT, SW_FAULT_ID_PRES_OCCL_INVALID_PRES_SENSOR, sensor )
-            break;
-    }
-}
-
-/*********************************************************************//**
- * @brief
  * The setOcclusionThreshold function sets the occlusion pressure threshold
  * for a given occlusion sensor.
  * @details Inputs: none
@@ -226,11 +193,13 @@
     U16 venPres = getFPGAVenousPressure();
     U16 bldOccl = getFPGABloodPumpOcclusion();
     U16 dliOccl = getFPGADialInPumpOcclusion();
-    U16 dloOccl = getFPGADialOutPumpOcclusion();
+    U16 dloOccl = getFPGADialOutPumpOcclusion();
+    F32 venPresPSI;
 
     // TODO - convert ADC counts to mmHg for each sensor
     arterialPressure.data = ARTERIAL_PRESSURE_V_PER_BIT * ( (F32)(artPres) / ( ARTERIAL_PRESSURE_SENSITIVITY / ARTERIAL_PRESSURE_V_BIAS ) );
-    venousPressure.data = ( (F32)(venPres - VENOUS_PRESSURE_OFFSET) * (VENOUS_PRESSURE_MAX - VENOUS_PRESSURE_MIN) / (F32)VENOUS_PRESSURE_SCALE ) - VENOUS_PRESSURE_MIN;
+    venPresPSI = ( (F32)(venPres - VENOUS_PRESSURE_OFFSET) * (VENOUS_PRESSURE_MAX - VENOUS_PRESSURE_MIN) / (F32)VENOUS_PRESSURE_SCALE ) - VENOUS_PRESSURE_MIN;
+    venousPressure.data = venPresPSI * PSI_TO_MMHG;
     bloodPumpOcclusion.data = (F32)bldOccl;
     dialInPumpOcclusion.data = (F32)dliOccl;
     dialOutPumpOcclusion.data = (F32)dloOccl;