Index: firmware/App/Controllers/BalancingChamber.c
===================================================================
diff -u -r36db8974c2a0242e0c8c59d6f3131b975b34d06b -r3d69f9a417c8473a16cc32f37db9b2c96faf7f6a
--- firmware/App/Controllers/BalancingChamber.c	(.../BalancingChamber.c)	(revision 36db8974c2a0242e0c8c59d6f3131b975b34d06b)
+++ firmware/App/Controllers/BalancingChamber.c	(.../BalancingChamber.c)	(revision 3d69f9a417c8473a16cc32f37db9b2c96faf7f6a)
@@ -22,8 +22,8 @@
 #include "DryBiCart.h"
 #include "FpgaDD.h"
 #include "Heaters.h"
-#include "ModeStandby.h"
 #include "ModeGenDialysate.h"
+#include "ModeStandby.h"
 #include "Messaging.h"
 #include "OperationModes.h"
 #include "Pressure.h"
@@ -454,7 +454,7 @@
     balChamberSWState                   = BAL_CHAMBER_SW_STATE1;
     currentBalChamberFillCounter        = 0;
     isBalChamberFillInProgress          = FALSE;
-    isPressureStabilizedDuringFill     = FALSE;
+    isPressureStabilizedDuringFill      = FALSE;
     isPressureDroppedDuringFill         = FALSE;
     isSpentFillComplete                 = FALSE;
     lastPrevSpentDialPressure           = 0.0F;
@@ -465,7 +465,7 @@
     freshDialPressure     = getFilteredPressure( D18_PRES );
     spentDialPressure     = getFilteredPressure( D51_PRES );
 
-    // Check fresh and spent dialysate pressure in range or BC switch only flag set
+    // Check fresh dialysate pressure in range or BC switch only flag set or BC pressure alarms are disabled
     if ( ( ( freshDialPressure >= FRESH_DIAL_PRESSURE_MIN_PSIG ) && ( freshDialPressure <= FRESH_DIAL_PRESSURE_MAX_PSIG ) ) ||
          ( TRUE == getBalChamberSwitchingOnlyStatus() ) || ( TRUE == getTestConfigStatus( TEST_CONFIG_DD_DISABLE_BC_PRESSURE_ALARMS ) ) )
     {
@@ -682,7 +682,6 @@
 
     // Check fresh dialysate pressure in range
     if ( ( ( freshDialPressure >= FRESH_DIAL_PRESSURE_MIN_PSIG ) && ( freshDialPressure <= FRESH_DIAL_PRESSURE_MAX_PSIG ) )  ||
-        // ( ( spentDialPressure >= SPENT_DIAL_PRESSURE_MIN_PSIG ) && ( spentDialPressure <= SPENT_DIAL_PRESSURE_MAX_PSIG ) ) ||
          ( TRUE == getBalChamberSwitchingOnlyStatus() ) || ( TRUE == getTestConfigStatus( TEST_CONFIG_DD_DISABLE_BC_PRESSURE_ALARMS ) ) )
     {
         // Valve control for state 2 fill
@@ -730,7 +729,7 @@
     freshDialPressure = getFilteredPressure( D18_PRES );
     spentDialPressure = getFilteredPressure( D51_PRES );
 
-    // Check fresh and spent dialysate pressure back in range to indicate fill complete.
+    // Check fresh dialysate pressure back in range to indicate fill complete.
     if ( ( freshDialPressure >= FRESH_DIAL_PRESSURE_MIN_PSIG ) && ( freshDialPressure <= FRESH_DIAL_PRESSURE_MAX_PSIG ) )
     {
         if ( ++balChamberFillCompleteStablePressureCounter >= BAL_CHAMBER_FILL_COMPLETE_MS )
@@ -829,6 +828,7 @@
  * fill timing close to the switching period time.
  * @details \b Inputs: balChamberExecState
  * @details \b Outputs: none
+ * @param spentDialPressure to check the switching time for BC and set D48 speed based on it.
  * @return the current state of balancing chamber states.
  *************************************************************************/
 static void checkSpentFillComplete( F32 spentDialPressure )
@@ -842,11 +842,16 @@
     U32 maxD48Speed                 = initialD48PumpSpeed + ( initialD48PumpSpeed * D48_SPEED_RANGE_LIMIT );
     U32 d48SpeedPostRangeCheck      = 0;
     F32 qdMlpm                      = getTDDialysateFlowrate();
+    BOOL result                     = FALSE;
     F32 spentFillCompletePresPsig;
 
-    // Diener 1000 pump: spent fill complete pressure depends on Qd (7/15/20 PSI). Other pump: use legacy 25 PSI.
-    if ( TRUE == getTestConfigStatus( TEST_CONFIG_DD_ENABLE_DIENER_1000_PUMP ) )
+    // Diener 2000 pump: spent fill complete pressure use legacy 25 PSI. Other pump: depends on Qd.
+    if ( TRUE == getTestConfigStatus( TEST_CONFIG_DD_ENABLE_DIENER_2000_PUMP ) )
     {
+        spentFillCompletePresPsig = SPENT_FILL_COMPLETE_PRES;
+    }
+    else
+    {
         if ( qdMlpm <= QD_THRESHOLD_LOW_MLPM )
         {
             spentFillCompletePresPsig = SPENT_FILL_COMPLETE_PRES_QD_LOW_PSIG;
@@ -860,10 +865,6 @@
             spentFillCompletePresPsig = SPENT_FILL_COMPLETE_PRES_QD_HIGH_PSIG;
         }
     }
-    else
-    {
-        spentFillCompletePresPsig = SPENT_FILL_COMPLETE_PRES;
-    }
 
     // Collect the next sample of spent pressure
     lastPrevSpentDialPressure   = prevSpentDialPressure;
@@ -878,9 +879,9 @@
         absDiffSpentFillCount      = abs(diffSpentFillCompleteCount);
         adjustedSpeed              = ( ( (F32)absDiffSpentFillCount / (F32)balChamberValveClosePeriod ) * spentDialPumpSpeed ) * D48_SPEED_ADJUST_FACTOR;
 
-        //Not adjust the D48 pump speed if the fill counter is just 50ms difference from the closing period.
-        if ( 0 == ( ( diffSpentFillCompleteCount <= 0 ) && ( diffSpentFillCompleteCount >= -2 ) ) )
-        //if ( absDiffSpentFillCount > SPENT_DIFF_COUNT_DEADBAND )
+        result = ( ( diffSpentFillCompleteCount <= 0 ) && ( diffSpentFillCompleteCount >= -2 ) ) ? TRUE : FALSE;
+        //Not adjust the D48 pump speed if the fill counter is just 50ms difference from the closing period(considering only positive DEADBAND as negative deadband might indicate under fill of BC).
+        if ( 0 == result )
         {
             if ( diffSpentFillCompleteCount < SPENT_DIFF_COUNT_ZERO )
             {
@@ -956,6 +957,7 @@
  * switching only On/Off status.
  * @details \b Inputs: balanceChamberSwitchingOnly
  * @details \b Outputs: none
+ * @param OnOff to set the BC switch status
  * @return none
  *************************************************************************/
 void setBalChamberSwitchingOnlyStatus( BOOL OnOff )