Index: firmware/App/Controllers/BalancingChamber.c
===================================================================
diff -u -ra569e34b86e389ce6d6f4c971ea86d2690dbaaed -rc9c9b1bade37555a0f226b9cc24529410325e3ed
--- firmware/App/Controllers/BalancingChamber.c	(.../BalancingChamber.c)	(revision a569e34b86e389ce6d6f4c971ea86d2690dbaaed)
+++ firmware/App/Controllers/BalancingChamber.c	(.../BalancingChamber.c)	(revision c9c9b1bade37555a0f226b9cc24529410325e3ed)
@@ -57,7 +57,8 @@
 #define SPENT_DIFF_COUNT_ZERO                       0                                           ///< Zero count difference for spent side fill comparing target count
 #define D48_SPEED_ADJUST_FACTOR                     0.5F                                        ///< D48 speed adjustment factor ( 50% of speed adjustment = 0.5)
 #define D48_SPEED_RANGE_LIMIT                       0.25F                                       ///< D48 speed adjustment range check limit ( D48 speed can vary +/-25% of initial calculated speed)
-#define BICARB_CHAMBER_PERIODIC_FILL_TIME               ( 1 * SEC_PER_MIN * ( MS_PER_SECOND / TASK_GENERAL_INTERVAL ) ) ///< Periodic bicarb chamber fill request 60 sec x 20 = 1200
+#define BICARB_CHAMBER_PERIODIC_FILL_TIME           ( 1 * SEC_PER_MIN * \
+                                                    ( MS_PER_SECOND / TASK_GENERAL_INTERVAL ) ) ///< Periodic bicarb chamber fill request 60 sec x 20 = 1200
 #define BAL_CHAMBER_FILL_TIMEOUT_FACTOR             1.5                                         ///< Balancing Chamber fill timeout factor (150% of observed fill count)
 
 /// Payload record structure for balancing chamber switch only request
@@ -259,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;
@@ -507,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;
@@ -521,8 +524,17 @@
     spentFillRiseMissCounter            = 0;
     isSpentFillComplete                 = FALSE;
 
-    F32 acidVolume            = getF32OverrideValue( &acidDoseVolume );
-    F32 bicarbVolume          = getF32OverrideValue( &bicarbDoseVolume );
+    if ( getTestConfigStatus( TEST_CONFIG_DD_ENABLE_DRY_BICARB ) == TRUE )
+    {
+        bicarbVolume = getBicarbMixVol();
+        acidVolume = getAcidMixVol();
+    }
+    else // wet bicarb
+    {
+        acidVolume        = getF32OverrideValue( &acidDoseVolume );
+        bicarbVolume      = getF32OverrideValue( &bicarbDoseVolume );
+    }
+
     freshDialPressure         = getFilteredPressure( D18_PRES );
     spentDialPressure         = getFilteredPressure( D51_PRES );
 
@@ -551,8 +563,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 );
         }
@@ -799,6 +811,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;
@@ -813,8 +827,16 @@
     spentFillRiseMissCounter            = 0;
     isSpentFillComplete                 = FALSE;
 
-    F32 acidVolume            = getF32OverrideValue( &acidDoseVolume );
-    F32 bicarbVolume          = getF32OverrideValue( &bicarbDoseVolume );
+    if ( getTestConfigStatus( TEST_CONFIG_DD_ENABLE_DRY_BICARB ) == TRUE )
+    {
+        bicarbVolume = getBicarbMixVol();
+        acidVolume = getAcidMixVol();
+    }
+    else
+    {
+        acidVolume        = getF32OverrideValue( &acidDoseVolume );
+        bicarbVolume      = getF32OverrideValue( &bicarbDoseVolume );
+    }
     freshDialPressure         = getFilteredPressure( D18_PRES );
     spentDialPressure         = getFilteredPressure( D51_PRES );
 
@@ -843,8 +865,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 );
         }