Index: leahi_dialin/common/test_config_defs.py
===================================================================
diff -u -rc6d2dfdb988298f0264fcb163d8232929bdbe515 -r5f5ced3d57a38abd63b01e82b8945819c48a229b
--- leahi_dialin/common/test_config_defs.py	(.../test_config_defs.py)	(revision c6d2dfdb988298f0264fcb163d8232929bdbe515)
+++ leahi_dialin/common/test_config_defs.py	(.../test_config_defs.py)	(revision 5f5ced3d57a38abd63b01e82b8945819c48a229b)
@@ -23,15 +23,15 @@
     TEST_CONFIG_DD_FP_ENABLE_BETA_1_HW              = 0         # (DD & FP) Test configuration using Beta 1.0 Hardware
     TEST_CONFIG_DD_FP_ENABLE_BETA_1_9_HW            = 1         # (DD & FP) Test configuration using Beta 1.9 Hardware
     TEST_CONFIG_DD_DISABLE_BC_PRES_ALARM            = 2         # (DD) Test configuration disabling BC pressure alarms
-    TEST_CONFIG_DD_ENABLE_DRY_BICARB                = 3         # (DD) Test configuration enable Dry Bicarb usage
+    TEST_CONFIG_DD_DISABLE_DRY_BICARB               = 3         # (DD) Test configuration disable Dry Bicarb usage
     TEST_CONFIG_FP_SKIP_PRE_GEN_FLUSH               = 4         # (FP) Test configuration to skip pre-gen flush
     TEST_CONFIG_DD_ENABLE_DIENER_2000_PUMP          = 5         # (DD) Test configuration to use Diener 2000 pump for D48
     TEST_CONFIG_DD_ENABLE_SPENT_CHAMBER_H_FILL      = 6         # (DD) Test configuration to enable Chamber H Fill
     TEST_CONFIG_DD_DISABLE_CONDUCTIVITY_ALARMS      = 7         # (DD) Test configuration to disable DD conductivity alarms
     TEST_CONFIG_FP_DISABLE_CONDUCTIVITY_ALARMS      = 8         # (FP) Test configuration to disable FP conductivity alarms
     TEST_CONFIG_DD_ENABLE_DOSING_OPEN_LOOP_CONTROL  = 9         # (DD) Test configuration to switch to open loop control for concentrate dosing
     TEST_CONFIG_DD_DISABLE_UF_PUMP_SPEED_COMP       = 10        # (DD) Test configuration to disable Ultrafiltration speed compensation
-    TEST_CONFIG_DD_DRY_BICART_TEST                  = 11        # (DD) Test configuration DD to test initial fill , drain and initial chamber fill in pre-gen
+    TEST_CONFIG_DD_ENABLE_WCID_1                    = 11        # (DD) Test configuration DD to enable WCID_1 pressure profile for dry bicart
     TEST_CONFIG_DD_RUN_SOLO                         = 12        # (DD) Test configuration to run DD alone without the other subsystems
     TEST_CONFIG_FP_DISABLE_RO_CURRENT_ALARMS        = 13        # (FP) Test configuration to disable RO current alarms
     TEST_CONFIG_FP_ENABLE_BOOST_PUMP                = 14        # (FP) Test configuration to enable P40 boost pump
Index: leahi_dialin/dd/modules/mixing_cntrl.py
===================================================================
diff -u -r6e34c84bcfc3ee3a70c78351fc1c67b98e46ff4d -r5f5ced3d57a38abd63b01e82b8945819c48a229b
--- leahi_dialin/dd/modules/mixing_cntrl.py	(.../mixing_cntrl.py)	(revision 6e34c84bcfc3ee3a70c78351fc1c67b98e46ff4d)
+++ leahi_dialin/dd/modules/mixing_cntrl.py	(.../mixing_cntrl.py)	(revision 5f5ced3d57a38abd63b01e82b8945819c48a229b)
@@ -55,9 +55,16 @@
 
         self.dd_dry_bicart_timestamp        = 0                 #: The timestamp of the last message
 
-        self.dd_dry_bicart_bicarb_mix_vol   = 0.0
-        self.dd_dry_bicart_acid_mix_vol     = 0.0
+        self.bicarb_mixing_state            = 0
+        self.bicarb_control_interval        = 0
+        self.acid_mixing_state              = 0
+        self.acid_control_interval          = 0
 
+        self.current_bicarb_mix_volume       = 0.0
+        self.last_bicarb_mix_volume          = 0.0
+        self.current_acid_mix_volume         = 0.0
+        self.last_acid_mix_volume            = 0.0
+
         #TODO remove after final testing
         self.bcarb_ctlrl_signal.control_signal_reference                = 0.0
         self.bcarb_ctlrl_signal.control_signal_measured                 = 0.0
@@ -103,10 +110,17 @@
         @return: None
         """
         msg_list = []
-        
-        msg_list.append(('self.dd_dry_bicart_bicarb_mix_vol',           DataTypes.F32))
-        msg_list.append(('self.dd_dry_bicart_acid_mix_vol',             DataTypes.F32))
 
+        msg_list.append(('self.bicarb_mixing_state', DataTypes.U32))
+        msg_list.append(('self.bicarb_control_interval', DataTypes.U32))
+        msg_list.append(('self.acid_mixing_state', DataTypes.U32))
+        msg_list.append(('self.acid_control_interval', DataTypes.U32))
+
+        msg_list.append(('self.current_bicarb_mix_volume', DataTypes.F32))
+        msg_list.append(('self.last_bicarb_mix_volume', DataTypes.F32))
+        msg_list.append(('self.current_acid_mix_volume', DataTypes.F32))
+        msg_list.append(('self.last_acid_mix_volume', DataTypes.F32))
+
         msg_list.append(('self.bcarb_ctlrl_signal.control_signal_reference', DataTypes.F32))
         msg_list.append(('self.bcarb_ctlrl_signal.control_signal_measured', DataTypes.F32))
         msg_list.append(('self.bcarb_ctlrl_signal.control_signal_error', DataTypes.F32))