Index: firmware/App/Controllers/PresOccl.c
===================================================================
diff -u -r9e85e7ace1390d48587174a5bc6eb11d5185cea4 -rd33ae635eb38ae8f2647f68304be74e8e4f78cfd
--- firmware/App/Controllers/PresOccl.c	(.../PresOccl.c)	(revision 9e85e7ace1390d48587174a5bc6eb11d5185cea4)
+++ firmware/App/Controllers/PresOccl.c	(.../PresOccl.c)	(revision d33ae635eb38ae8f2647f68304be74e8e4f78cfd)
@@ -189,8 +189,11 @@
     lastArterialPressureReadCtr = 0;
     lastVenousPressureReadCtr = 0;
 #ifndef DISABLE_PRESSURE_CHECKS
-    lastBPOcclReadCtr = 0;
-    lastBPErrorCtr = 0;
+    if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_PRESSURE_CHECKS ) != SW_CONFIG_ENABLE_VALUE )
+    {
+        lastBPOcclReadCtr = 0;
+        lastBPErrorCtr = 0;
+    }
 #endif
 
     longFilteredArterialPressure = 0.0;
@@ -199,7 +202,10 @@
     presOcclDataPublicationTimerCounter = DATA_PUBLISH_COUNTER_START_COUNT;
 
 #ifndef DISABLE_PRESSURE_CHECKS
-    bloodPumpOcclusionAfterCartridgeInstall = 0;
+    if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_PRESSURE_CHECKS ) != SW_CONFIG_ENABLE_VALUE )
+    {
+        bloodPumpOcclusionAfterCartridgeInstall = 0;
+    }
 #endif
 }
 
@@ -280,7 +286,10 @@
 void setOcclusionInstallLevel( void )
 {
 #ifndef DISABLE_PRESSURE_CHECKS
-    bloodPumpOcclusionAfterCartridgeInstall = getMeasuredBloodPumpOcclusion();
+    if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_PRESSURE_CHECKS ) != SW_CONFIG_ENABLE_VALUE )
+    {
+        bloodPumpOcclusionAfterCartridgeInstall = getMeasuredBloodPumpOcclusion();
+    }
 #endif
 }
 
@@ -383,7 +392,10 @@
     else
     {
 #ifndef DISABLE_PRESSURE_CHECKS
-        SET_ALARM_WITH_1_U32_DATA( ALARM_ID_ARTERIAL_PRESSURE_SENSOR_FAULT, (U32)artPresAlarm )
+        if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_PRESSURE_CHECKS ) != SW_CONFIG_ENABLE_VALUE )
+        {
+            SET_ALARM_WITH_1_U32_DATA( ALARM_ID_ARTERIAL_PRESSURE_SENSOR_FAULT, (U32)artPresAlarm )
+        }
 #endif
     }
 
@@ -405,7 +417,10 @@
     else
     {
 #ifndef DISABLE_PRESSURE_CHECKS
+        if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_PRESSURE_CHECKS ) != SW_CONFIG_ENABLE_VALUE )
+        {
 //        SET_ALARM_WITH_1_U32_DATA( ALARM_ID_VENOUS_PRESSURE_SENSOR_FAULT, (U32)venPresStatus )  // TODO - persistence?  YES, need persistence - getting a stale data status.  OR maybe speed up ADC in FPGA.
+        }
 #endif
     }
 
@@ -437,26 +452,32 @@
     U08 bpErrorCtr  = getFPGABloodPumpOcclusionErrorCounter();
 
 #ifndef DISABLE_PRESSURE_CHECKS
-    // Check for sensor errors
-    if ( TRUE == isPersistentAlarmTriggered( ALARM_ID_HD_BP_OCCLUSION_SENSOR_ERROR, ( bpErrorCtr != lastBPErrorCtr ) ) )
+    if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_PRESSURE_CHECKS ) != SW_CONFIG_ENABLE_VALUE )
     {
-        SET_ALARM_WITH_1_U32_DATA( ALARM_ID_HD_BP_OCCLUSION_SENSOR_ERROR, (U32)bpErrorCtr )
-    }
+        // Check for sensor errors
+        if ( TRUE == isPersistentAlarmTriggered( ALARM_ID_HD_BP_OCCLUSION_SENSOR_ERROR, ( bpErrorCtr != lastBPErrorCtr ) ) )
+        {
+            SET_ALARM_WITH_1_U32_DATA( ALARM_ID_HD_BP_OCCLUSION_SENSOR_ERROR, (U32)bpErrorCtr )
+        }
 
-    // Check for stale occlusion reads
-    if ( TRUE == isPersistentAlarmTriggered( ALARM_ID_HD_BP_OCCLUSION_READ_TIMEOUT_ERROR, ( bpReadCtr == lastBPOcclReadCtr ) ) )
-    {
-        activateAlarmNoData( ALARM_ID_HD_BP_OCCLUSION_READ_TIMEOUT_ERROR );
+        // Check for stale occlusion reads
+        if ( TRUE == isPersistentAlarmTriggered( ALARM_ID_HD_BP_OCCLUSION_READ_TIMEOUT_ERROR, ( bpReadCtr == lastBPOcclReadCtr ) ) )
+        {
+            activateAlarmNoData( ALARM_ID_HD_BP_OCCLUSION_READ_TIMEOUT_ERROR );
+        }
     }
 #endif
 
     // Record occlusion sensor readings
     bloodPumpOcclusion.data = (U32)getFPGABloodPumpOcclusion();
 
 #ifndef DISABLE_PRESSURE_CHECKS
