Index: firmware/App/Modes/ModeGenDialysate.c
===================================================================
diff -u -rd748813399d38ef5b71d760e327e368cc82d7a38 -r386ce738c353bd6faff174083069b390c9d505bc
--- firmware/App/Modes/ModeGenDialysate.c	(.../ModeGenDialysate.c)	(revision d748813399d38ef5b71d760e327e368cc82d7a38)
+++ firmware/App/Modes/ModeGenDialysate.c	(.../ModeGenDialysate.c)	(revision 386ce738c353bd6faff174083069b390c9d505bc)
@@ -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"
@@ -104,6 +105,7 @@
 static void checkDialysateTemperature( void );
 static void monitorChamberLevelStatus( void );
 static void publishGenDialysateModeData( void );
+static U32 getFreshDialPumpRpm( void );
 
 /*********************************************************************//**
  * @brief
@@ -194,6 +196,26 @@
 
 /*********************************************************************//**
  * @brief
+ * The getFreshDialPumpRpm function returns fresh dialysate pump initial
+ * rpm based on hardwawre configuration.
+ * @details Inputs: TEST_CONFIG_DD_FP_ENABLE_BETA_1_0_HW
+ * @details Outputs: none
+ * @return fresh dialysate pump initial RPM for the active hardware variant
+ *************************************************************************/
+static U32 getFreshDialPumpRpm( void )
+{
+    U32 rpm = FRESH_DIAL_PUMP_INITIAL_RPM_B1_9_B2_0;
+
+    if ( TRUE == getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_1_0_HW ) )
+    {
+        rpm = FRESH_DIAL_PUMP_INITIAL_RPM;
+    }
+
+    return rpm;
+}
+
+/*********************************************************************//**
+ * @brief
  * The setModeGenDStateTransition function sets the actuators and variables
  * for the state transition in generate dialysis mode.
  * @details Inputs: Valve states, Pump speed
@@ -241,7 +263,7 @@
 
             //Testing : Enable close loop once testing is complete
             //setDialysatePumpTargetRPM( D12_PUMP, FRESH_DIAL_PUMP_INITIAL_RPM, FALSE );
-            setDialysatePumpTargetRPM( D12_PUMP, FRESH_DIAL_PUMP_INITIAL_RPM, TRUE );
+            setDialysatePumpTargetRPM( D12_PUMP, getFreshDialPumpRpm(), TRUE );
             //setDialysatePumpTargetRPM( D48_PUMP, SPENT_DIAL_PUMP_INITIAL_RPM, FALSE );
             setDialysatePumpTargetRPM( D48_PUMP, SPENT_DIAL_PUMP_INITIAL_RPM, TRUE );
 
@@ -277,7 +299,7 @@
             startHeater( D45_HEAT );
 
             //setDialysatePumpTargetRPM( D12_PUMP, FRESH_DIAL_PUMP_INITIAL_RPM, FALSE );
-            setDialysatePumpTargetRPM( D12_PUMP, FRESH_DIAL_PUMP_INITIAL_RPM, TRUE );
+            setDialysatePumpTargetRPM( D12_PUMP, getFreshDialPumpRpm(), TRUE );
             //setDialysatePumpTargetRPM( D48_PUMP, SPENT_DIAL_PUMP_INITIAL_RPM, FALSE );
             setDialysatePumpTargetRPM( D48_PUMP, SPENT_DIAL_PUMP_INITIAL_RPM, TRUE );
 
@@ -329,7 +351,7 @@
             // Stop trimmer heater
             stopHeater( D45_HEAT );
 
-            setDialysatePumpTargetRPM( D12_PUMP, FRESH_DIAL_PUMP_INITIAL_RPM, TRUE );
+            setDialysatePumpTargetRPM( D12_PUMP, getFreshDialPumpRpm(), TRUE );
             setDialysatePumpTargetRPM( D48_PUMP, SPENT_DIAL_PUMP_FILL_RPM, TRUE );
 
             //Rinse pump On
@@ -371,12 +393,12 @@
             //Rinse pump On
             setRinsePumpState( RINSE_PUMP_STATE_ON );
 
-            setDialysatePumpTargetRPM( D12_PUMP, FRESH_DIAL_PUMP_INITIAL_RPM, TRUE );
+            setDialysatePumpTargetRPM( D12_PUMP, getFreshDialPumpRpm(), TRUE );
             setDialysatePumpTargetRPM( D48_PUMP, SPENT_DIAL_PUMP_INITIAL_RPM, TRUE );
             break;
 
         case DD_GEND_DIALYSATE_DELIVERY_PAUSE:
-            setDialysatePumpTargetRPM( D12_PUMP, FRESH_DIAL_PUMP_INITIAL_RPM, TRUE );
+            setDialysatePumpTargetRPM( D12_PUMP, getFreshDialPumpRpm(), TRUE );
             signalDialysatePumpHardStop( D48_PUMP );
             requestConcentratePumpOff( D11_PUMP, FALSE );
             requestConcentratePumpOff( D10_PUMP, FALSE );