Index: firmware/App/Modes/ModeGenDialysate.c
===================================================================
diff -u -rd748813399d38ef5b71d760e327e368cc82d7a38 -r97eba3d39e6ddf44276b77b1aea1171805ca142d
--- firmware/App/Modes/ModeGenDialysate.c	(.../ModeGenDialysate.c)	(revision d748813399d38ef5b71d760e327e368cc82d7a38)
+++ firmware/App/Modes/ModeGenDialysate.c	(.../ModeGenDialysate.c)	(revision 97eba3d39e6ddf44276b77b1aea1171805ca142d)
@@ -33,6 +33,7 @@
 #include "TaskGeneral.h"
 #include "TDInterface.h"
 #include "Temperature.h"
+#include "TestSupport.h"
 #include "Timers.h"
 #include "Ultrafiltration.h"
 #include "Valves.h"
@@ -62,7 +63,13 @@
 #define LOW_DIAL_FLOW_RATE                              150.0F                                      ///< Dialysate flow rate lesser than 150 considered to be low Qds.
 #define ZERO_DIAL_FLOW_RATE                             0.0F                                        ///< Zero dialysate flow rate
 #define SPENT_CHAMBER_FILL_MAX_COUNT                    10                                          ///< Total number of spent chamber fill allowed.
+#define BICARB_CHAMBER_FILL_TIMEOUT                    ( 1 * MS_PER_SECOND )                        ///< Bicarb chamber fill timeout.
+#define PUMP_SPEED_SLOPE_FACTOR_DIENER_2000             1.24F                                       ///< D48 Diener 2000 pump speed slope (y = 1.24x + 30).
+#define PUMP_SPEED_INTERCEPT_FACTOR_DIENER_2000         30.0F                                       ///< D48 Diener 2000 pump speed intercept.
+#define PUMP_SPEED_SLOPE_FACTOR_DIENER_1000             2.869F                                      ///< D48 Diener 1000 pump speed slope (y = 2.869x + 25.956).
+#define PUMP_SPEED_INTERCEPT_FACTOR_DIENER_1000         25.956F                                     ///< D48 Diener 1000 pump speed intercept.
 #define BICARB_CHAMBER_FILL_TIMEOUT                     ( 1 * MS_PER_SECOND )                       ///< Bicarb chamber fill timeout.
+
 //Testing
 #define DELAY_BC_SWITCHING_AT_START_UP          ( 10 * MS_PER_SECOND )                              ///< Provide a balancing chamber switching start up delay to stabilize pump speed etc.,
 /// Payload record structure for Gen dialysate execution state set request
@@ -88,6 +95,7 @@
 static U32 bypassStateDelayStartTimeMS;                                                     ///< Delay balancing chamber switching for a second to preapre pump steady state.
 static BOOL delayBypassStateFlag;                                                           ///< To indicate change in treatment parameters
 static F32 dialysateToDialyzerFlowRate;                                                     ///< Current dialysate to dialyzer flow rate (ml/min)
+static U32 d48PumpSpeed;                                                                    ///< Initial D48 pump speed based on the Qd.
 
 // ********** private function prototypes **********
 
@@ -137,6 +145,7 @@
     bicarbFillStartTimeMS                       = 0;
     pendingSpentChamberFill                     = FALSE;
     pendingBicarbChamberFill                    = FALSE;
+    d48PumpSpeed                                = getD48MinPumpRPM();
     //Testing
     bypassStateDelayStartTimeMS                 = 0;
     delayBypassStateFlag                        = TRUE;