-    // Record occlusion read and error counters for next time around
-    lastBPOcclReadCtr  = bpReadCtr;
-    lastBPErrorCtr = bpErrorCtr;
+    if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_PRESSURE_CHECKS ) != SW_CONFIG_ENABLE_VALUE )
+    {
+        // Record occlusion read and error counters for next time around
+        lastBPOcclReadCtr  = bpReadCtr;
+        lastBPErrorCtr = bpErrorCtr;
+    }
 #endif
 }
 
@@ -590,21 +611,24 @@
     U32 bpOccl = getMeasuredBloodPumpOcclusion();
 
 #ifndef DISABLE_PRESSURE_CHECKS
-    // Range check occlusion sensor
-    if ( TRUE == isPersistentAlarmTriggered( ALARM_ID_HD_BP_OCCLUSION_OUT_OF_RANGE, bpOccl < MIN_OCCLUSION_COUNTS ) )
+    if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_PRESSURE_CHECKS ) != SW_CONFIG_ENABLE_VALUE )
     {
-        SET_ALARM_WITH_1_U32_DATA( ALARM_ID_HD_BP_OCCLUSION_OUT_OF_RANGE, bpOccl );
-    }
+        // Range check occlusion sensor
+        if ( TRUE == isPersistentAlarmTriggered( ALARM_ID_HD_BP_OCCLUSION_OUT_OF_RANGE, bpOccl < MIN_OCCLUSION_COUNTS ) )
+        {
+            SET_ALARM_WITH_1_U32_DATA( ALARM_ID_HD_BP_OCCLUSION_OUT_OF_RANGE, bpOccl );
+        }
 
-    // Check for occlusion
-    if ( bpOccl > ( OCCLUSION_THRESHOLD_OFFSET + bloodPumpOcclusionAfterCartridgeInstall ) )
-    {
-        signalBloodPumpHardStop();  // Stop pump immediately
-        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 );
+        // Check for occlusion
+        if ( bpOccl > ( OCCLUSION_THRESHOLD_OFFSET + bloodPumpOcclusionAfterCartridgeInstall ) )
+        {
+            signalBloodPumpHardStop();  // Stop pump immediately
+            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 );
+        }
     }
 #endif
 }
@@ -787,24 +811,27 @@
  *************************************************************************/
 void execPresOcclTest( void )
 {
-#ifndef DISABLE_PRESSURE_CHECKS
-    U32 const bpPressure = getMeasuredBloodPumpOcclusion();
-    F32 const arterialPressure = getFilteredArterialPressure();
-    F32 const venousPressure = getFilteredVenousPressure();
+#ifndef DISABLE_PRESSURE_CHECKS
+    if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_PRESSURE_CHECKS ) != SW_CONFIG_ENABLE_VALUE )
+    {
+        U32 const bpPressure = getMeasuredBloodPumpOcclusion();
+        F32 const arterialPressure = getFilteredArterialPressure();
+        F32 const venousPressure = getFilteredVenousPressure();
 
-    if ( bpPressure > CARTRIDGE_LOADED_THRESHOLD )
-    {
-        SET_ALARM_WITH_1_U32_DATA( ALARM_ID_HD_BP_OCCLUSION_SELF_TEST_FAILURE, bpPressure );
-    }
+        if ( bpPressure > CARTRIDGE_LOADED_THRESHOLD )
+        {
+            SET_ALARM_WITH_1_U32_DATA( ALARM_ID_HD_BP_OCCLUSION_SELF_TEST_FAILURE, bpPressure );
+        }
 
-    if ( ( arterialPressure <= ARTERIAL_PRESSURE_SELF_TEST_MIN ) || ( arterialPressure >= ARTERIAL_PRESSURE_SELF_TEST_MAX ) )
-    {
-        SET_ALARM_WITH_1_U32_DATA( ALARM_ID_HD_ARTERIAL_PRESSURE_SELF_TEST_FAILURE, arterialPressure );
-    }
+        if ( ( arterialPressure <= ARTERIAL_PRESSURE_SELF_TEST_MIN ) || ( arterialPressure >= ARTERIAL_PRESSURE_SELF_TEST_MAX ) )
+        {
+            SET_ALARM_WITH_1_U32_DATA( ALARM_ID_HD_ARTERIAL_PRESSURE_SELF_TEST_FAILURE, arterialPressure );
+        }
 
-    if ( ( venousPressure <= VENOUS_PRESSURE_SELF_TEST_MIN ) || ( venousPressure >= VENOUS_PRESSURE_SELF_TEST_MAX ) )
-    {
-        SET_ALARM_WITH_1_U32_DATA( ALARM_ID_HD_VENOUS_PRESSURE_SELF_TEST_FAILURE, venousPressure );
+        if ( ( venousPressure <= VENOUS_PRESSURE_SELF_TEST_MIN ) || ( venousPressure >= VENOUS_PRESSURE_SELF_TEST_MAX ) )
+        {
+            SET_ALARM_WITH_1_U32_DATA( ALARM_ID_HD_VENOUS_PRESSURE_SELF_TEST_FAILURE, venousPressure );
+        }
     }
 #endif
 }