Index: firmware/App/Controllers/BalancingChamber.c
===================================================================
diff -u -rae31b4c999dccae70fb40fb9d98a4380ce2c7415 -r97a38c5fddfc9e5dbebfae9742cbf82d2d1a3487
--- firmware/App/Controllers/BalancingChamber.c	(.../BalancingChamber.c)	(revision ae31b4c999dccae70fb40fb9d98a4380ce2c7415)
+++ firmware/App/Controllers/BalancingChamber.c	(.../BalancingChamber.c)	(revision 97a38c5fddfc9e5dbebfae9742cbf82d2d1a3487)
@@ -480,6 +480,8 @@
  *************************************************************************/
 static BAL_CHAMBER_EXEC_STATE_T handleBalChamberState1FillStart( void )
 {
+    F32 acidVolume;
+    F32 bicarbVolume;
     BAL_CHAMBER_EXEC_STATE_T state      = BAL_CHAMBER_STATE1_FILL_START;
     currentBalChamberSwitchingCounter   = 0;
     balChamberSWState                   = BAL_CHAMBER_SW_STATE1;
@@ -490,8 +492,17 @@
     isPressureDroppedDuringFill         = FALSE;
     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 );
 
@@ -731,6 +742,8 @@
  *************************************************************************/
 static BAL_CHAMBER_EXEC_STATE_T handleBalChamberState2FillStart( void )
 {
+    F32 acidVolume;
+    F32 bicarbVolume;
     BAL_CHAMBER_EXEC_STATE_T state      = BAL_CHAMBER_STATE2_FILL_START;
     currentBalChamberSwitchingCounter   = 0;
     isBalChamberFillInProgress          = FALSE;
@@ -741,8 +754,16 @@
     balChamberFillTimeoutCount          = 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 );