Index: leahi_dialin/dd/modules/mixing_cntrl.py =================================================================== diff -u -re412f48fe7363639f8e729d2274501ec02d51aa9 -r0dae30ee2608053ac19508c8a71ead2d2f4518e1 --- leahi_dialin/dd/modules/mixing_cntrl.py (.../mixing_cntrl.py) (revision e412f48fe7363639f8e729d2274501ec02d51aa9) +++ leahi_dialin/dd/modules/mixing_cntrl.py (.../mixing_cntrl.py) (revision 0dae30ee2608053ac19508c8a71ead2d2f4518e1) @@ -347,7 +347,7 @@ Constraints: Must be logged into DD. - @param bicarb_conductivity: float - conductivity value to override target conductivity + @param bicarb_conductivity: float - conductivity value to override bicarb target conductivity @param reset: integer - 1 to reset a previous override, 0 to override @return: 1 if successful, zero otherwise """ @@ -368,11 +368,11 @@ def cmd_mixing_control_bicarb_delta_conductivity_override(self, bicarb_delta_conductivity: float, reset: int = NO_RESET) -> int: """ - Constructs and sends the Mixing Control bicart delta conductivity override command + Constructs and sends the Mixing Control bicarb delta conductivity override command Constraints: Must be logged into DD. - @param bicarb_delta_conductivity: float - bicarb delta conductivity value to override delta conductivity + @param bicarb_delta_conductivity: float - conductivity value to override bicarb delta conductivity @param reset: integer - 1 to reset a previous override, 0 to override @return: 1 if successful, zero otherwise """ @@ -389,3 +389,104 @@ override_text=str(bicarb_delta_conductivity), logger=self.logger, can_interface=self.can_interface) + + + def cmd_mixing_control_dialysate_target_conductivity_override(self, dialysate_conductivity: float, reset: int = NO_RESET) -> int: + """ + Constructs and sends the Mixing Control Dialysate target conductivity override command + Constraints: + Must be logged into DD. + + @param dialysate_conductivity: float - conductivity value to override Dialysate target conductivity + @param reset: integer - 1 to reset a previous override, 0 to override + @return: 1 if successful, zero otherwise + """ + target_conductivity = float_to_bytearray(dialysate_conductivity) + reset_byte_array = integer_to_bytearray(reset) + payload = reset_byte_array + target_conductivity + + return cmd_generic_override( + payload=payload, + reset=reset, + channel_id=CanChannels.dialin_to_dd_ch_id, + msg_id=MsgIds.MSG_ID_DD_BICARB_TARGET_CONDUCTIVITY_OVERRIDE_REQUEST, + entity_name='DD Dialysate Target Conductivity', + override_text=str(dialysate_conductivity), + logger=self.logger, + can_interface=self.can_interface) + + + def cmd_mixing_control_dialysate_delta_conductivity_override(self, dialysate_delta_conductivity: float, reset: int = NO_RESET) -> int: + """ + Constructs and sends the Mixing Control dialysate delta conductivity override command + Constraints: + Must be logged into DD. + + @param dialysate_delta_conductivity: float - conductivity value to override dialysate delta conductivity + @param reset: integer - 1 to reset a previous override, 0 to override + @return: 1 if successful, zero otherwise + """ + delta_conductivity = float_to_bytearray(dialysate_delta_conductivity) + reset_byte_array = integer_to_bytearray(reset) + payload = reset_byte_array + delta_conductivity + + return cmd_generic_override( + payload=payload, + reset=reset, + channel_id=CanChannels.dialin_to_dd_ch_id, + msg_id=MsgIds.MSG_ID_DD_BICARB_DELTA_CONDUCTIVITY_OVERRIDE_REQUEST, + entity_name='DD Dialysate Delta Conductivity', + override_text=str(dialysate_delta_conductivity), + logger=self.logger, + can_interface=self.can_interface) + + +def cmd_mixing_control_bicarb_volume_control_interval_override(self, bicarb_volume_control_interval: float, + reset: int = NO_RESET) -> int: + """ + Constructs and sends the Mixing Control bicarb volume control interval override command + Constraints: + Must be logged into DD. + + @param bicarb_volume_control_interval: float - bicarb volume control interval to override + @param reset: integer - 1 to reset a previous override, 0 to override + @return: 1 if successful, zero otherwise + """ + control_interval = float_to_bytearray(bicarb_volume_control_interval) + reset_byte_array = integer_to_bytearray(reset) + payload = reset_byte_array + control_interval + + return cmd_generic_override( + payload=payload, + reset=reset, + channel_id=CanChannels.dialin_to_dd_ch_id, + msg_id=MsgIds.MSG_ID_DD_MIXING_BICARB_CONTROL_INTERVAL_OVERRIDE_REQUEST, + entity_name='DD Bicarb Volume Control Interval', + override_text=str(bicarb_volume_control_interval), + logger=self.logger, + can_interface=self.can_interface) + +def cmd_mixing_control_acid_volume_control_interval_override(self, acid_volume_control_interval: float, + reset: int = NO_RESET) -> int: + """ + Constructs and sends the Mixing Control acid volume control interval override command + Constraints: + Must be logged into DD. + + @param acid_volume_control_interval: float - acid volume control interval to override + @param reset: integer - 1 to reset a previous override, 0 to override + @return: 1 if successful, zero otherwise + """ + control_interval = float_to_bytearray(acid_volume_control_interval) + reset_byte_array = integer_to_bytearray(reset) + payload = reset_byte_array + control_interval + + return cmd_generic_override( + payload=payload, + reset=reset, + channel_id=CanChannels.dialin_to_dd_ch_id, + msg_id=MsgIds.MSG_ID_DD_MIXING_ACID_CONTROL_INTERVAL_OVERRIDE_REQUEST, + entity_name='DD Acid Volume Control Interval', + override_text=str(acid_volume_control_interval), + logger=self.logger, + can_interface=self.can_interface)