Index: firmware/App/Controllers/PresOccl.c
===================================================================
diff -u -r68aefeff8890cdfa956c7bfdf0d4505b4ac25cb7 -rdb3ad11a6c257fe9ff2ef5f1b887c47574d8fd4e
--- firmware/App/Controllers/PresOccl.c	(.../PresOccl.c)	(revision 68aefeff8890cdfa956c7bfdf0d4505b4ac25cb7)
+++ firmware/App/Controllers/PresOccl.c	(.../PresOccl.c)	(revision db3ad11a6c257fe9ff2ef5f1b887c47574d8fd4e)
@@ -7,8 +7,8 @@
 *
 * @file    PresOccl.c
 *
-* @author  (last)      Sean Nash
-* @date    (last)      15-Nov-2021
+* @author  (last)      Dara Navaei
+* @date    (last)      04-Jan-2022
 *
 * @author  (original)  Sean
 * @date    (original)  15-Jan-2020
@@ -18,7 +18,8 @@
 #include "PresOccl.h"
 #include "AlarmMgmt.h"
 #include "FPGA.h"
-#include "ModeTreatmentParams.h"
+#include "ModeTreatmentParams.h"
+#include "NVDataMgmt.h"
 #include "OperationModes.h"
 #include "PersistentAlarm.h"
 #include "SystemCommMessages.h"
@@ -45,6 +46,7 @@
 #define VENOUS_PRESSURE_SCALE               ( 14745 - VENOUS_PRESSURE_OFFSET )              ///< Scale for venous pressure sensor.
 #define VENOUS_PRESSURE_MIN_PSI             ( -30.0 )                                       ///< Minimum of scale for venous pressure sensor reading (in PSI).
 #define VENOUS_PRESSURE_MAX_PSI             ( 30.0 )                                        ///< Maximum of scale for venous pressure sensor reading (in PSI).
+#define MIN_VENOUS_PRESSURE_FOR_RAMP_MMHG   ( 0.0 )                                         ///< Minimum venous pressure during blood pump ramp up (in mmHg).
 
 #define ARTERIAL_PRESSURE_SELF_TEST_MIN     ( -300.0 )                                      ///< Minimum self-test value for arterial pressure sensor reading (in mmHg).
 #define ARTERIAL_PRESSURE_SELF_TEST_MAX     ( 100.0 )                                       ///< Maximum self-test value for arterial pressure sensor reading (in mmHg).
@@ -145,6 +147,8 @@
 static U32 venPressureReadingsShortIdx = 0;                                     ///< Index for next sample in rolling average array.
 static F32 venPressureReadingsShortTotal = 0.0;                                 ///< Rolling total - used to calc average.
 static U32 venPressureReadingsShortCount = 0;                                   ///< Number of samples in flow rolling average buffer.
+static HD_PRESSURE_SENSORS_CAL_RECORD_T pressureSensorsCalRecord;               ///< Pressure sensors calibration record.
+static HD_OCCLUSION_SENSORS_CAL_RECORD_T occlusionSensorsCalRecord;             ///< Occlusion sensors calibration record.
 
 // ********** private function prototypes **********
 
@@ -354,6 +358,7 @@
     F32 venTemp = getTemperatureValue( TEMPSENSOR_VENOUS_PRESSURE_SENSOR );
     U08 venReadCtr = getFPGAVenousPressureReadCounter();
 
