Index: leahi_dialin/common/msg_ids.py
===================================================================
diff -u -rb587077b5d61033e25b2aa372bc04e221bc77a6f -rb00b17d2ee5eb163b2152ef9d3f0c1db8551a284
--- leahi_dialin/common/msg_ids.py	(.../msg_ids.py)	(revision b587077b5d61033e25b2aa372bc04e221bc77a6f)
+++ leahi_dialin/common/msg_ids.py	(.../msg_ids.py)	(revision b00b17d2ee5eb163b2152ef9d3f0c1db8551a284)
@@ -403,7 +403,8 @@
     MSG_ID_DD_SUBSTITUTION_PUMP_TARGET_SPEED_OVERRIDE_REQUEST = 0xA06F
     MSG_ID_DD_CONDUCTIVITY_SENSOR_CAL_REQUEST = 0xA070
     MSG_ID_DD_CONDUCTIVITY_SENSOR_CAL_RESPONSE = 0xA071
-
+    MSG_ID_DD_MIXING_CONTROL_DATA = 0xA072
+    MSG_ID_DD_MIXING_CONTROL_DATA_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0xA073
     # Placeholder messages
     MSG_ID_DD_ALARM_STATE_OVERRIDE_REQUEST = 0xAF03
     MSG_ID_DD_STOP_GEN_DIALYSATE_MODE_OVERRIDE_REQUEST = 0xAF04
Index: leahi_dialin/dd/modules/drybicart.py
===================================================================
diff -u -r78b7d4b47c77f390fdb0c796e4861cc9abb343fd -rb00b17d2ee5eb163b2152ef9d3f0c1db8551a284
--- leahi_dialin/dd/modules/drybicart.py	(.../drybicart.py)	(revision 78b7d4b47c77f390fdb0c796e4861cc9abb343fd)
+++ leahi_dialin/dd/modules/drybicart.py	(.../drybicart.py)	(revision b00b17d2ee5eb163b2152ef9d3f0c1db8551a284)
@@ -54,7 +54,7 @@
         self.dd_dry_bicart_timestamp = 0.0                      #: The timestamp of the last message
         self.dd_dry_bicart_fill_execution_state = 0             #: The Dry Bicart fill execution state
         self.dd_bicarb_chamber_fill_execution_state = 0         #: The Bicarb chamber fill execution state
-        self.dd_dry_bicart_drain_execution_state = 0.0          #: The Dry Bicart drain execution state
+        self.dd_dry_bicart_drain_execution_state = 0        #: The Dry Bicart drain execution state
         self.dd_dry_bicart_fill_cycle_counter = 0               #: The Dry Bicart fill cycle counter
         self.dd_dry_bicart_max_fill_cycle_count = 0             #: The Dry Bicart max fill cycle state
         self.dd_dry_bicart_fill_request = 0                     #: Is fill requested for Dry Bicart or not
@@ -83,7 +83,7 @@
         msg_list = []
         msg_list.append(('self.dd_dry_bicart_fill_execution_state',     DataTypes.U32))
         msg_list.append(('self.dd_bicarb_chamber_fill_execution_state', DataTypes.U32))
-        msg_list.append(('self.dd_dry_bicart_drain_execution_state',    DataTypes.F32))
+        msg_list.append(('self.dd_dry_bicart_drain_execution_state',    DataTypes.U32))
         msg_list.append(('self.dd_dry_bicart_fill_cycle_counter',       DataTypes.U32))
         msg_list.append(('self.dd_dry_bicart_max_fill_cycle_count',     DataTypes.U32))
         msg_list.append(('self.dd_dry_bicart_fill_request',             DataTypes.U32))
Index: leahi_dialin/dd/modules/mixing_cntrl.py
===================================================================
diff -u -r5f5ced3d57a38abd63b01e82b8945819c48a229b -rb00b17d2ee5eb163b2152ef9d3f0c1db8551a284
--- leahi_dialin/dd/modules/mixing_cntrl.py	(.../mixing_cntrl.py)	(revision 5f5ced3d57a38abd63b01e82b8945819c48a229b)
+++ leahi_dialin/dd/modules/mixing_cntrl.py	(.../mixing_cntrl.py)	(revision b00b17d2ee5eb163b2152ef9d3f0c1db8551a284)
@@ -50,8 +50,8 @@
 
         if self.can_interface is not None:
             self.can_interface.register_receiving_publication_function(channel_id = CanChannels.dd_sync_broadcast_ch_id,
-                                                                       message_id = MsgIds.MSG_ID_DD_DRY_BICART_DATA.value,
-                                                                       function = self._handler_dry_bicart_sync)
+                                                                       message_id = MsgIds.MSG_ID_DD_MIXING_CONTROL_DATA.value,
+                                                                       function = self._handler_mixing_control_sync)
 
         self.dd_dry_bicart_timestamp        = 0                 #: The timestamp of the last message
 
@@ -95,14 +95,16 @@
         self.dd_dry_bicart_acid_kp_gain = 0.0
         self.dd_dry_bicart_acid_ki_gain = 0.0
 
+        self.dd_dialysate_mixing_timestamp = 0
 
-    @publish(["msg_id_dd_dry_bicart_data",
+
+    @publish(["msg_id_dd_mixing_control_data",
               "bicarb_dose_vol", "acid_dose_vol",
               "bicarb_reference", "bicarb_measured", "bicarb_error ", "bicarb_error_sum", "bicarb_error_sum_after_windup", "bicarb_proportional_output",
               "bicarb_integral_output", "bicarb_feed_forward_output", "bicarb_control",
               "bicarb_kp_gain", "bicarb_ki_gain",
               "dd_dry_bicart_timestamp"])
-    def _handler_dry_bicart_sync(self, message, timestamp=0.0):
+    def _handler_mixing_control_sync(self, message, timestamp=0.0):
         """
         Handles published dry bicart data messages.
 
@@ -168,7 +170,7 @@
             ms=ms,
             reset=reset,
             channel_id=CanChannels.dialin_to_dd_ch_id,
-            msg_id=MsgIds.MSG_ID_DD_DRY_BICART_DATA_PUBLISH_INTERVAL_OVERRIDE_REQUEST,
+            msg_id=MsgIds.MSG_ID_DD_MIXING_CONTROL_DATA_PUBLISH_INTERVAL_OVERRIDE_REQUEST,
             module_name='DD Dry Bicart',
             logger=self.logger,
             can_interface=self.can_interface)