Index: firmware/App/Controllers/PresOccl.c
===================================================================
diff -u -r24b2fe72608344e67ef37234085d15ad5e4fcc37 -rbd241ef5231a9869adaf7bb5ed166135beb2c0fb
--- firmware/App/Controllers/PresOccl.c	(.../PresOccl.c)	(revision 24b2fe72608344e67ef37234085d15ad5e4fcc37)
+++ firmware/App/Controllers/PresOccl.c	(.../PresOccl.c)	(revision bd241ef5231a9869adaf7bb5ed166135beb2c0fb)
@@ -363,15 +363,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
         {
@@ -468,7 +460,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 ) ) )
@@ -513,15 +505,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 );
@@ -576,11 +568,11 @@
     if ( bpOccl > ( OCCLUSION_THRESHOLD_OFFSET + bloodPumpOcclusionAfterCartridgeInstall ) )
     {
         signalBloodPumpHardStop();  // Stop pump immediately
-        SET_ALARM_WITH_1_U32_DATA( ALARM_ID_OCCLUSION_BLOOD_PUMP, bpOccl )
+        //SET_ALARM_WITH_1_U32_DATA( ALARM_ID_OCCLUSION_BLOOD_PUMP, bpOccl )
     }
     else if ( bpOccl < ( OCCLUSION_CLEAR_THRESHOLD_OFFSET + bloodPumpOcclusionAfterCartridgeInstall ) )
     {
-        clearAlarmCondition( ALARM_ID_OCCLUSION_BLOOD_PUMP );
+        //clearAlarmCondition( ALARM_ID_OCCLUSION_BLOOD_PUMP );
     }
 #endif
 }