Index: firmware/App/Controllers/BalancingChamber.c
===================================================================
diff -u -r809b9916241453e182e626d04ae5b1934f019fcc -rdeba34e5074da9ac97d8bcbe995f554eec5c70ed
--- firmware/App/Controllers/BalancingChamber.c	(.../BalancingChamber.c)	(revision 809b9916241453e182e626d04ae5b1934f019fcc)
+++ firmware/App/Controllers/BalancingChamber.c	(.../BalancingChamber.c)	(revision deba34e5074da9ac97d8bcbe995f554eec5c70ed)
@@ -6,7 +6,7 @@
 * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
 *
 * @file    BalancingChamber.c
-*f
+*
 * @author  (last)      Dara Navaei
 * @date    (last)      18-Mar-2026
 *
@@ -19,7 +19,7 @@
 #include "Conductivity.h"
 #include "ConcentratePumps.h"
 #include "DialysatePumps.h"
-#include "DryBiCart.h" // For request setBicarbChamberFillRequested
+#include "DryBiCart.h"
 #include "FpgaDD.h"
 #include "Heaters.h"
 #include "ModeGenDialysate.h"
@@ -260,7 +260,7 @@
     currentBalChamberSwitchingCounter += 1;
     currentBalChamberFillCounter += 1;
 
-    if ( getTestConfigStatus( TEST_CONFIG_DD_ENABLE_DRY_BICARB ) == TRUE )
+    if ( getTestConfigStatus( TEST_CONFIG_DD_ENABLE_DRY_BICARB ) == TRUE && balChamberExecState > BAL_CHAMBER_STATE_IDLE)
     {
         // Increment counter for dry bicarb chamber fill
         bicarbChamberPeriodicFillCounter += 1;
@@ -508,6 +508,8 @@
  *************************************************************************/
 static BAL_CHAMBER_EXEC_STATE_T handleBalChamberState1FillStart( void )
 {
+    F32 acidVolume;
+    F32 bicarbVolume;
     BAL_CHAMBER_EXEC_STATE_T state      = BAL_CHAMBER_STATE1_FILL_START;
     balChamberSWState                   = BAL_CHAMBER_SW_STATE1;
     balChamberFillTimeoutCount          = 0;
@@ -522,10 +524,20 @@
     spentFillRiseMissCounter            = 0;
     isSpentFillComplete                 = FALSE;
 
-    F32 acidVolume            = getF32OverrideValue( &acidDoseVolume );
-    F32 bicarbVolume          = getF32OverrideValue( &bicarbDoseVolume );
+    if ( getTestConfigStatus( TEST_CONFIG_DD_ENABLE_DRY_BICARB ) == TRUE )
+    {
+        bicarbVolume = getBicarbDoseVol();
+        acidVolume = getAcidDoseVol();
+    }
+    else
+    {
+        acidVolume        = getF32OverrideValue( &acidDoseVolume );
+        bicarbVolume      = getF32OverrideValue( &bicarbDoseVolume );
+    }
+
     freshDialPressure         = getFilteredPressure( D18_PRES );
     spentDialPressure         = getFilteredPressure( D51_PRES );
+
     lastPrevSpentDialPressure = spentDialPressure;
 
     if ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_1_0_HW ) == TRUE )
@@ -553,8 +565,8 @@
         if ( TRUE != getBalChamberSwitchingOnlyStatus() )
         {
             // start acid and bicarb pump with the expected quantity
-            setConcentratePumpTargetSpeed( D11_PUMP, CONCENTRATE_PUMP_MAX_SPEED, acidVolume );
-            setConcentratePumpTargetSpeed( D10_PUMP, CONCENTRATE_PUMP_MAX_SPEED, bicarbVolume );
+            setConcentratePumpTargetSpeed( D11_PUMP, DOSING_CONCENTRATE_PUMP_SPEED, acidVolume );
+            setConcentratePumpTargetSpeed( D10_PUMP, DOSING_CONCENTRATE_PUMP_SPEED, bicarbVolume );
             requestConcentratePumpOn( D11_PUMP );
             requestConcentratePumpOn( D10_PUMP );
         }
@@ -797,6 +809,8 @@
  *************************************************************************/
 static BAL_CHAMBER_EXEC_STATE_T handleBalChamberState2FillStart( void )
 {
+    F32 acidVolume;
+    F32 bicarbVolume;
     BAL_CHAMBER_EXEC_STATE_T state      = BAL_CHAMBER_STATE2_FILL_START;
     isBalChamberFillInProgress          = FALSE;
     isPressureStabilizedDuringFill      = FALSE;
@@ -811,10 +825,20 @@
     spentFillRiseMissCounter            = 0;
     isSpentFillComplete                 = FALSE;
 
-    F32 acidVolume            = getF32OverrideValue( &acidDoseVolume );
-    F32 bicarbVolume          = getF32OverrideValue( &bicarbDoseVolume );
+   if ( getTestConfigStatus( TEST_CONFIG_DD_ENABLE_DRY_BICARB ) == TRUE )
+    {
+        bicarbVolume = getBicarbDoseVol();
+        acidVolume = getAcidDoseVol();
+    }
+    else
+    {
+        acidVolume        = getF32OverrideValue( &acidDoseVolume );
+        bicarbVolume      = getF32OverrideValue( &bicarbDoseVolume );
+    }
+
     freshDialPressure         = getFilteredPressure( D18_PRES );
     spentDialPressure         = getFilteredPressure( D51_PRES );
+
     lastPrevSpentDialPressure = spentDialPressure;
 
     if ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_1_0_HW ) == TRUE )
@@ -842,8 +866,8 @@
         if ( TRUE != getBalChamberSwitchingOnlyStatus() )
         {
             // start acid and bicarb pump with the expected quantity
-            setConcentratePumpTargetSpeed( D11_PUMP, CONCENTRATE_PUMP_MAX_SPEED, acidVolume );
-            setConcentratePumpTargetSpeed( D10_PUMP, CONCENTRATE_PUMP_MAX_SPEED, bicarbVolume );
+            setConcentratePumpTargetSpeed( D11_PUMP, DOSING_CONCENTRATE_PUMP_SPEED, acidVolume );
+            setConcentratePumpTargetSpeed( D10_PUMP, DOSING_CONCENTRATE_PUMP_SPEED, bicarbVolume );
             requestConcentratePumpOn( D11_PUMP );
             requestConcentratePumpOn( D10_PUMP );
         }