Index: firmware/App/Modes/ModeGenDialysate.c
===================================================================
diff -u -r0bcd9e3ddfeb40efa313e7ed8d8d58f996a13960 -r48c4d25d6918813d93165fe4e7fee3bf0c247b7c
--- firmware/App/Modes/ModeGenDialysate.c	(.../ModeGenDialysate.c)	(revision 0bcd9e3ddfeb40efa313e7ed8d8d58f996a13960)
+++ firmware/App/Modes/ModeGenDialysate.c	(.../ModeGenDialysate.c)	(revision 48c4d25d6918813d93165fe4e7fee3bf0c247b7c)
@@ -7,8 +7,8 @@
 *
 * @file    ModeGenDialysate.c
 *
-* @author  (last)      Vinayakam Mani
-* @date    (last)      11-Feb-2026
+* @author  (last)      Jashwant Gantyada
+* @date    (last)      13-Mar-2026
 *
 * @author  (original)  Vinayakam Mani
 * @date    (original)  06-Nov-2024
@@ -63,15 +63,15 @@
 #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 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.,
+#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
 typedef struct
 {
@@ -112,6 +112,7 @@
 static void checkDialysateTemperature( void );
 static void monitorChamberLevelStatus( void );
 static void publishGenDialysateModeData( void );
+static U32 getFreshDialPumpInitialRpm( void );
 
 /*********************************************************************//**
  * @brief
@@ -145,7 +146,7 @@
     bicarbFillStartTimeMS                       = 0;
     pendingSpentChamberFill                     = FALSE;
     pendingBicarbChamberFill                    = FALSE;
-    d48PumpSpeed                                = getD48MinPumpRPM();
+    d48PumpSpeed                                = getDialysatePumpMinRPM( D48_PUMP );
     //Testing
     bypassStateDelayStartTimeMS                 = 0;
     delayBypassStateFlag                        = TRUE;
@@ -210,6 +211,26 @@
 
 /*********************************************************************//**
  * @brief
+ * The getFreshDialPumpInitialRpm function returns fresh dialysate pump initial
+ * rpm based on hardwawre configuration.
+ * @details Inputs: FRESH_DIAL_PUMP_INITIAL_RPM, FRESH_DIAL_PUMP_INITIAL_RPM_B1_9_B2_0
+ * @details Outputs: none
+ * @return fresh dialysate pump initial RPM for the active hardware variant
+ *************************************************************************/
+static U32 getFreshDialPumpInitialRpm( 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
@@ -267,7 +288,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, getFreshDialPumpInitialRpm(), TRUE );
             //setDialysatePumpTargetRPM( D48_PUMP, SPENT_DIAL_PUMP_INITIAL_RPM, FALSE );
             setDialysatePumpTargetRPM( D48_PUMP, d48PumpSpeed, TRUE );
 
@@ -315,7 +336,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, getFreshDialPumpInitialRpm(), TRUE );
             //setDialysatePumpTargetRPM( D48_PUMP, SPENT_DIAL_PUMP_INITIAL_RPM, FALSE );
             setDialysatePumpTargetRPM( D48_PUMP, d48PumpSpeed, TRUE );
 
@@ -367,10 +388,8 @@
             setHeaterTargetTemperature( D5_HEAT, getGenDialysateTargetTemperature() );
             setD28TempFeedbackControl( TRUE );
             startHeater( D5_HEAT );
-            // Stop trimmer heater
-            stopHeater( D45_HEAT );
 
-            setDialysatePumpTargetRPM( D12_PUMP, FRESH_DIAL_PUMP_INITIAL_RPM, TRUE );
+            setDialysatePumpTargetRPM( D12_PUMP, getFreshDialPumpInitialRpm(), TRUE );
             setDialysatePumpTargetRPM( D48_PUMP, SPENT_DIAL_PUMP_FILL_RPM, TRUE );
 
             //Rinse pump On
@@ -684,19 +703,32 @@
     F32 dialFlowrate = getTDDialysateFlowrate();
     F32 slope;
     F32 intercept;
+    F32 calculatedSpeed;
+    U32 rpm;
 
-    if ( TRUE == getTestConfigStatus( TEST_CONFIG_DD_ENABLE_DIENER_1000_PUMP ) )
+    if ( TRUE == getTestConfigStatus( TEST_CONFIG_DD_ENABLE_DIENER_2000_PUMP ) )
     {
+        slope     = PUMP_SPEED_SLOPE_FACTOR_DIENER_2000;
+        intercept = PUMP_SPEED_INTERCEPT_FACTOR_DIENER_2000;
+    }
+    else
+    {
         slope     = PUMP_SPEED_SLOPE_FACTOR_DIENER_1000;
         intercept = PUMP_SPEED_INTERCEPT_FACTOR_DIENER_1000;
     }
-    else
+
+    // Calculate nominal speed from Qd.
+    calculatedSpeed = ( slope * dialFlowrate ) + intercept;
+
+    // Prevent negative before converting to unsigned and round up using ceilf.
+    if ( calculatedSpeed < 0.0F )
     {
-        slope     = PUMP_SPEED_SLOPE_FACTOR_DIENER_2000;
-        intercept = PUMP_SPEED_INTERCEPT_FACTOR_DIENER_2000;
+        calculatedSpeed = 0.0F;
     }
 
-    return (U32)( ( slope * dialFlowrate ) + intercept );
+    rpm = (U32)ceilf( calculatedSpeed );
+
+    return rpm;
 }
 
 /*********************************************************************//**