Index: leahi_dialin/dd/modules/mixing_cntrl.py
===================================================================
diff -u -r3c8a9517b70f8a0096e7f25c0397f9c8084b0b19 -rf30c7fc22184858502f33e3427e9549584c1a612
--- leahi_dialin/dd/modules/mixing_cntrl.py	(.../mixing_cntrl.py)	(revision 3c8a9517b70f8a0096e7f25c0397f9c8084b0b19)
+++ leahi_dialin/dd/modules/mixing_cntrl.py	(.../mixing_cntrl.py)	(revision f30c7fc22184858502f33e3427e9549584c1a612)
@@ -29,6 +29,7 @@
 from leahi_dialin.utils.conversions import integer_to_bytearray, float_to_bytearray
 from leahi_dialin.common.closed_loop_signals import ControllerSignals
 
+
 class DDDialysateMixing(AbstractSubSystem):
     """
     DryBicart
@@ -139,6 +140,7 @@
 
         self.dd_dialysate_mixing_timestamp = timestamp
 
+
     def cmd_dialysate_mixing_broadcast_interval_override(self, ms: int, reset: int = NO_RESET) -> int:
         """
         Constructs and sends the dry bicart data broadcast interval override command
@@ -177,13 +179,14 @@
         return cmd_generic_override(
             payload=payload,
             reset=reset,
-            channel_id=DenaliChannels.dialin_to_dd_ch_id,
+            channel_id=CanChannels.dialin_to_dd_ch_id,
             msg_id=MsgIds.MSG_ID_DD_BICARB_DOSE_VOL_CONTROL_OVERRIDE_REQUEST,
             entity_name='bicarb dose vol',
             override_text=str(bicarb_dose_vol),
             logger=self.logger,
             can_interface=self.can_interface)
 
+
     def cmd_dialysate_mixing_acid_dose_vol_control_override(self, acid_dose_vol: float, reset: int = NO_RESET) -> int:
         """
         Constructs and sends the dry bicart acid dose vol override command
@@ -201,13 +204,14 @@
         return cmd_generic_override(
             payload=payload,
             reset=reset,
-            channel_id=DenaliChannels.dialin_to_dd_ch_id,
+            channel_id=CanChannels.dialin_to_dd_ch_id,
             msg_id=MsgIds.MSG_ID_DD_ACID_DOSE_VOL_CONTROL_OVERRIDE_REQUEST,
             entity_name='acid dose vol',
             override_text=str(acid_dose_vol),
             logger=self.logger,
             can_interface=self.can_interface)
 
+
     def cmd_dialysate_mixing_bicarb_dose_vol_control_kp_gain_coeff_override(self, bicarb_kp_coeff: float, reset: int = NO_RESET) -> int:
         """
         Constructs and sends the dry bicart bicarb kp coeff override command
@@ -225,13 +229,14 @@
         return cmd_generic_override(
             payload=payload,
             reset=reset,
-            channel_id=DenaliChannels.dialin_to_dd_ch_id,
+            channel_id=CanChannels.dialin_to_dd_ch_id,
             msg_id=MsgIds.MSG_ID_DD_BICARB_DOSE_VOL_CONTROL_KP_GAIN_COEFF_OVERRIDE_REQUEST,
             entity_name='bicarb kp gain coeff',
             override_text=str(bicarb_kp_coeff),
             logger=self.logger,
             can_interface=self.can_interface)
 
+
     def cmd_dialysate_mixing_bicarb_dose_vol_control_ki_gain_coeff_override(self, bicarb_ki_coeff: float, reset: int = NO_RESET) -> int:
         """
         Constructs and sends the dry bicart bicarb ki coeff override command
@@ -249,13 +254,14 @@
         return cmd_generic_override(
             payload=payload,
             reset=reset,
-            channel_id=DenaliChannels.dialin_to_dd_ch_id,
+            channel_id=CanChannels.dialin_to_dd_ch_id,
             msg_id=MsgIds.MSG_ID_DD_BICARB_DOSE_VOL_CONTROL_KI_GAIN_COEFF_OVERRIDE_REQUEST,
             entity_name='bicarb ki gain coeff',
             override_text=str(bicarb_ki_coeff),
             logger=self.logger,
             can_interface=self.can_interface)
 
+
     def cmd_dialysate_mixing_acid_dose_vol_control_kp_gain_coeff_override(self, acid_kp_coeff: float, reset: int = NO_RESET) -> int:
         """
         Constructs and sends the dry bicart acid kp coeff override command
@@ -273,13 +279,14 @@
         return cmd_generic_override(
             payload=payload,
             reset=reset,
-            channel_id=DenaliChannels.dialin_to_dd_ch_id,
+            channel_id=CanChannels.dialin_to_dd_ch_id,
             msg_id=MsgIds.MSG_ID_DD_ACID_DOSE_VOL_CONTROL_KP_GAIN_COEFF_OVERRIDE_REQUEST,
             entity_name='acid kp gain coeff',
             override_text=str(acid_kp_coeff),
             logger=self.logger,
             can_interface=self.can_interface)
 
+
     def cmd_dialysate_mixing_acid_dose_vol_control_ki_gain_coeff_override(self, acid_ki_coeff: float, reset: int = NO_RESET) -> int:
         """
         Constructs and sends the dry bicart acid ki coeff override command
@@ -297,13 +304,14 @@
         return cmd_generic_override(
             payload=payload,
             reset=reset,
-            channel_id=DenaliChannels.dialin_to_dd_ch_id,
+            channel_id=CanChannels.dialin_to_dd_ch_id,
             msg_id=MsgIds.MSG_ID_DD_ACID_DOSE_VOL_CONTROL_KI_GAIN_COEFF_OVERRIDE_REQUEST,
             entity_name='acid ki gain coeff',
             override_text=str(acid_ki_coeff),
             logger=self.logger,
             can_interface=self.can_interface)
 
+
     def cmd_dialysate_mixing_target_conductivity_override(self, conductivity: float, reset: int = NO_RESET) -> int:
         """
         Constructs and sends the dry bicart target conductivity override command
@@ -321,13 +329,14 @@
         return cmd_generic_override(
             payload=payload,
             reset=reset,
-            channel_id=DenaliChannels.dialin_to_dd_ch_id,
+            channel_id=CanChannels.dialin_to_dd_ch_id,
             msg_id=MsgIds.MSG_ID_DD_BICARB_TARGET_CONDUCTIVITY_OVERRIDE_REQUEST,
             entity_name='target conductivity',
             override_text=str(conductivity),
             logger=self.logger,
             can_interface=self.can_interface)
 
+
     def cmd_dialysate_mixing_delta_conductivity_override(self, conductivity: float, reset: int = NO_RESET) -> int:
         """
         Constructs and sends the dry bicart target conductivity override command
@@ -345,7 +354,7 @@
         return cmd_generic_override(
             payload=payload,
             reset=reset,
-            channel_id=DenaliChannels.dialin_to_dd_ch_id,
+            channel_id=CanChannels.dialin_to_dd_ch_id,
             msg_id=MsgIds.MSG_ID_DD_BICARB_DELTA_CONDUCTIVITY_OVERRIDE_REQUEST,
             entity_name='delta conductivity',
             override_text=str(conductivity),