Index: dialin/hd/pressure_occlusion.py =================================================================== diff -u -r19ed99efea69f85cf5ea175a39555dfaa8e493e0 -r9a921f3d6f7c0523aaec9ddf00cfe5cc120f01d7 --- dialin/hd/pressure_occlusion.py (.../pressure_occlusion.py) (revision 19ed99efea69f85cf5ea175a39555dfaa8e493e0) +++ dialin/hd/pressure_occlusion.py (.../pressure_occlusion.py) (revision 9a921f3d6f7c0523aaec9ddf00cfe5cc120f01d7) @@ -47,8 +47,6 @@ self.arterial_pressure = 0.0 self.venous_pressure = 0.0 self.blood_pump_occlusion = 0 - self.dialysate_inlet_pump_occlusion = 0 - self.dialysate_outlet_pump_occlusion = 0 def get_arterial_pressure(self): """ @@ -73,22 +71,6 @@ """ return self.blood_pump_occlusion - def get_dialysate_inlet_pump_occlusion(self): - """ - Gets the dialysate inlet pump occlusion - - @return: (int)The dialysate inlet pump occlusion - """ - return self.dialysate_inlet_pump_occlusion - - def get_dialysate_outlet_pump_occlusion(self): - """ - Gets the dialysate outlet pump occlusion - - @return: (int)The dialysate outlet pump occlusion - """ - return self.dialysate_outlet_pump_occlusion - @publish([ "arterial_pressure", "venous_pressure", @@ -237,84 +219,6 @@ self.logger.debug("Timeout!!!!") return False - def cmd_dialysate_inlet_pump_measured_occlusion_override(self, occl: int, reset: int = NO_RESET) -> int: - """ - Constructs and sends the measured dialysate inlet pump occlusion pressure override \n - command. - Constraints: - Must be logged into HD. - - @param occl: integer - pressure (in counts) to override with - @param reset: integer - 1 to reset a previous override, 0 to override - @return: 1 if successful, zero otherwise - """ - - rst = integer_to_bytearray(reset) - occ = integer_to_bytearray(occl) - payload = rst + occ - - message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, - message_id=MsgIds.MSG_ID_OCCLUSION_DIAL_IN_PUMP_OVERRIDE.value, - payload=payload) - - self.logger.debug("override measured dialysate inlet pump occlusion pressure") - - # Send message - received_message = self.can_interface.send(message) - - # If there is content... - if received_message is not None: - if reset == RESET: - str_res = "reset back to normal. " - else: - str_res = str(occl) + " mmHg. " - self.logger.debug("Dialysate inlet pump occlusion pressure (measured) overridden to " + str_res + - str(received_message['message'][DenaliMessage.PAYLOAD_START_INDEX])) - # response payload is OK or not OK - return received_message['message'][DenaliMessage.PAYLOAD_START_INDEX] - else: - self.logger.debug("Timeout!!!!") - return False - - def cmd_dialysate_outlet_pump_measured_occlusion_override(self, occl: int, reset: int = NO_RESET) -> int: - """ - Constructs and sends the measured dialysate outlet pump occlusion pressure override \n - command. - Constraints: - Must be logged into HD. - - @param occl: integer - pressure (in counts) to override with - @param reset: integer - 1 to reset a previous override, 0 to override - @return: 1 if successful, zero otherwise - """ - - rst = integer_to_bytearray(reset) - occ = integer_to_bytearray(occl) - payload = rst + occ - - message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, - message_id=MsgIds.MSG_ID_OCCLUSION_DIAL_OUT_PUMP_OVERRIDE.value, - payload=payload) - - self.logger.debug("override measured dialysate outlet pump occlusion pressure") - - # Send message - received_message = self.can_interface.send(message) - - # If there is content... - if received_message is not None: - if reset == RESET: - str_res = "reset back to normal. " - else: - str_res = str(occl) + " mmHg. " - self.logger.debug("Dialysate outlet pump occlusion pressure (measured) overridden to " + str_res + - str(received_message['message'][DenaliMessage.PAYLOAD_START_INDEX])) - # response payload is OK or not OK - return received_message['message'][DenaliMessage.PAYLOAD_START_INDEX] - else: - self.logger.debug("Timeout!!!!") - return False - def cmd_pressure_occlusion_broadcast_interval_override(self, ms: int, reset: int = NO_RESET) -> int: """ Constructs and sends the pressure/occlusion broadcast interval override command