Index: dialin/hd/accelerometer.py =================================================================== diff -u -rebf0a72a1a1a52f3cfe20975de4857201275888c -r78f3b6100f792682a26f87f6333a1d7243767fb6 --- dialin/hd/accelerometer.py (.../accelerometer.py) (revision ebf0a72a1a1a52f3cfe20975de4857201275888c) +++ dialin/hd/accelerometer.py (.../accelerometer.py) (revision 78f3b6100f792682a26f87f6333a1d7243767fb6) @@ -18,9 +18,9 @@ from .constants import RESET, NO_RESET from ..common.msg_defs import MsgIds, MsgFieldPositions -from ..protocols.CAN import (DenaliMessage, - DenaliChannels) +from ..protocols.CAN import DenaliMessage, DenaliChannels from ..utils.base import AbstractSubSystem, publish +from ..utils.checks import check_broadcast_interval_override_ms from ..utils.conversions import integer_to_bytearray, float_to_bytearray Index: dialin/hd/air_bubbles.py =================================================================== diff -u -rebf0a72a1a1a52f3cfe20975de4857201275888c -r78f3b6100f792682a26f87f6333a1d7243767fb6 --- dialin/hd/air_bubbles.py (.../air_bubbles.py) (revision ebf0a72a1a1a52f3cfe20975de4857201275888c) +++ dialin/hd/air_bubbles.py (.../air_bubbles.py) (revision 78f3b6100f792682a26f87f6333a1d7243767fb6) @@ -20,7 +20,7 @@ from ..common.msg_defs import MsgIds, MsgFieldPositions from ..protocols.CAN import DenaliMessage, DenaliChannels from ..utils.base import AbstractSubSystem, publish -from ..utils.conversions import integer_to_bytearray, float_to_bytearray +from ..utils.conversions import integer_to_bytearray class HDAirBubbles(AbstractSubSystem): @@ -95,17 +95,17 @@ @return: None """ - statusADA = struct.unpack('i', bytearray( + ada_status = struct.unpack('i', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_1:MsgFieldPositions.END_POS_FIELD_1])) - stateADA = struct.unpack('i', bytearray( + ada_state = struct.unpack('i', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_2:MsgFieldPositions.END_POS_FIELD_2])) - statusADV = struct.unpack('i', bytearray( + adv_status = struct.unpack('i', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_3:MsgFieldPositions.END_POS_FIELD_3])) - stateADV = struct.unpack('i', bytearray( + adv_state = struct.unpack('i', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_4:MsgFieldPositions.END_POS_FIELD_4])) - self.air_bubbles_status = [statusADA[0], statusADV[0]] - self.air_bubbles_state = [stateADA[0], stateADV[0]] + self.air_bubbles_status = [ada_status[0], adv_status[0]] + self.air_bubbles_state = [ada_state[0], adv_state[0]] def cmd_air_bubble_status_override(self, status: int, index: int, reset: int = NO_RESET) -> int: """ @@ -210,7 +210,7 @@ else: str_res = str(ms) + " ms: " self.logger.debug("Air bubbles data broadcast interval overridden to " + str_res + - str(received_message['message'][DenaliMessage.PAYLOAD_START_INDEX])) + str(received_message['message'][DenaliMessage.PAYLOAD_START_INDEX])) # response payload is OK or not OK return received_message['message'][DenaliMessage.PAYLOAD_START_INDEX] else: Index: dialin/hd/alarms.py =================================================================== diff -u -rebf0a72a1a1a52f3cfe20975de4857201275888c -r78f3b6100f792682a26f87f6333a1d7243767fb6 --- dialin/hd/alarms.py (.../alarms.py) (revision ebf0a72a1a1a52f3cfe20975de4857201275888c) +++ dialin/hd/alarms.py (.../alarms.py) (revision 78f3b6100f792682a26f87f6333a1d7243767fb6) @@ -21,7 +21,7 @@ from ..protocols.CAN import DenaliMessage, DenaliChannels from ..utils.base import AbstractSubSystem, publish from ..utils.checks import check_broadcast_interval_override_ms -from ..utils.conversions import integer_to_bytearray +from ..utils.conversions import integer_to_bytearray, float_to_bytearray class HDAlarms(AbstractSubSystem): @@ -209,7 +209,6 @@ """ return self.alarm_audio_curr_hg - def get_alarm_audio_current_lg(self): """ Gets the alarm audio current - low gain. @@ -218,7 +217,6 @@ """ return self.alarm_audio_curr_lg - def get_alarm_backup_audio_current(self): """ Gets the alarm backup audio current. @@ -386,11 +384,16 @@ @return: none """ - vol = struct.unpack('i', bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_1:MsgFieldPositions.END_POS_FIELD_1])) - ach = struct.unpack('f', bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_2:MsgFieldPositions.END_POS_FIELD_2])) - acl = struct.unpack('f', bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_3:MsgFieldPositions.END_POS_FIELD_3])) - bac = struct.unpack('f', bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_4:MsgFieldPositions.END_POS_FIELD_4])) - saf = struct.unpack('i', bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_5:MsgFieldPositions.END_POS_FIELD_5])) + vol = struct.unpack('i', bytearray( + message['message'][MsgFieldPositions.START_POS_FIELD_1:MsgFieldPositions.END_POS_FIELD_1])) + ach = struct.unpack('f', bytearray( + message['message'][MsgFieldPositions.START_POS_FIELD_2:MsgFieldPositions.END_POS_FIELD_2])) + acl = struct.unpack('f', bytearray( + message['message'][MsgFieldPositions.START_POS_FIELD_3:MsgFieldPositions.END_POS_FIELD_3])) + bac = struct.unpack('f', bytearray( + message['message'][MsgFieldPositions.START_POS_FIELD_4:MsgFieldPositions.END_POS_FIELD_4])) + saf = struct.unpack('i', bytearray( + message['message'][MsgFieldPositions.START_POS_FIELD_5:MsgFieldPositions.END_POS_FIELD_5])) self.alarm_volume = vol[0] self.alarm_audio_curr_hg = ach[0] self.alarm_audio_curr_lg = acl[0] @@ -567,7 +570,7 @@ self.logger.debug("Timeout!!!!") return False - def cmd_alarm_info_broadcast_interval_override(self, ms:int=1000, reset:int=NO_RESET): + def cmd_alarm_info_broadcast_interval_override(self, ms: int = 1000, reset: int = NO_RESET): """ Constructs and sends the alarm information broadcast interval override command Constraints: @@ -602,14 +605,14 @@ else: str_res = str(ms) + " ms: " self.logger.debug("Alarm information broadcast interval overridden to " + str_res + - str(received_message['message'][DenaliMessage.PAYLOAD_START_INDEX])) + 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_alarm_audio_volume_override(self, volume:int=5, reset:int=NO_RESET): + def cmd_alarm_audio_volume_override(self, volume: int = 5, reset: int = NO_RESET): """ Constructs and sends the alarm audio volume override command Constraints: @@ -641,14 +644,14 @@ else: str_res = str(volume) + ": " self.logger.debug("Alarm audio volume level overridden to " + str_res + - str(received_message['message'][DenaliMessage.PAYLOAD_START_INDEX])) + 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_alarm_audio_current_hg_override(self, current:float=0.0, reset:int=NO_RESET): + def cmd_alarm_audio_current_hg_override(self, current: float = 0.0, reset: int = NO_RESET): """ Constructs and sends the alarm audio current (high gain) override command Constraints: @@ -679,14 +682,14 @@ else: str_res = str(current) + " mA: " self.logger.debug("Alarm audio high gain current overridden to " + str_res + - str(received_message['message'][DenaliMessage.PAYLOAD_START_INDEX])) + 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_alarm_audio_current_lg_override(self, current:float=0.0, reset:int=NO_RESET): + def cmd_alarm_audio_current_lg_override(self, current: float = 0.0, reset: int = NO_RESET): """ Constructs and sends the alarm audio current (low gain) override command Constraints: @@ -717,14 +720,14 @@ else: str_res = str(current) + " mA: " self.logger.debug("Alarm audio low gain current overridden to " + str_res + - str(received_message['message'][DenaliMessage.PAYLOAD_START_INDEX])) + 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_alarm_backup_audio_current_override(self, current:float=0.0, reset:int=NO_RESET): + def cmd_alarm_backup_audio_current_override(self, current: float = 0.0, reset: int = NO_RESET): """ Constructs and sends the backup alarm audio current override command Constraints: @@ -755,10 +758,9 @@ else: str_res = str(current) + " mA: " self.logger.debug("Alarm backup audio current overridden to " + str_res + - str(received_message['message'][DenaliMessage.PAYLOAD_START_INDEX])) + 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 - Index: dialin/hd/hemodialysis_device.py =================================================================== diff -u -rebf0a72a1a1a52f3cfe20975de4857201275888c -r78f3b6100f792682a26f87f6333a1d7243767fb6 --- dialin/hd/hemodialysis_device.py (.../hemodialysis_device.py) (revision ebf0a72a1a1a52f3cfe20975de4857201275888c) +++ dialin/hd/hemodialysis_device.py (.../hemodialysis_device.py) (revision 78f3b6100f792682a26f87f6333a1d7243767fb6) @@ -33,7 +33,6 @@ from .service_record import HDServiceNVRecords from .switches import HDSwitches from .syringe_pump import HDSyringePump -from .service_record import HDServiceNVRecords from .system_record import HDSystemNVRecords from .treatment import HDTreatment from .ui_proxy import HDUIProxy @@ -135,7 +134,7 @@ return self.hd_logged_in @publish(["hd_logged_in"]) - def hd_set_logged_in_status(self, logged_in:bool=False): + def hd_set_logged_in_status(self, logged_in: bool = False): """ Callback for HD logged in status change. @param logged_in boolean logged in status for HD Index: dialin/hd/syringe_pump.py =================================================================== diff -u -rebf0a72a1a1a52f3cfe20975de4857201275888c -r78f3b6100f792682a26f87f6333a1d7243767fb6 --- dialin/hd/syringe_pump.py (.../syringe_pump.py) (revision ebf0a72a1a1a52f3cfe20975de4857201275888c) +++ dialin/hd/syringe_pump.py (.../syringe_pump.py) (revision 78f3b6100f792682a26f87f6333a1d7243767fb6) @@ -593,7 +593,7 @@ else: str_res = str(status) self.logger.debug("Syringe pump status overridden to " + str_res + - str(received_message['message'][DenaliMessage.PAYLOAD_START_INDEX])) + str(received_message['message'][DenaliMessage.PAYLOAD_START_INDEX])) # response payload is OK or not OK return received_message['message'][DenaliMessage.PAYLOAD_START_INDEX] else: @@ -631,7 +631,7 @@ else: str_res = str(status) self.logger.debug("Syringe pump encoder status overridden to " + str_res + - str(received_message['message'][DenaliMessage.PAYLOAD_START_INDEX])) + str(received_message['message'][DenaliMessage.PAYLOAD_START_INDEX])) # response payload is OK or not OK return received_message['message'][DenaliMessage.PAYLOAD_START_INDEX] else: @@ -669,7 +669,7 @@ else: str_res = str(status) self.logger.debug("Syringe pump ADC & DAC status overridden to " + str_res + - str(received_message['message'][DenaliMessage.PAYLOAD_START_INDEX])) + str(received_message['message'][DenaliMessage.PAYLOAD_START_INDEX])) # response payload is OK or not OK return received_message['message'][DenaliMessage.PAYLOAD_START_INDEX] else: @@ -707,7 +707,7 @@ else: str_res = str(counter) self.logger.debug("Syringe pump ADC read counter overridden to " + str_res + - str(received_message['message'][DenaliMessage.PAYLOAD_START_INDEX])) + str(received_message['message'][DenaliMessage.PAYLOAD_START_INDEX])) # response payload is OK or not OK return received_message['message'][DenaliMessage.PAYLOAD_START_INDEX] else: Index: dialin/hd/valves.py =================================================================== diff -u -rebf0a72a1a1a52f3cfe20975de4857201275888c -r78f3b6100f792682a26f87f6333a1d7243767fb6 --- dialin/hd/valves.py (.../valves.py) (revision ebf0a72a1a1a52f3cfe20975de4857201275888c) +++ dialin/hd/valves.py (.../valves.py) (revision 78f3b6100f792682a26f87f6333a1d7243767fb6) @@ -205,7 +205,7 @@ self.logger.debug("HD cmd_valve_override Timeout!!!") return False - def cmd_set_hd_valve_current_override(self, valve:int, current:float, reset:int=NO_RESET) -> int: + def cmd_set_hd_valve_current_override(self, valve: int, current: float, reset: int = NO_RESET) -> int: """ Constructs and sends the HD valves set position for a valve @@ -240,7 +240,7 @@ self.logger.debug("HD current override Timeout!!!") return False - def cmd_set_hd_valve_position_count_override(self, valve:int, position_count:int, reset:int=NO_RESET) -> int: + def cmd_set_hd_valve_position_count_override(self, valve: int, position_count: int, reset: int = NO_RESET) -> int: """ Constructs and sends the HD valves set position for a valve @@ -275,7 +275,7 @@ self.logger.debug("HD current override Timeout!!!") return False - def cmd_set_hd_valve_pwm(self, valve:int, pwm:int, direction:int, reset:int=NO_RESET) -> int: + def cmd_set_hd_valve_pwm(self, valve: int, pwm: int, direction: int, reset: int = NO_RESET) -> int: """ Constructs and sends the HD valves PWM command @@ -407,4 +407,3 @@ 'PosA': pos_a, 'PosB': pos_b, 'PosC': pos_c, 'PWM': pwm} # Update the air trap valve's status self.hd_air_trap_status = air_trap - Index: dialin/hd/voltages.py =================================================================== diff -u -rebf0a72a1a1a52f3cfe20975de4857201275888c -r78f3b6100f792682a26f87f6333a1d7243767fb6 --- dialin/hd/voltages.py (.../voltages.py) (revision ebf0a72a1a1a52f3cfe20975de4857201275888c) +++ dialin/hd/voltages.py (.../voltages.py) (revision 78f3b6100f792682a26f87f6333a1d7243767fb6) @@ -104,7 +104,7 @@ self.monitored_voltages[HDMonitoredVoltages.MONITORED_LINE_FPGA_REF_V.value] = vfr[0] self.monitored_voltages[HDMonitoredVoltages.MONITORED_LINE_PBA_REF_V.value] = vpr[0] - def cmd_monitored_voltage_override(self, signal:int=0, volts:float=0.0, reset:int=NO_RESET) -> int: + def cmd_monitored_voltage_override(self, signal: int = 0, volts: float = 0.0, reset: int = NO_RESET) -> int: """ Constructs and sends the HD monitored voltage override command Constraints: @@ -138,14 +138,14 @@ else: str_res = str(volts) + " V. " self.logger.debug("Monitored HD voltage overridden to " + str_res + - str(received_message['message'][DenaliMessage.PAYLOAD_START_INDEX])) + 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_monitored_voltages_broadcast_interval_override(self, ms:int=1000, reset:int=NO_RESET) -> int: + def cmd_monitored_voltages_broadcast_interval_override(self, ms: int = 1000, reset: int = NO_RESET) -> int: """ Constructs and sends the monitored HD voltages broadcast interval override command Constraints: @@ -180,7 +180,7 @@ else: str_res = str(ms) + " ms: " self.logger.debug("HD monitored voltages broadcast interval overridden to " + str_res + - str(received_message['message'][DenaliMessage.PAYLOAD_START_INDEX])) + str(received_message['message'][DenaliMessage.PAYLOAD_START_INDEX])) # response payload is OK or not OK return received_message['message'][DenaliMessage.PAYLOAD_START_INDEX] else: