Index: firmware/App/Controllers/BloodFlow.c
===================================================================
diff -u -r9e85e7ace1390d48587174a5bc6eb11d5185cea4 -rd33ae635eb38ae8f2647f68304be74e8e4f78cfd
--- firmware/App/Controllers/BloodFlow.c	(.../BloodFlow.c)	(revision 9e85e7ace1390d48587174a5bc6eb11d5185cea4)
+++ firmware/App/Controllers/BloodFlow.c	(.../BloodFlow.c)	(revision d33ae635eb38ae8f2647f68304be74e8e4f78cfd)
@@ -506,7 +506,14 @@
 void resetBloodPumpRotorCount( void )
 {
 #ifndef WORN_OUT_CARTRIDGE
-    bloodPumpRotorCounter.data = 0;
+    if ( getSoftwareConfigStatus( SW_CONFIG_ENABLE_WORN_OUT_CARTRIDGE ) != SW_CONFIG_ENABLE_VALUE )
+    {
+        bloodPumpRotorCounter.data = 0;
+    }
+    else
+    {
+        bloodPumpRotorCounter.data = BP_MAX_ROTOR_COUNT_FOR_WEAR;
+    }
 #else
     bloodPumpRotorCounter.data = BP_MAX_ROTOR_COUNT_FOR_WEAR;
 #endif
@@ -1070,7 +1077,8 @@
 
 #ifndef DISABLE_PUMP_DIRECTION_CHECKS
         // Check pump direction error count
-        if ( lastBloodPumpDirectionCount != dirErrorCnt )
+        if ( ( lastBloodPumpDirectionCount != dirErrorCnt ) &&
+             ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_PUMP_DIRECTION_CHECKS ) != SW_CONFIG_ENABLE_VALUE ) )
         {
             lastBloodPumpDirectionCount = dirErrorCnt;
             SET_ALARM_WITH_1_U32_DATA( ALARM_ID_HD_PUMP_DIRECTION_STATUS_ERROR, (U32)HD_PUMP_BLOOD_PUMP )
@@ -1084,7 +1092,7 @@
         if ( TRUE == isPersistentAlarmTriggered( ALARM_ID_BLOOD_PUMP_MC_DIRECTION_CHECK, isDirIncorrect ) )
         {
 #ifndef DISABLE_PUMP_DIRECTION_CHECKS
-            if ( bloodPumpDirectionSet != bpDir  )
+            if ( ( bloodPumpDirectionSet != bpDir ) && ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_PUMP_SPEED_CHECKS ) != SW_CONFIG_ENABLE_VALUE ) )
             {
                 SET_ALARM_WITH_2_U32_DATA( ALARM_ID_BLOOD_PUMP_MC_DIRECTION_CHECK, (U32)bloodPumpDirectionSet, (U32)bpDir )
             }
@@ -1119,7 +1127,9 @@
     F32 measMCMotorSpeed = fabs( getMeasuredBloodPumpMCSpeed() );
 
     // Check for pump running while commanded off
-    if ( TRUE == isPersistentAlarmTriggered( ALARM_ID_BLOOD_PUMP_OFF_CHECK, ( 0 == targetBloodFlowRate ) && ( measMotorSpeed > BP_MAX_MOTOR_SPEED_WHILE_OFF_RPM ) ) )
+    if ( ( TRUE == isPersistentAlarmTriggered( ALARM_ID_BLOOD_PUMP_OFF_CHECK,
+                                               ( 0 == targetBloodFlowRate ) && ( measMotorSpeed > BP_MAX_MOTOR_SPEED_WHILE_OFF_RPM ) ) ) &&
+         ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_PUMP_SPEED_CHECKS ) != SW_CONFIG_ENABLE_VALUE ) )
     {
 #ifndef DISABLE_PUMP_SPEED_CHECKS
         SET_ALARM_WITH_1_F32_DATA( ALARM_ID_BLOOD_PUMP_OFF_CHECK, measMotorSpeed );
@@ -1138,16 +1148,18 @@
         F32 deltaRotorSpeed = fabs( measRotorSpeed - measMotorSpeedInRotorRPM );
 
         // Check measured motor speed vs. commanded motor speed while controlling to target
-        if ( TRUE == isPersistentAlarmTriggered( ALARM_ID_BLOOD_PUMP_MOTOR_SPEED_CHECK,
-             ( deltaMotorSpeed > BP_MAX_MOTOR_SPEED_ERROR_RPM ) || ( deltaMCMotorSpeed > BP_MAX_MOTOR_SPEED_ERROR_RPM ) ) )
+        if ( ( TRUE == isPersistentAlarmTriggered( ALARM_ID_BLOOD_PUMP_MOTOR_SPEED_CHECK,
+             ( deltaMotorSpeed > BP_MAX_MOTOR_SPEED_ERROR_RPM ) || ( deltaMCMotorSpeed > BP_MAX_MOTOR_SPEED_ERROR_RPM ) ) ) &&
+             ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_PUMP_SPEED_CHECKS ) != SW_CONFIG_ENABLE_VALUE ) )
         {
 #ifndef DISABLE_PUMP_SPEED_CHECKS
             SET_ALARM_WITH_2_F32_DATA( ALARM_ID_BLOOD_PUMP_MOTOR_SPEED_CHECK, cmdMotorSpeed, measMotorSpeed );
 #endif
         }
 
         // Check measured rotor speed vs. measured motor speed while controlling to target
