Index: firmware/App/Controllers/BalancingChamber.c
===================================================================
diff -u -r97eba3d39e6ddf44276b77b1aea1171805ca142d -rbafe5de9c1b14b2bb2afc97695ae25e6ec8fe080
--- firmware/App/Controllers/BalancingChamber.c	(.../BalancingChamber.c)	(revision 97eba3d39e6ddf44276b77b1aea1171805ca142d)
+++ firmware/App/Controllers/BalancingChamber.c	(.../BalancingChamber.c)	(revision bafe5de9c1b14b2bb2afc97695ae25e6ec8fe080)
@@ -42,7 +42,12 @@
 #define BAL_CHAMBER_DATA_PUBLISH_INTERVAL           ( 250 / TASK_GENERAL_INTERVAL )             ///< Interval (ms/task time) at which the balancing chamber data published.
 #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 pressure that indicates fill is complete.
+#define SPENT_FILL_COMPLETE_PRES                    25.0F                                       ///< Spent fill complete pressure (PSI) for Diener 2000 pump.
+#define SPENT_FILL_COMPLETE_PRES_QD_LOW_PSIG        3.5F                                        ///< Spent fill complete pressure (PSI) when Diener 1000 and Qd <= 200.
+#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_HIGH_PSIG       20.0F                                       ///< Spent fill complete pressure (PSI) when Diener 1000 and Qd > 400.
+#define QD_THRESHOLD_LOW_MLPM                       200.0F                                      ///< Qd threshold (mL/min) below which low pressure limit applies.
+#define QD_THRESHOLD_HIGH_MLPM                      400.0F                                      ///< Qd threshold (mL/min) below which mid pressure limit applies.
 #define SPENT_DIFF_COUNT_ZERO                       0                                           ///< Zero count difference for spent side fill comparing target count
 #define SPENT_DIFF_COUNT_DEADBAND                   1                                           ///< Stop changing D48 pump speed when fill difference reaches close to target count
 #define D48_SPEED_ADJUST_FACTOR                     0.5F                                        ///< D48 speed adjustment factor ( 50% of speed adjustment = 0.5)
@@ -814,14 +819,37 @@
     U32 minD48Speed                 = initialD48PumpSpeed - ( initialD48PumpSpeed * D48_SPEED_RANGE_LIMIT );
     U32 maxD48Speed                 = initialD48PumpSpeed + ( initialD48PumpSpeed * D48_SPEED_RANGE_LIMIT );
     U32 d48SpeedPostRangeCheck      = 0;
+    F32 qdMlpm                      = getTDDialysateFlowrate();
+    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 ) )
+    {
+        if ( qdMlpm <= QD_THRESHOLD_LOW_MLPM )
+        {
+            spentFillCompletePresPsig = SPENT_FILL_COMPLETE_PRES_QD_LOW_PSIG;
+        }
+        else if ( qdMlpm <= QD_THRESHOLD_HIGH_MLPM )
+        {
+            spentFillCompletePresPsig = SPENT_FILL_COMPLETE_PRES_QD_MID_PSIG;
+        }
+        else
+        {
+            spentFillCompletePresPsig = SPENT_FILL_COMPLETE_PRES_QD_HIGH_PSIG;
+        }
+    }
+    else
+    {
+        spentFillCompletePresPsig = SPENT_FILL_COMPLETE_PRES;
+    }
+
     // Collect the next sample of spent pressure
     lastPrevSpentDialPressure   = prevSpentDialPressure;
     prevSpentDialPressure       = spentDialPressure;
     // find the pressure difference for pressure spike detection
     diffInSpentPressure         = fabs(spentDialPressure - lastPrevSpentDialPressure);
 
-    if ( ( spentDialPressure >= SPENT_FILL_COMPLETE_PRES ) && ( isSpentFillComplete != TRUE ) )
+    if ( ( spentDialPressure >= spentFillCompletePresPsig ) && ( isSpentFillComplete != TRUE ) )
     {
         // Check spent fill time against the balancing chamber closing period
         diffSpentFillCompleteCount = balChamberValveClosePeriod - currentBalChamberFillCounter;