Index: firmware/App/Controllers/BalancingChamber.c
===================================================================
diff -u -rd5c94536929ded738e5c8d139d8c46b1d3e035ef -r9b2aa25492c9286b9c1d5b0f4ce9e3676d9ade84
--- firmware/App/Controllers/BalancingChamber.c	(.../BalancingChamber.c)	(revision d5c94536929ded738e5c8d139d8c46b1d3e035ef)
+++ firmware/App/Controllers/BalancingChamber.c	(.../BalancingChamber.c)	(revision 9b2aa25492c9286b9c1d5b0f4ce9e3676d9ade84)
@@ -52,7 +52,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
@@ -222,7 +223,7 @@
     currentBalChamberSwitchingCounter += 1;
     currentBalChamberFillCounter += 1;
 
-    if ( getTestConfigStatus( TEST_CONFIG_DD_ENABLE_DRY_BICARB ) == TRUE && balChamberExecState > BAL_CHAMBER_STATE_IDLE)
+    if ( getTestConfigStatus( TEST_CONFIG_DD_ENABLE_DRY_BICARB ) == TRUE && balChamberExecState > BAL_CHAMBER_STATE_START)
     {
         // Increment counter for dry bicarb chamber fill
         bicarbChamberPeriodicFillCounter += 1;
@@ -464,8 +465,8 @@
 
     if ( getTestConfigStatus( TEST_CONFIG_DD_ENABLE_DRY_BICARB ) == TRUE )
     {
-        bicarbVolume = getBicarbDoseVol();
-        acidVolume = getAcidDoseVol();
+        bicarbVolume = getBicarbMixVol();
+        acidVolume = getAcidMixVol();
     }
     else
     {
@@ -699,8 +700,8 @@
 
     if ( getTestConfigStatus( TEST_CONFIG_DD_ENABLE_DRY_BICARB ) == TRUE )
     {
-        bicarbVolume = getBicarbDoseVol();
-        acidVolume = getAcidDoseVol();
+        bicarbVolume = getBicarbMixVol();
+        acidVolume = getAcidMixVol();
     }
     else
     {