-        if ( TRUE == isPersistentAlarmTriggered( ALARM_ID_BLOOD_PUMP_ROTOR_SPEED_CHECK, deltaRotorSpeed > BP_MAX_ROTOR_VS_MOTOR_DIFF_RPM ) )
+        if ( ( TRUE == isPersistentAlarmTriggered( ALARM_ID_BLOOD_PUMP_ROTOR_SPEED_CHECK, deltaRotorSpeed > BP_MAX_ROTOR_VS_MOTOR_DIFF_RPM ) ) &&
+             ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_PUMP_SPEED_CHECKS ) != SW_CONFIG_ENABLE_VALUE ) )
         {
 #ifndef DISABLE_PUMP_SPEED_CHECKS
             SET_ALARM_WITH_2_F32_DATA( ALARM_ID_BLOOD_PUMP_ROTOR_SPEED_CHECK, measRotorSpeed, measMotorSpeed );
@@ -1177,7 +1189,8 @@
     // Check blood pump current during running state
     BOOL const isRunningMCCurrentBad = ( BLOOD_PUMP_OFF_STATE != bloodPumpState ) && ( bpCurr > BP_MAX_CURR_WHEN_RUNNING_MA );
 
-    if ( TRUE == isPersistentAlarmTriggered( ALARM_ID_BLOOD_PUMP_MC_CURRENT_CHECK, isOffMCCurrentBad || isRunningMCCurrentBad ) )
+    if ( ( TRUE == isPersistentAlarmTriggered( ALARM_ID_BLOOD_PUMP_MC_CURRENT_CHECK, isOffMCCurrentBad || isRunningMCCurrentBad ) ) &&
+         ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_MOTOR_CURRNT_CHECKS ) != SW_CONFIG_ENABLE_VALUE ) )
     {
 #ifndef DISABLE_MOTOR_CURRENT_CHECKS
         SET_ALARM_WITH_1_F32_DATA( ALARM_ID_BLOOD_PUMP_MC_CURRENT_CHECK, bpCurr );
@@ -1196,12 +1209,15 @@
 static void checkBloodPumpFlowRate( void )
 {
 #ifndef DISABLE_PUMP_FLOW_CHECKS
-    F32 flow = getMeasuredBloodFlowRate();
-
-    // Range check on measure BP flow rate.
-    if ( TRUE == isPersistentAlarmTriggered( ALARM_ID_HD_BLOOD_FLOW_OUT_OF_RANGE, ( flow > BP_MAX_FLOW_RATE ) || ( flow < BP_MIN_FLOW_RATE ) ) )
+    if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_PUMP_FLOW_CHECKS ) != SW_CONFIG_ENABLE_VALUE )
     {
-        SET_ALARM_WITH_1_F32_DATA( ALARM_ID_HD_BLOOD_FLOW_OUT_OF_RANGE, flow );
+        F32 flow = getMeasuredBloodFlowRate();
+
+        // Range check on measure BP flow rate.
+        if ( TRUE == isPersistentAlarmTriggered( ALARM_ID_HD_BLOOD_FLOW_OUT_OF_RANGE, ( flow > BP_MAX_FLOW_RATE ) || ( flow < BP_MIN_FLOW_RATE ) ) )
+        {
+            SET_ALARM_WITH_1_F32_DATA( ALARM_ID_HD_BLOOD_FLOW_OUT_OF_RANGE, flow );
+        }
     }
 #endif
 }