Index: firmware/App/Controllers/BalancingChamber.c
===================================================================
diff -u -rb2e7c9194acd84783d2bbad64c5720410493e199 -rd0a2037b16f76e661dc02296e039f099ce5d9ea8
--- firmware/App/Controllers/BalancingChamber.c	(.../BalancingChamber.c)	(revision b2e7c9194acd84783d2bbad64c5720410493e199)
+++ firmware/App/Controllers/BalancingChamber.c	(.../BalancingChamber.c)	(revision d0a2037b16f76e661dc02296e039f099ce5d9ea8)
@@ -19,6 +19,7 @@
 #include "Conductivity.h"
 #include "ConcentratePumps.h"
 #include "DialysatePumps.h"
+#include "DryBiCart.h"
 #include "FpgaDD.h"
 #include "Heaters.h"
 #include "ModeGenDialysate.h"
@@ -428,6 +429,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;
@@ -438,8 +441,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 );
 
@@ -652,6 +664,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;
@@ -662,8 +676,17 @@
     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 );