Index: firmware/App/Controllers/BalancingChamber.c
===================================================================
diff -u -recba518e47db27ce66d40db425f765ed676be173 -rbdf2c733a764466fcc4a0ff4938f5c97456bdb77
--- firmware/App/Controllers/BalancingChamber.c	(.../BalancingChamber.c)	(revision ecba518e47db27ce66d40db425f765ed676be173)
+++ firmware/App/Controllers/BalancingChamber.c	(.../BalancingChamber.c)	(revision bdf2c733a764466fcc4a0ff4938f5c97456bdb77)
@@ -45,13 +45,11 @@
 #define BAL_CHAMBER_FILL_PRES_DROP_MS               ( 200 / TASK_GENERAL_INTERVAL )             ///< Time (ms/tasktime) to confirm the balancing chamber filling started and corrosponding valves opened.
 #define BAL_CHAMBER_FILL_COMPLETE_MS                ( 300 / TASK_GENERAL_INTERVAL )             ///< Time (ms/tasktime) to confirm the balancing chamber fill completed and pressure is within range
 #define SPENT_FILL_COMPLETE_PRES                    25.0F                                       ///< Spent fill complete pressure (PSI) for Diener 2000 pump.
-#define SPENT_FILL_COMPLETE_PRES_QD_MID_PSIG        15.0F                                       ///< Spent fill complete pressure (PSI) when Diener 1000 and 200 < Qd <= 400.
+#define SPENT_FILL_COMPLETE_PRES_QD_MID_PSIG        10.0F                                       ///< Spent fill complete pressure (PSI) when Diener 1000 and 200 < Qd <= 400.
 #define SPENT_FILL_COMPLETE_PRES_QD_HIGH_PSIG       20.0F                                       ///< Spent fill complete pressure (PSI) when Diener 1000 and Qd > 400.
 #define SPENT_FILL_COMPLETE_QD_SLOPE_MAX_MLPM       300.0F                                      ///< For Qd <= 300 mL/min, spent fill completion uses pressure-rise slope detection.
-#define SPENT_FILL_COMPLETE_QD_TWO_HIT_MAX_MLPM     150.0F                                      ///< For Qd <= 150 mL/min, require two rise detections; above this and <=300, one rise detection is enough.
 #define SPENT_FILL_COMPLETE_DP_RISE_PSIG            0.5F                                        ///< Minimum 100 ms spent pressure rise (current minus n-2) to count as a rise hit at low Qd.
 #define SPENT_FILL_SLOPE_SPENT_PRESSURE_HIGH_PSIG   2.0F                                        ///< Above this absolute spent pressure, only one rise hit is required.
-#define SPENT_FILL_SLOPE_SPENT_PRESSURE_LOW_PSIG    0.5F                                        ///< Below this absolute spent pressure, use Qd-based required rise hit count.
 #define SPENT_FILL_SLOPE_MAX_RISE_HITS              2                                           ///< Rise hits required when Qd <= 150 in the low spent-pressure band.
 #define SPENT_FILL_DETECT_COUNT_TOL_PCT             1.0F                                        ///< Allowed detection timing tolerance as a fraction of expected BC switching count.
 #define QD_THRESHOLD_HIGH_MLPM                      400.0F                                      ///< Qd threshold (mL/min) below which mid pressure limit applies.
@@ -60,7 +58,7 @@
 #define D48_SPEED_RANGE_LIMIT                       0.25F                                       ///< D48 speed adjustment range check limit ( D48 speed can vary +/-25% of initial calculated speed)
 #define BICARB_CHAMBER_PERIODIC_FILL_TIME           ( 1 * SEC_PER_MIN * \
                                                     ( MS_PER_SECOND / TASK_GENERAL_INTERVAL ) ) ///< Periodic bicarb chamber fill request 60 sec x 20 = 1200
-#define BAL_CHAMBER_FILL_TIMEOUT_FACTOR             2.5F                                        ///< Balancing Chamber fill timeout factor (250% of observed fill count)
+#define BAL_CHAMBER_FILL_TIMEOUT_FACTOR             3.0F                                        ///< Balancing Chamber fill timeout factor (300% of observed fill count)
 
 /// Payload record structure for balancing chamber switch only request
 typedef struct
@@ -266,7 +264,7 @@
         //Update last td dialysate flow rate
         lastTdDialysateFlowrate = tdDialysateFlowrate;
 
-        // Update fill timeout count based on the switching period (e.g. 250% of period)
+        // Update fill timeout count based on the switching period (e.g. 300% of period)
         balChamberFillTimeoutCount = (U32)( (F32)balChamberSwitchingPeriod * BAL_CHAMBER_FILL_TIMEOUT_FACTOR );
 
         //Reset the BC switching flag for new Qd.
@@ -1148,6 +1146,13 @@
             state = BAL_CHAMBER_STATE1_FILL_START;
         }
     }
+    else
+    {   // For Balancing Chamber Switch Only command, change state as per the switching period
+        if ( currentBalChamberSwitchingCounter >= balChamberSwitchingPeriod )
+        {
+            state = BAL_CHAMBER_STATE1_FILL_START;
+        }
+    }
 
     // Clear the switching only on request flag.
     balanceChamberSwitchingOnlyOnRequested = FALSE;
@@ -1270,10 +1275,6 @@
         {
             requiredRiseCount = 1U;
         }
-        else if ( riseDeltaPsi < SPENT_FILL_SLOPE_SPENT_PRESSURE_LOW_PSIG )
-        {
-            requiredRiseCount = ( qdMlpm <= SPENT_FILL_COMPLETE_QD_TWO_HIT_MAX_MLPM ) ? SPENT_FILL_SLOPE_MAX_RISE_HITS : 1U;
-        }
         else
         {
             requiredRiseCount = 2U;
@@ -1400,8 +1401,11 @@
                 }
             }
 
-            //Update spent fill is complete
-            isSpentFillComplete = TRUE;
+	    //Update spent fill is complete
+            if ( currentBalChamberSwitchingCounter >= balChamberValveClosePeriod )
+            {
+                isSpentFillComplete = TRUE;
+            }
         }
     }
 }