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)