Index: firmware/App/Modes/ModeGenDialysate.c
===================================================================
diff -u -rb689a4627e86e263cb69e83b91e80802bf411c92 -r4cdcb589ad34efa472c94180e6de938132cbc89b
--- firmware/App/Modes/ModeGenDialysate.c	(.../ModeGenDialysate.c)	(revision b689a4627e86e263cb69e83b91e80802bf411c92)
+++ firmware/App/Modes/ModeGenDialysate.c	(.../ModeGenDialysate.c)	(revision 4cdcb589ad34efa472c94180e6de938132cbc89b)
@@ -8,14 +8,15 @@
 * @file    ModeGenDialysate.c
 *
 * @author  (last)      Jashwant Gantyada
-* @date    (last)      13-Mar-2026
+* @date    (last)      10-Apr-2026
 *
 * @author  (original)  Vinayakam Mani
 * @date    (original)  06-Nov-2024
 *
 ***************************************************************************/
-#include "math.h"  // for 'exp'
 
+#include <math.h> // For ceilf
+
 #include "BalancingChamber.h"
 #include "ConcentratePumps.h"
 #include "Conductivity.h"
@@ -169,7 +170,8 @@
 
     initGenDialysateMode();
     setCurrentSubState( NO_SUB_STATE );
-    //calculateD48PumpSpeedForBCFill();
+    // Deactivate Balancing Chamber Switching
+    requestBalChamberSwitching( FALSE );
     initialD48PumpSpeed = getCalculatedD48PumpSpeedForBCFill();
     setD48PumpSpeedForBCFill( initialD48PumpSpeed );
     transitionToUltrafiltration();
@@ -237,7 +239,8 @@
     switch( state )
     {
         case DD_GEND_STATE_START:
-            // Do nothing
+            // Deactivate Balancing Chamber Switching
+            requestBalChamberSwitching( FALSE );
             break;
 
         case DD_GEND_DIALYSATE_BYPASS_STATE:
@@ -266,7 +269,14 @@
             startHeater( D5_HEAT );
 
             //Turn on Trimmer heater
-            setHeaterTargetTemperature( D45_HEAT,  getFilteredTemperatureValue( D4_TEMP ) );
+            if ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_1_0_HW ) == TRUE )
+            {
+                setHeaterTargetTemperature( D45_HEAT, getFilteredTemperatureValue( D4_TEMP ) );
+            }
+            else
+            {
+                setHeaterTargetTemperature( D45_HEAT, getFilteredTemperatureValue( D99_TEMP ) );
+            }
             startHeater( D45_HEAT );
 
             //Testing : Enable close loop once testing is complete
@@ -279,13 +289,18 @@
             setRinsePumpState( RINSE_PUMP_STATE_ON );
 
             transitionToBalChamberFill();
+            // Activate Balancing Chamber Switching
+            requestBalChamberSwitching( TRUE );
 
             //Testing
             bypassStateDelayStartTimeMS = getMSTimerCount();
             delayBypassStateFlag        = TRUE;
             break;
 
         case DD_GEND_DIALYSATE_DELIVERY_STATE:
+            // Activate Balancing Chamber Switching
+            requestBalChamberSwitching( TRUE );
+
             //Previous state
             setValveState( D47_VALV, VALVE_STATE_CLOSED );  // spent chamber purge valve
             setValveState( D8_VALV, VALVE_STATE_CLOSED );
@@ -303,7 +318,14 @@
             startHeater( D5_HEAT );
 
             //Turn on Trimmer heater
-            setHeaterTargetTemperature( D45_HEAT, getFilteredTemperatureValue( D4_TEMP ) );
+            if ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_1_0_HW ) == TRUE )
+            {
+                setHeaterTargetTemperature( D45_HEAT, getFilteredTemperatureValue( D4_TEMP ) );
+            }
+            else
+            {
+                setHeaterTargetTemperature( D45_HEAT, getFilteredTemperatureValue( D99_TEMP ) );
+            }
             startHeater( D45_HEAT );
 
             //setDialysatePumpTargetRPM( D12_PUMP, FRESH_DIAL_PUMP_INITIAL_RPM, FALSE );
@@ -327,6 +349,9 @@
             break;
 
         case DD_GEND_SPENT_CHAMBER_FILL_STATE:
+            // Deactivate Balancing Chamber Switching
+            requestBalChamberSwitching( FALSE );
+
             //Set valves and actuators
             setValveState( D35_VALV, VALVE_STATE_CLOSED );  // VDI
             setValveState( D40_VALV, VALVE_STATE_CLOSED );  // VDO
@@ -370,6 +395,9 @@
             break;
 
         case DD_GEND_BICARB_CHAMBER_FILL_STATE:
+            // Deactivate Balancing Chamber Switching
+            requestBalChamberSwitching( FALSE );
+
             requestConcentratePumpOff( D11_PUMP, FALSE );
             requestConcentratePumpOff( D10_PUMP, FALSE );
             requestConcentratePumpOff( D76_PUMP, FALSE );
@@ -401,11 +429,13 @@
             //Rinse pump On
             setRinsePumpState( RINSE_PUMP_STATE_ON );
 
-            setDialysatePumpTargetRPM( D12_PUMP, FRESH_DIAL_PUMP_INITIAL_RPM, TRUE );
+            setDialysatePumpTargetRPM( D12_PUMP, getFreshDialPumpInitialRpm(), TRUE );
             setDialysatePumpTargetRPM( D48_PUMP, d48PumpSpeed, TRUE );
             break;
 
         case DD_GEND_DIALYSATE_DELIVERY_PAUSE:
+            // Deactivate Balancing Chamber Switching
+            requestBalChamberSwitching( FALSE );
             setDialysatePumpTargetRPM( D12_PUMP, getFreshDialPumpInitialRpm(), TRUE );
             signalDialysatePumpHardStop( D48_PUMP );
             requestConcentratePumpOff( D11_PUMP, FALSE );
@@ -447,6 +477,8 @@
             break;
 
         case DD_GEND_ISOLATED_UF_STATE:
+            // Deactivate Balancing Chamber Switching
+            requestBalChamberSwitching( FALSE );
             //TODO : define actuators states
             break;
 
@@ -704,11 +736,6 @@
             delayBypassStateFlag = FALSE;
         }
     }
-    else
-    {
-        //Execute balancing chamber
-        execBalancingChamberControl();
-    }
 
     if ( getTestConfigStatus( TEST_CONFIG_DD_ENABLE_SPENT_CHAMBER_H_FILL ) == TRUE )
     {
@@ -785,9 +812,6 @@
 #endif
     else
     {
-        //Execute balancing chamber
-        execBalancingChamberControl();
-
         //Execute ultrafiltration
         execUFControl();
     }
@@ -986,9 +1010,9 @@
         signalUFRateUpdate();
 
         //Update D48 pump speed
-        //calculateD48PumpSpeedForBCFill();
         initialPumpSpeed = getCalculatedD48PumpSpeedForBCFill();
         setD48PumpSpeedForBCFill( initialPumpSpeed );
+        setDialysatePumpTargetRPM( D48_PUMP, (U32)initialPumpSpeed, TRUE );
 
         //reset the flag
         isTreatmentParamUpdated = FALSE;