Index: firmware/App/Controllers/PresOccl.c
===================================================================
diff -u -r511d3ffe16427c8f275d46fca1e3ff3fb83fe54a -raa4db7d76566ad7473f896e543f71fdbbc921ea9
--- firmware/App/Controllers/PresOccl.c	(.../PresOccl.c)	(revision 511d3ffe16427c8f275d46fca1e3ff3fb83fe54a)
+++ firmware/App/Controllers/PresOccl.c	(.../PresOccl.c)	(revision aa4db7d76566ad7473f896e543f71fdbbc921ea9)
@@ -1,14 +1,14 @@
 /**************************************************************************
 *
-* Copyright (c) 2019-2021 Diality Inc. - All Rights Reserved.
+* Copyright (c) 2019-2022 Diality Inc. - All Rights Reserved.
 *
 * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN
 * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
 *
 * @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
@@ -172,7 +172,6 @@
     initPersistentAlarm( ALARM_ID_VENOUS_PRESSURE_HIGH, 0, PRES_ALARM_PERSISTENCE );
     initPersistentAlarm( ALARM_ID_HD_ARTERIAL_PRESSURE_READ_TIMEOUT_ERROR, 0, PRES_ALARM_PERSISTENCE );
     initPersistentAlarm( ALARM_ID_HD_VENOUS_PRESSURE_READ_TIMEOUT_ERROR, 0, PRES_ALARM_PERSISTENCE );
-    initPersistentAlarm( ALARM_ID_HD_VENOUS_PRESSURE_SENSOR_TEMP_OUT_OF_RANGE, 0, PRES_ALARM_PERSISTENCE );
     initPersistentAlarm( ALARM_ID_HD_BP_OCCLUSION_READ_TIMEOUT_ERROR, 0, PRES_ALARM_PERSISTENCE );
     initPersistentAlarm( ALARM_ID_HD_BP_OCCLUSION_SENSOR_ERROR, 0, PRES_ALARM_PERSISTENCE );
     initPersistentAlarm( ALARM_ID_HD_ARTERIAL_PRESSURE_OUT_OF_RANGE, 0, PRES_ALARM_PERSISTENCE );
@@ -362,15 +361,7 @@
         // Check for stale arterial pressure reading
         if ( FALSE == isPersistentAlarmTriggered( ALARM_ID_HD_VENOUS_PRESSURE_READ_TIMEOUT_ERROR, ( lastArterialPressureReadCtr == artReadCtr || artErrorCtr > 0 ) ) )
         {
-#ifndef PBA_ESTIMATION
             arterialPressure.data = ARTERIAL_PRESSURE_V_PER_BIT * ( (F32)(artPres) / ( ARTERIAL_PRESSURE_SENSITIVITY * ARTERIAL_PRESSURE_V_BIAS ) ) + getF32OverrideValue( &arterialPressureOffset );
-#else
-            // TODO - temporary test code - remove later
-            F32 artPres = -0.1146 * getMeasuredBloodPumpMCSpeed();
-            artPres = MAX(-200.0,artPres);
-            artPres = MIN(0,artPres);
-            arterialPressure.data = artPres;
-#endif
         }
         else
         {
@@ -408,13 +399,6 @@
 #endif
     }
 
-    // Check venous pressure sensor temperature
-    if ( TRUE == isPersistentAlarmTriggered( ALARM_ID_HD_VENOUS_PRESSURE_SENSOR_TEMP_OUT_OF_RANGE,
-                                             ( venTemp > VENOUS_PRESSURE_MAX_TEMP || venTemp < VENOUS_PRESSURE_MIN_TEMP ) ) )
-    {
-        SET_ALARM_WITH_1_F32_DATA( ALARM_ID_VENOUS_PRESSURE_SENSOR_FAULT, venTemp )
-    }
-
     // Filter inline pressure readings
     filterInlinePressureReadings( getMeasuredArterialPressure(), getMeasuredVenousPressure() );
 }
@@ -467,7 +451,7 @@
 {
     F32 artPres = getFilteredArterialPressure();
 
-#ifndef DISABLE_PRESSURE_CHECKS
+#ifndef DISABLE_ARTERIAL_PRESSURE_CHECK
     // Check arterial pressure is in range
     if ( TRUE == isPersistentAlarmTriggered( ALARM_ID_HD_ARTERIAL_PRESSURE_OUT_OF_RANGE,
                                              ( artPres > ARTERIAL_PRESSURE_MAX_MMHG || artPres < ARTERIAL_PRESSURE_MIN_MMHG ) ) )
@@ -512,15 +496,15 @@
 {
     F32 venPres = getFilteredVenousPressure();
 
-#ifndef DISABLE_PRESSURE_CHECKS
-    // Check arterial pressure is in range
+#ifndef DISABLE_VENOUS_PRESSURE_CHECK
+    // Check venous pressure is in range
     if ( TRUE == isPersistentAlarmTriggered( ALARM_ID_HD_VENOUS_PRESSURE_OUT_OF_RANGE, venPres > VENOUS_PRESSURE_MAX_MMHG ) ||
          TRUE == isPersistentAlarmTriggered( ALARM_ID_HD_VENOUS_PRESSURE_OUT_OF_RANGE, venPres < VENOUS_PRESSURE_MIN_MMHG ) )
     {
         SET_ALARM_WITH_1_F32_DATA( ALARM_ID_HD_VENOUS_PRESSURE_OUT_OF_RANGE, venPres );
     }
 
-    // Check arterial pressure during treatment mode
+    // Check venous pressure during treatment mode
     if ( ( MODE_TREA == getCurrentOperationMode() ) && ( getTreatmentState() <= TREATMENT_DIALYSIS_STATE ) )
     {
         F32 venLowLimit  = (F32)getTreatmentParameterS32( TREATMENT_PARAM_VEN_PRESSURE_LOW_LIMIT );