+#ifndef USE_PBO_AS_PBA
     // Convert arterial pressure to mmHg if no fault
     if ( 0 == artPresAlarm )
     {
@@ -407,6 +412,10 @@
     {
         SET_ALARM_WITH_1_F32_DATA( ALARM_ID_VENOUS_PRESSURE_SENSOR_FAULT, venTemp )
     }
+#else
+    arterialPressure.data = ( ( (F32)(venPres - VENOUS_PRESSURE_OFFSET) * (VENOUS_PRESSURE_MAX_PSI - VENOUS_PRESSURE_MIN_PSI) / (F32)VENOUS_PRESSURE_SCALE ) + VENOUS_PRESSURE_MIN_PSI ) * PSI_TO_MMHG;
+    venousPressure.data = 100.0;
+#endif
 
     // Filter inline pressure readings
     filterInlinePressureReadings( getMeasuredArterialPressure(), getMeasuredVenousPressure() );
@@ -474,6 +483,13 @@
         F32 artLowLimit  = (F32)getTreatmentParameterS32( TREATMENT_PARAM_ART_PRESSURE_LOW_LIMIT );
         F32 artHighLimit = (F32)getTreatmentParameterS32( TREATMENT_PARAM_ART_PRESSURE_HIGH_LIMIT );
 
+        // If BP is ramping up, extend range to outer limits as pressure may not yet have reached expected range.
+        if ( isBloodPumpRampComplete() != TRUE )
+        {
+            artLowLimit = (F32)getS32TreatmentParamLowerRangeLimit( TREATMENT_PARAM_ART_PRESSURE_LOW_LIMIT );
+            artHighLimit = (F32)getS32TreatmentParamUpperRangeLimit( TREATMENT_PARAM_ART_PRESSURE_HIGH_LIMIT );
+        }
+
         // Check arterial pressure is within user set alarm limits
         if ( TRUE == isPersistentAlarmTriggered( ALARM_ID_ARTERIAL_PRESSURE_LOW, artPres < artLowLimit ) )
         {
@@ -519,6 +535,13 @@
         F32 venLowLimit  = (F32)getTreatmentParameterS32( TREATMENT_PARAM_VEN_PRESSURE_LOW_LIMIT );
         F32 venHighLimit = (F32)getTreatmentParameterS32( TREATMENT_PARAM_VEN_PRESSURE_HIGH_LIMIT );
 
+        // If BP is ramping up, extend range to outer limits as pressure may not yet have reached expected range.
+        if ( isBloodPumpRampComplete() != TRUE )
+        {
+            venLowLimit = MIN_VENOUS_PRESSURE_FOR_RAMP_MMHG;
+            venHighLimit = (F32)getS32TreatmentParamUpperRangeLimit( TREATMENT_PARAM_VEN_PRESSURE_HIGH_LIMIT );
+        }
+
         // Cannot monitor for low venous pressure while venting air trap
         if ( getValveAirTrapStatus() != STATE_OPEN )
         {
@@ -799,6 +822,37 @@
 #endif
 
     return result;
+}
+
+/*********************************************************************//**
+ * @brief
+ * The execPresOcclSelfTest function executes the PresOccl self-test.
+ * @details Inputs: none
+ * @details Outputs: pressureSensorsCalRecord, occlusionSensorsCalRecord
+ * @return the result of the PresOccl self-test.
+ *************************************************************************/
+SELF_TEST_STATUS_T execPresOcclSelfTest( void )
+{
+    SELF_TEST_STATUS_T result = SELF_TEST_STATUS_PASSED;
+    BOOL calStatus            = FALSE;
+
+    // Get the pressure sensors and occlusion sensors calibration records
+    calStatus |= getNVRecord2Driver( GET_CAL_PRESSURE_SENSORS, (U08*)&pressureSensorsCalRecord, sizeof( HD_PRESSURE_SENSORS_CAL_RECORD_T ),
+                                     NUM_OF_CAL_DATA_HD_PRESSURE_SESNSORS, ALARM_ID_NO_ALARM );
+
+    calStatus |= getNVRecord2Driver( GET_CAL_OCCLUSION_SESNSORS, (U08*)&occlusionSensorsCalRecord, sizeof( HD_OCCLUSION_SENSORS_CAL_RECORD_T ),
+                                     NUM_OF_CAL_DATA_OCCLUSION_SENSORS, ALARM_ID_NO_ALARM );
+
+    if ( TRUE == calStatus )
+    {
+        result = SELF_TEST_STATUS_PASSED;
+    }
+    else
+    {
+        result = SELF_TEST_STATUS_FAILED;
+    }
+
+    return result;
 }
 
 /*************************************************************************