@@ -160,8 +169,13 @@
  *************************************************************************/
 U32 transitionToGenDialysateMode( void )
 {
+    U32 initialD48PumpSpeed = 0U;
+
     initGenDialysateMode();
     setCurrentSubState( NO_SUB_STATE );
+    //calculateD48PumpSpeedForBCFill();
+    initialD48PumpSpeed = getCalculatedD48PumpSpeedForBCFill();
+    setD48PumpSpeedForBCFill( initialD48PumpSpeed );
     transitionToUltrafiltration();
 
     return genDialysateState;
@@ -243,7 +257,7 @@
             //setDialysatePumpTargetRPM( D12_PUMP, FRESH_DIAL_PUMP_INITIAL_RPM, FALSE );
             setDialysatePumpTargetRPM( D12_PUMP, FRESH_DIAL_PUMP_INITIAL_RPM, TRUE );
             //setDialysatePumpTargetRPM( D48_PUMP, SPENT_DIAL_PUMP_INITIAL_RPM, FALSE );
-            setDialysatePumpTargetRPM( D48_PUMP, SPENT_DIAL_PUMP_INITIAL_RPM, TRUE );
+            setDialysatePumpTargetRPM( D48_PUMP, d48PumpSpeed, TRUE );
 
             //Rinse pump On
             setRinsePumpState( RINSE_PUMP_STATE_ON );
@@ -279,7 +293,7 @@
             //setDialysatePumpTargetRPM( D12_PUMP, FRESH_DIAL_PUMP_INITIAL_RPM, FALSE );
             setDialysatePumpTargetRPM( D12_PUMP, FRESH_DIAL_PUMP_INITIAL_RPM, TRUE );
             //setDialysatePumpTargetRPM( D48_PUMP, SPENT_DIAL_PUMP_INITIAL_RPM, FALSE );
-            setDialysatePumpTargetRPM( D48_PUMP, SPENT_DIAL_PUMP_INITIAL_RPM, TRUE );
+            setDialysatePumpTargetRPM( D48_PUMP, d48PumpSpeed, TRUE );
 
             //Rinse pump On
             setRinsePumpState( RINSE_PUMP_STATE_ON );
@@ -372,7 +386,7 @@
             setRinsePumpState( RINSE_PUMP_STATE_ON );
 
             setDialysatePumpTargetRPM( D12_PUMP, FRESH_DIAL_PUMP_INITIAL_RPM, TRUE );
-            setDialysatePumpTargetRPM( D48_PUMP, SPENT_DIAL_PUMP_INITIAL_RPM, TRUE );
+            setDialysatePumpTargetRPM( D48_PUMP, d48PumpSpeed, TRUE );
             break;
 
         case DD_GEND_DIALYSATE_DELIVERY_PAUSE:
@@ -544,6 +558,31 @@
 
 /*********************************************************************//**
  * @brief
+ * The getD48PumpSpeedForBCFill function returns the calculated D48 pump speed
+ * @details \b Inputs: d48PumpSpeed
+ * @details \b Outputs: none
+ * @return D48 pump speed.
+ *************************************************************************/
+U32 getD48PumpSpeedForBCFill( void )
+{
+    return d48PumpSpeed;
+}
+
+/*********************************************************************//**
+ * @brief
+ * The setD48PumpSpeedForBCFill function sets the updated D48 pump speed.
+ * @details \b Inputs: none
+ * @details \b Outputs: d48PumpSpeed
+ * @param pumpSpeed Dialysate pump speed
+ * @return none.
+ *************************************************************************/
+void setD48PumpSpeedForBCFill( U32 pumpSpeed )
+{
+    d48PumpSpeed = pumpSpeed;
+}
+
+/*********************************************************************//**
+ * @brief
  * The monitorChamberLevelStatus function checks the spent chamber and bicarb
  * chamber level status and updates the corrosponding flags.
  * @details \b Inputs: Spent and bicarb chamber levels.
@@ -582,7 +621,7 @@
 
     if ( dialFlowrate >= LOW_DIAL_FLOW_RATE )
     {
-        //  linear releationship seen against high dialysate flowrate Vs DeltaTemp
+        //  linear relationship seen against high dialysate flowrate Vs DeltaTemp
         //  deltaTemp = (-0.0029 * Qd) + 3.47
         deltaTemp = ( LINEAR_SLOPE_FACTOR * dialFlowrate ) + LINEAR_INTERCEPT_FACTOR;
     }
@@ -599,6 +638,34 @@
 
 /*********************************************************************//**
  * @brief
+ * The getCalculatedD48PumpSpeedForBCFill function returns the D48 pump speed
+ * calculated from dialysate flow rate (Qd) for continuous delivery.
+ * @details \b Inputs: Qd from TD, test config TEST_CONFIG_DD_ENABLE_DIENER_1000_PUMP.
+ * @details \b Outputs: none
+ * @return Calculated D48 pump speed in RPM (Diener 1000 or 2000 formula per test config).
+ *************************************************************************/
+U32 getCalculatedD48PumpSpeedForBCFill( void )
+{
+    F32 dialFlowrate = getTDDialysateFlowrate();
+    F32 slope;
+    F32 intercept;
+
+    if ( TRUE == getTestConfigStatus( TEST_CONFIG_DD_ENABLE_DIENER_1000_PUMP ) )
+    {
+        slope     = PUMP_SPEED_SLOPE_FACTOR_DIENER_1000;
+        intercept = PUMP_SPEED_INTERCEPT_FACTOR_DIENER_1000;
+    }
+    else
+    {
+        slope     = PUMP_SPEED_SLOPE_FACTOR_DIENER_2000;
+        intercept = PUMP_SPEED_INTERCEPT_FACTOR_DIENER_2000;
+    }
+
+    return (U32)( ( slope * dialFlowrate ) + intercept );
+}
+
+/*********************************************************************//**
+ * @brief
  * The handleGenDDialysateIsolatedUFState function performs the
  * Isolated ultrafiltration operations.
  * @details \b Inputs: none.
@@ -886,6 +953,8 @@
  *************************************************************************/
 void updateTreatmentSettings( void )
 {
+    F32 initialPumpSpeed = 0.0F;
+
     // Update any dynamic treatment parameter changes
     if ( TRUE == isTreatmentParamUpdated )
     {
@@ -904,6 +973,11 @@
         //TODO: update others parameters setting as needed.
         signalUFRateUpdate();
 
+        //Update D48 pump speed
+        //calculateD48PumpSpeedForBCFill();
+        initialPumpSpeed = getCalculatedD48PumpSpeedForBCFill();
+        setD48PumpSpeedForBCFill( initialPumpSpeed );
+
         //reset the flag
         isTreatmentParamUpdated = FALSE;
     }