Index: leahi_dialin/common/fp_defs.py =================================================================== diff -u -r5681154cdaaf629c997dc05472657bf40c94d6e1 -r18c90a1b2b6c7339bdd192a2d2fac32f2b8a35df --- leahi_dialin/common/fp_defs.py (.../fp_defs.py) (revision 5681154cdaaf629c997dc05472657bf40c94d6e1) +++ leahi_dialin/common/fp_defs.py (.../fp_defs.py) (revision 18c90a1b2b6c7339bdd192a2d2fac32f2b8a35df) @@ -121,7 +121,7 @@ NUM_OF_BOOST_PUMPS = 1 # Number of FP Boost Pumps @unique -class FPConductivitySensorsEnum(DialinEnum): +class FPConductivitySensorNames(DialinEnum): P9_COND = 0 # CPi (P9) conductivity sensor value P18_COND = 1 # CPo (P18) conductivity sensor value NUM_OF_FP_CONDUCTIVITY = 2 # Number of Conductivity sensors Index: leahi_dialin/common/override_templates.py =================================================================== diff -u -r03dc6c3ff80d7f76a5b6438ba067e02a37e2ce93 -r18c90a1b2b6c7339bdd192a2d2fac32f2b8a35df --- leahi_dialin/common/override_templates.py (.../override_templates.py) (revision 03dc6c3ff80d7f76a5b6438ba067e02a37e2ce93) +++ leahi_dialin/common/override_templates.py (.../override_templates.py) (revision 18c90a1b2b6c7339bdd192a2d2fac32f2b8a35df) @@ -48,7 +48,6 @@ @param can_interface: The can_interface @return: 1 if successful, zero otherwise """ - if not check_broadcast_interval_override_ms(ms, logger): return False @@ -92,7 +91,6 @@ @param can_interface: The can_interface @return: 1 if successful, zero otherwise """ - message = DenaliMessage.build_message(channel_id=channel_id, message_id=msg_id.value, payload=payload) Index: leahi_dialin/dd/dialysate_delivery.py =================================================================== diff -u -rf762fd31ac5b03734f000f9fcd671851581def8a -r18c90a1b2b6c7339bdd192a2d2fac32f2b8a35df --- leahi_dialin/dd/dialysate_delivery.py (.../dialysate_delivery.py) (revision f762fd31ac5b03734f000f9fcd671851581def8a) +++ leahi_dialin/dd/dialysate_delivery.py (.../dialysate_delivery.py) (revision 18c90a1b2b6c7339bdd192a2d2fac32f2b8a35df) @@ -74,7 +74,6 @@ @param can_interface: (str) CANBus interface name, e.g. "can0" @param log_level: (str) Logging level, defaults to None """ - super().__init__() self._log_manager = LogManager(log_level=log_level, log_filepath=self.__class__.__name__ + ".log") self.logger = self._log_manager.logger @@ -143,7 +142,6 @@ @publish(["msg_id_dd_debug_event", "dd_debug_events_timestamp","dd_debug_events"]) def _handler_dd_debug_event_sync(self, message, timestamp = 0.0): - payload = message['message'] message_length = payload[self._DD_DEBUG_EVENT_MSG_LEN_INDEX] temp_message = '' @@ -243,7 +241,6 @@ # @param reset: integer - 1 to reset a previous override, 0 to override # @return: 1 if successful, zero otherwise # """ - # return cmd_generic_broadcast_interval_override( # ms = ms, # reset = reset, @@ -262,7 +259,6 @@ @param resend: (bool) if False (default), try to login once. Otherwise, tries to login indefinitely @return: 1 if logged in, 0 if log in failed """ - message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_dd_ch_id, message_id=MsgIds.MSG_ID_DD_TESTER_LOGIN_REQUEST.value, payload=list(map(int, map(ord, self.DD_LOGIN_PASSWORD)))) @@ -297,9 +293,7 @@ @param new_mode: ID of operation mode to transition to @return: 1 if successful, zero otherwise - """ - payload = integer_to_bytearray(new_mode) return cmd_generic_override( @@ -321,7 +315,6 @@ @return: None """ - return cmd_generic_override( payload = None, reset = NO_RESET, @@ -342,9 +335,7 @@ @param active: int - True to activate safety shutdown, False to deactivate @param reset: integer - 1 to reset a previous override, 0 to override @return: 1 if successful, zero otherwise - """ - rst = integer_to_bytearray(reset) saf = integer_to_bytearray(active) payload = rst + saf Index: leahi_dialin/dd/modules/alarms.py =================================================================== diff -u -r03dc6c3ff80d7f76a5b6438ba067e02a37e2ce93 -r18c90a1b2b6c7339bdd192a2d2fac32f2b8a35df --- leahi_dialin/dd/modules/alarms.py (.../alarms.py) (revision 03dc6c3ff80d7f76a5b6438ba067e02a37e2ce93) +++ leahi_dialin/dd/modules/alarms.py (.../alarms.py) (revision 18c90a1b2b6c7339bdd192a2d2fac32f2b8a35df) @@ -204,7 +204,6 @@ @param reset: integer - 1 to reset a previous override, 0 to override @return: 1 if successful, zero otherwise """ - print('Not implemented in the FW') return False Index: leahi_dialin/dd/modules/balancing_chamber.py =================================================================== diff -u -r410054cfec7aee839266233249413b08b368fbd3 -r18c90a1b2b6c7339bdd192a2d2fac32f2b8a35df --- leahi_dialin/dd/modules/balancing_chamber.py (.../balancing_chamber.py) (revision 410054cfec7aee839266233249413b08b368fbd3) +++ leahi_dialin/dd/modules/balancing_chamber.py (.../balancing_chamber.py) (revision 18c90a1b2b6c7339bdd192a2d2fac32f2b8a35df) @@ -34,7 +34,6 @@ def __init__(self, can_interface, logger: Logger): """ - @param can_interface: Denali Can Messenger object """ super().__init__() @@ -122,7 +121,6 @@ @param frequency: float - frequency value to override switch frequency with @param reset: integer - 1 to reset a previous override, 0 to override @return: 1 if successful, zero otherwise - """ reset_byte_array = integer_to_bytearray(reset) freq = float_to_bytearray(frequency) @@ -148,7 +146,6 @@ @param start_stop: int - value to start or stop switch ( start = 1, stop = 0 @param flow: float - flow rate in ml/min @return: 1 if successful, zero otherwise - """ sts = integer_to_bytearray(start_stop) freq = float_to_bytearray(flow) @@ -174,7 +171,6 @@ @param volume: float - volume value to override acid dose with @param reset: integer - 1 to reset a previous override, 0 to override @return: 1 if successful, zero otherwise - """ reset_byte_array = integer_to_bytearray(reset) vol = float_to_bytearray(volume) @@ -200,7 +196,6 @@ @param volume: float - volume value to override bicarb dose with @param reset: integer - 1 to reset a previous override, 0 to override @return: 1 if successful, zero otherwise - """ reset_byte_array = integer_to_bytearray(reset) vol = float_to_bytearray(volume) Index: leahi_dialin/dd/modules/blood_leak.py =================================================================== diff -u -r410054cfec7aee839266233249413b08b368fbd3 -r18c90a1b2b6c7339bdd192a2d2fac32f2b8a35df --- leahi_dialin/dd/modules/blood_leak.py (.../blood_leak.py) (revision 410054cfec7aee839266233249413b08b368fbd3) +++ leahi_dialin/dd/modules/blood_leak.py (.../blood_leak.py) (revision 18c90a1b2b6c7339bdd192a2d2fac32f2b8a35df) @@ -55,7 +55,6 @@ def __init__(self, can_interface, logger: Logger): """ - @param can_interface: Leahi Can Messenger object """ super().__init__() Index: leahi_dialin/dd/modules/concentrate_pump.py =================================================================== diff -u -r410054cfec7aee839266233249413b08b368fbd3 -r18c90a1b2b6c7339bdd192a2d2fac32f2b8a35df --- leahi_dialin/dd/modules/concentrate_pump.py (.../concentrate_pump.py) (revision 410054cfec7aee839266233249413b08b368fbd3) +++ leahi_dialin/dd/modules/concentrate_pump.py (.../concentrate_pump.py) (revision 18c90a1b2b6c7339bdd192a2d2fac32f2b8a35df) @@ -33,7 +33,6 @@ def __init__(self, can_interface, logger: Logger): """ - @param can_interface: Denali Can Messenger object """ super().__init__() @@ -159,7 +158,6 @@ @param ms: integer - interval (in ms) to override with @param reset: integer - 1 to reset a previous override, 0 to override @return: 1 if successful, zero otherwise - """ return cmd_generic_broadcast_interval_override( ms = ms, @@ -178,7 +176,6 @@ @param pump_id: unsigned int - concentrate pump ID @param speed: float - target speed value to override concentrate pump with @return: 1 if successful, zero otherwise - """ reset_byte_array = integer_to_bytearray(reset) speed_byte_array = float_to_bytearray(speed) @@ -204,7 +201,6 @@ @param speed: float - measured speed value to override concentrate pump with @param reset: integer - 1 to reset a previous override, 0 to override @return: 1 if successful, zero otherwise - """ reset_byte_array = integer_to_bytearray(reset) speed_byte_array = float_to_bytearray(speed) @@ -230,7 +226,6 @@ @param status: unsigned int - 1 = parked, 0 = not parked @param reset: integer - 1 to reset a previous override, 0 to override @return: 1 if successful, zero otherwise - """ reset_byte_array = integer_to_bytearray(reset) status_byte_array = integer_to_bytearray(status) @@ -256,7 +251,6 @@ @param status: unsigned int - 1 = fault, 0 = no fault @param reset: integer - 1 to reset a previous override, 0 to override @return: 1 if successful, zero otherwise - """ reset_byte_array = integer_to_bytearray(reset) status_byte_array = integer_to_bytearray(status) @@ -280,7 +274,6 @@ @param pump_id: unsigned int - concentrate pump ID @return: 1 if successful, zero otherwise - """ payload = integer_to_bytearray(pump_id) @@ -304,7 +297,6 @@ @param speed: float - ml/min to set the speed to @param volume: float - the volume to set to @return: 1 if successful, zero otherwise - """ pmp = integer_to_bytearray(pump_id) cmd = integer_to_bytearray(command) Index: leahi_dialin/dd/modules/conductivity_sensors.py =================================================================== diff -u -r410054cfec7aee839266233249413b08b368fbd3 -r18c90a1b2b6c7339bdd192a2d2fac32f2b8a35df --- leahi_dialin/dd/modules/conductivity_sensors.py (.../conductivity_sensors.py) (revision 410054cfec7aee839266233249413b08b368fbd3) +++ leahi_dialin/dd/modules/conductivity_sensors.py (.../conductivity_sensors.py) (revision 18c90a1b2b6c7339bdd192a2d2fac32f2b8a35df) @@ -36,7 +36,6 @@ def __init__(self, can_interface, logger: Logger): """ - @param can_interface: Denali Can Messenger object """ super().__init__() @@ -120,7 +119,6 @@ @param conductivity: float - conductivity value to override sensor with @param reset: integer - 1 to reset a previous override, 0 to override @return: 1 if successful, zero otherwise - """ reset_byte_array = integer_to_bytearray(reset) cond_byte_array = float_to_bytearray(conductivity) @@ -150,7 +148,6 @@ @param counter: int - rad count value to override sensor with @param reset: integer - 1 to reset a previous override, 0 to override @return: 1 if successful, zero otherwise - """ reset_byte_array = integer_to_bytearray(reset) read_byte_array = integer_to_bytearray(counter) @@ -177,7 +174,6 @@ @param counter: int - error count value to override sensor with @param reset: integer - 1 to reset a previous override, 0 to override @return: 1 if successful, zero otherwise - """ reset_byte_array = integer_to_bytearray(reset) error_byte_array = integer_to_bytearray(counter) Index: leahi_dialin/dd/modules/dd_test_configs.py =================================================================== diff -u -r03dc6c3ff80d7f76a5b6438ba067e02a37e2ce93 -r18c90a1b2b6c7339bdd192a2d2fac32f2b8a35df --- leahi_dialin/dd/modules/dd_test_configs.py (.../dd_test_configs.py) (revision 03dc6c3ff80d7f76a5b6438ba067e02a37e2ce93) +++ leahi_dialin/dd/modules/dd_test_configs.py (.../dd_test_configs.py) (revision 18c90a1b2b6c7339bdd192a2d2fac32f2b8a35df) @@ -28,13 +28,11 @@ class DDTestConfig(AbstractSubSystem): """ - Dialysate Delivery (DD) Dialin API sub-class for setting and getting the test configurations. """ def __init__(self, can_interface, logger: Logger): """ - @param can_interface: Denali CAN Messenger object """ super().__init__() Index: leahi_dialin/dd/modules/dialysate_pump.py =================================================================== diff -u -r410054cfec7aee839266233249413b08b368fbd3 -r18c90a1b2b6c7339bdd192a2d2fac32f2b8a35df --- leahi_dialin/dd/modules/dialysate_pump.py (.../dialysate_pump.py) (revision 410054cfec7aee839266233249413b08b368fbd3) +++ leahi_dialin/dd/modules/dialysate_pump.py (.../dialysate_pump.py) (revision 18c90a1b2b6c7339bdd192a2d2fac32f2b8a35df) @@ -35,7 +35,6 @@ def __init__(self, can_interface, logger: Logger): """ - @param can_interface: Denali Can Messenger object """ super().__init__() @@ -170,7 +169,6 @@ @param speed: float - target speed value to override pump with @param reset: integer - 1 to reset a previous override, 0 to override @return: 1 if successful, zero otherwise - """ reset_byte_array = integer_to_bytearray(reset) speed_byte_array = float_to_bytearray(speed) @@ -196,7 +194,6 @@ @param speed: float - target speed value to override pump with @param reset: integer - 1 to reset a previous override, 0 to override @return: 1 if successful, zero otherwise - """ reset_byte_array = integer_to_bytearray(reset) speed_byte_array = float_to_bytearray(speed) @@ -222,7 +219,6 @@ @param pressure: float - target speed value to override dialysate pump with @param reset: integer - 1 to reset a previous override, 0 to override @return: 1 if successful, zero otherwise - """ reset_byte_array = integer_to_bytearray(reset) pressure_byte_array = float_to_bytearray(pressure) @@ -248,7 +244,6 @@ @param current: float - target speed value to override dialysate pump with @param reset: integer - 1 to reset a previous override, 0 to override @return: 1 if successful, zero otherwise - """ reset_byte_array = integer_to_bytearray(reset) current_byte_array = float_to_bytearray(current) @@ -274,7 +269,6 @@ @param direction: float - target speed value to override pump with @param reset: integer - 1 to reset a previous override, 0 to override @return: 1 if successful, zero otherwise - """ reset_byte_array = integer_to_bytearray(reset) direction_byte_array = float_to_bytearray(direction) @@ -300,7 +294,6 @@ @param command: int - value to command the dialysate pump @param speed: integer - rpm to set the speed to @return: 1 if successful, zero otherwise - """ pmp = integer_to_bytearray(pump_id) cmd = integer_to_bytearray(command) Index: leahi_dialin/dd/modules/gen_dialysate.py =================================================================== diff -u -r410054cfec7aee839266233249413b08b368fbd3 -r18c90a1b2b6c7339bdd192a2d2fac32f2b8a35df --- leahi_dialin/dd/modules/gen_dialysate.py (.../gen_dialysate.py) (revision 410054cfec7aee839266233249413b08b368fbd3) +++ leahi_dialin/dd/modules/gen_dialysate.py (.../gen_dialysate.py) (revision 18c90a1b2b6c7339bdd192a2d2fac32f2b8a35df) @@ -34,7 +34,6 @@ def __init__(self, can_interface, logger: Logger): """ - @param can_interface: Denali Can Messenger object """ super().__init__() @@ -110,7 +109,6 @@ @param in_progress: int - value to override in progress status @param reset: integer - 1 to reset a previous override, 0 to override @return: 1 if successful, zero otherwise - """ reset_byte_array = integer_to_bytearray(reset) inprog = integer_to_bytearray(in_progress) @@ -134,7 +132,6 @@ @param delivery: int - value to override in delivery status @param reset: integer - 1 to reset a previous override, 0 to override @return: 1 if successful, zero otherwise - """ reset_byte_array = integer_to_bytearray(reset) dev = integer_to_bytearray(delivery) @@ -158,7 +155,6 @@ @param temperature: float - value to override in fluid temperature. @param reset: integer - 1 to reset a previous override, 0 to override @return: 1 if successful, zero otherwise - """ reset_byte_array = integer_to_bytearray(reset) tmp = float_to_bytearray(temperature) @@ -182,7 +178,6 @@ @param state: int - value to override state @param reset: integer - 1 to reset a previous override, 0 to override @return: 1 if successful, zero otherwise - """ sts = integer_to_bytearray(state) payload = sts @@ -205,7 +200,6 @@ @param state: int - value to override state @param reset: integer - 1 to reset a previous override, 0 to override @return: 1 if successful, zero otherwise - """ reset_value = integer_to_bytearray(reset) interval_value = integer_to_bytearray(state) Index: leahi_dialin/dd/modules/heaters.py =================================================================== diff -u -r410054cfec7aee839266233249413b08b368fbd3 -r18c90a1b2b6c7339bdd192a2d2fac32f2b8a35df --- leahi_dialin/dd/modules/heaters.py (.../heaters.py) (revision 410054cfec7aee839266233249413b08b368fbd3) +++ leahi_dialin/dd/modules/heaters.py (.../heaters.py) (revision 18c90a1b2b6c7339bdd192a2d2fac32f2b8a35df) @@ -28,13 +28,11 @@ class DDHeaters(AbstractSubSystem): """ - Dialysate Delivery (DD) Dialin API sub-class for heaters related commands. """ def __init__(self, can_interface, logger: Logger): """ - @param can_interface: Denali CAN Messenger object """ super().__init__() Index: leahi_dialin/dd/modules/levels.py =================================================================== diff -u -r410054cfec7aee839266233249413b08b368fbd3 -r18c90a1b2b6c7339bdd192a2d2fac32f2b8a35df --- leahi_dialin/dd/modules/levels.py (.../levels.py) (revision 410054cfec7aee839266233249413b08b368fbd3) +++ leahi_dialin/dd/modules/levels.py (.../levels.py) (revision 18c90a1b2b6c7339bdd192a2d2fac32f2b8a35df) @@ -28,16 +28,13 @@ class DDLevels(AbstractSubSystem): """ - Dialysate Delivery (DD) Dialin API sub-class for levels related commands. """ def __init__(self, can_interface, logger: Logger): """ - @param can_interface: Denali CAN Messenger object """ - super().__init__() self.can_interface = can_interface Index: leahi_dialin/dd/modules/post_gen_dialysate.py =================================================================== diff -u -r410054cfec7aee839266233249413b08b368fbd3 -r18c90a1b2b6c7339bdd192a2d2fac32f2b8a35df --- leahi_dialin/dd/modules/post_gen_dialysate.py (.../post_gen_dialysate.py) (revision 410054cfec7aee839266233249413b08b368fbd3) +++ leahi_dialin/dd/modules/post_gen_dialysate.py (.../post_gen_dialysate.py) (revision 18c90a1b2b6c7339bdd192a2d2fac32f2b8a35df) @@ -33,7 +33,6 @@ def __init__(self, can_interface, logger: Logger): """ - @param can_interface: Leahi Can Messenger object """ super().__init__() Index: leahi_dialin/dd/modules/pre_gen_dialysate.py =================================================================== diff -u -r410054cfec7aee839266233249413b08b368fbd3 -r18c90a1b2b6c7339bdd192a2d2fac32f2b8a35df --- leahi_dialin/dd/modules/pre_gen_dialysate.py (.../pre_gen_dialysate.py) (revision 410054cfec7aee839266233249413b08b368fbd3) +++ leahi_dialin/dd/modules/pre_gen_dialysate.py (.../pre_gen_dialysate.py) (revision 18c90a1b2b6c7339bdd192a2d2fac32f2b8a35df) @@ -33,7 +33,6 @@ def __init__(self, can_interface, logger: Logger): """ - @param can_interface: Leahi Can Messenger object """ super().__init__() Index: leahi_dialin/dd/modules/pressure_sensors.py =================================================================== diff -u -r410054cfec7aee839266233249413b08b368fbd3 -r18c90a1b2b6c7339bdd192a2d2fac32f2b8a35df --- leahi_dialin/dd/modules/pressure_sensors.py (.../pressure_sensors.py) (revision 410054cfec7aee839266233249413b08b368fbd3) +++ leahi_dialin/dd/modules/pressure_sensors.py (.../pressure_sensors.py) (revision 18c90a1b2b6c7339bdd192a2d2fac32f2b8a35df) @@ -32,13 +32,10 @@ DD interface containing pressure related commands. """ - def __init__(self, can_interface, logger: Logger): """ - @param can_interface: The DenaliCANMessenger object """ - super().__init__() self.can_interface = can_interface self.logger = logger @@ -96,7 +93,6 @@ @param ms: unsigned int - broadcast interval (in ms) @param reset: integer - 1 to reset a previous override, 0 to override @return: 1 if successful, zero otherwise - """ return cmd_generic_broadcast_interval_override( ms = ms, @@ -146,7 +142,6 @@ @param counter: integer - read count to override sensor with @param reset: integer - 1 to reset a previous override, 0 to override @return: 1 if successful, zero otherwise - """ reset_byte_array = integer_to_bytearray(reset) read_byte_array = integer_to_bytearray(counter) @@ -175,7 +170,6 @@ @param counter: integer - error count to override sensor with @param reset: integer - 1 to reset a previous override, 0 to override @return: 1 if successful, zero otherwise - """ reset_byte_array = integer_to_bytearray(reset) error_byte_array = integer_to_bytearray(counter) Index: leahi_dialin/dd/modules/rinse_pump.py =================================================================== diff -u -r410054cfec7aee839266233249413b08b368fbd3 -r18c90a1b2b6c7339bdd192a2d2fac32f2b8a35df --- leahi_dialin/dd/modules/rinse_pump.py (.../rinse_pump.py) (revision 410054cfec7aee839266233249413b08b368fbd3) +++ leahi_dialin/dd/modules/rinse_pump.py (.../rinse_pump.py) (revision 18c90a1b2b6c7339bdd192a2d2fac32f2b8a35df) @@ -34,7 +34,6 @@ def __init__(self, can_interface, logger: Logger): """ - @param can_interface: Denali Can Messenger object """ super().__init__() Index: leahi_dialin/dd/modules/temperature_sensors.py =================================================================== diff -u -r410054cfec7aee839266233249413b08b368fbd3 -r18c90a1b2b6c7339bdd192a2d2fac32f2b8a35df --- leahi_dialin/dd/modules/temperature_sensors.py (.../temperature_sensors.py) (revision 410054cfec7aee839266233249413b08b368fbd3) +++ leahi_dialin/dd/modules/temperature_sensors.py (.../temperature_sensors.py) (revision 18c90a1b2b6c7339bdd192a2d2fac32f2b8a35df) @@ -178,7 +178,6 @@ @param sensor_value: (float) Value of the sensor to override @param reset: (int) whether to reset the override value. The default is NO_RESET @returns 1 if successful, zero otherwise - """ # DD Conductivity Sensors' Temperature Reading Override if DDTemperaturesNames.D16_TEMP.value <= sensor_index <= DDTemperaturesNames.D99_TEMP.value: @@ -217,7 +216,6 @@ @param counter: int - read counter to override sensor with @param reset: integer - 1 to reset a previous override, 0 to override @return: 1 if successful, zero otherwise - """ reset_byte_array = integer_to_bytearray(reset) read_byte_array = integer_to_bytearray(counter) @@ -243,7 +241,6 @@ @param counter: int - barometer sensor read counter value to override sensor with @param reset: integer - 1 to reset a previous override, 0 to override @return: 1 if successful, zero otherwise - """ reset_byte_array = integer_to_bytearray(reset) read_byte_array = integer_to_bytearray(counter) @@ -267,7 +264,6 @@ @param crc: int - the crc value to override sensor with @param reset: integer - 1 to reset a previous override, 0 to override @return: 1 if successful, zero otherwise - """ reset_byte_array = integer_to_bytearray(reset) read_byte_array = integer_to_bytearray(crc) Index: leahi_dialin/dd/modules/ultrafiltration.py =================================================================== diff -u -r410054cfec7aee839266233249413b08b368fbd3 -r18c90a1b2b6c7339bdd192a2d2fac32f2b8a35df --- leahi_dialin/dd/modules/ultrafiltration.py (.../ultrafiltration.py) (revision 410054cfec7aee839266233249413b08b368fbd3) +++ leahi_dialin/dd/modules/ultrafiltration.py (.../ultrafiltration.py) (revision 18c90a1b2b6c7339bdd192a2d2fac32f2b8a35df) @@ -33,7 +33,6 @@ def __init__(self, can_interface, logger: Logger): """ - @param can_interface: Leahi Can Messenger object """ super().__init__() Index: leahi_dialin/dd/modules/valves.py =================================================================== diff -u -r410054cfec7aee839266233249413b08b368fbd3 -r18c90a1b2b6c7339bdd192a2d2fac32f2b8a35df --- leahi_dialin/dd/modules/valves.py (.../valves.py) (revision 410054cfec7aee839266233249413b08b368fbd3) +++ leahi_dialin/dd/modules/valves.py (.../valves.py) (revision 18c90a1b2b6c7339bdd192a2d2fac32f2b8a35df) @@ -49,7 +49,6 @@ def __init__(self, can_interface, logger: Logger): """ - @param can_interface: Denali CAN Messenger object """ super().__init__() @@ -289,7 +288,6 @@ @param ms: unsigned int - broadcast interval (in ms) @param reset: integer - 1 to reset a previous override, 0 to override @return: 1 if successful, zero otherwise - """ return cmd_generic_broadcast_interval_override( ms = ms, @@ -416,7 +414,6 @@ @param valve: unsigned int - valve ID @param state: int - value to command the valve @return: 1 if successful, zero otherwise - """ vlv = integer_to_bytearray(valve) sts = integer_to_bytearray(state) Index: leahi_dialin/dd/modules/voltages.py =================================================================== diff -u -r410054cfec7aee839266233249413b08b368fbd3 -r18c90a1b2b6c7339bdd192a2d2fac32f2b8a35df --- leahi_dialin/dd/modules/voltages.py (.../voltages.py) (revision 410054cfec7aee839266233249413b08b368fbd3) +++ leahi_dialin/dd/modules/voltages.py (.../voltages.py) (revision 18c90a1b2b6c7339bdd192a2d2fac32f2b8a35df) @@ -34,7 +34,6 @@ def __init__(self, can_interface, logger: Logger): """ DDVoltages constructor - """ super().__init__() self.can_interface = can_interface Index: leahi_dialin/dd/proxies/ro_proxy.py =================================================================== diff -u -raa534fb000c14ca2490eda9c4497f18402db3c2d -r18c90a1b2b6c7339bdd192a2d2fac32f2b8a35df --- leahi_dialin/dd/proxies/ro_proxy.py (.../ro_proxy.py) (revision aa534fb000c14ca2490eda9c4497f18402db3c2d) +++ leahi_dialin/dd/proxies/ro_proxy.py (.../ro_proxy.py) (revision 18c90a1b2b6c7339bdd192a2d2fac32f2b8a35df) @@ -33,7 +33,6 @@ @param can_interface: the Denali CAN interface object """ - super().__init__() self.can_interface = can_interface self.logger = logger Index: leahi_dialin/dd/proxies/td_proxy.py =================================================================== diff -u -r0bdafdb1821e164a8416ea4b47be946f13239b5a -r18c90a1b2b6c7339bdd192a2d2fac32f2b8a35df --- leahi_dialin/dd/proxies/td_proxy.py (.../td_proxy.py) (revision 0bdafdb1821e164a8416ea4b47be946f13239b5a) +++ leahi_dialin/dd/proxies/td_proxy.py (.../td_proxy.py) (revision 18c90a1b2b6c7339bdd192a2d2fac32f2b8a35df) @@ -34,7 +34,6 @@ @param can_interface: the Denali CAN interface object """ - super().__init__() self.can_interface = can_interface self.logger = logger Index: leahi_dialin/protocols/CAN.py =================================================================== diff -u -r79697500614904bafb56f3d33e368b954ba78f7d -r18c90a1b2b6c7339bdd192a2d2fac32f2b8a35df --- leahi_dialin/protocols/CAN.py (.../CAN.py) (revision 79697500614904bafb56f3d33e368b954ba78f7d) +++ leahi_dialin/protocols/CAN.py (.../CAN.py) (revision 18c90a1b2b6c7339bdd192a2d2fac32f2b8a35df) @@ -94,7 +94,6 @@ @param seq: (int) Overrides current sequence number if set @return:: dictionary with channel_id and 8-byte padded message """ - if payload is None: payload = [] @@ -169,7 +168,6 @@ @param message: packet that may or may not be multiple of 8 bytes @return:: packet that is 8-byte multiple - """ message_length = len(message) @@ -192,7 +190,6 @@ @return:: CRC in message """ - crc_index = DenaliMessage.PAYLOAD_START_INDEX + DenaliMessage.get_payload_length(message) return message['message'][crc_index] @@ -204,7 +201,6 @@ @return:: TRUE if CRC matches, FALSE otherwise """ - if message is None: return False else: @@ -223,9 +219,7 @@ @param message: dictionary with channel_id and message keys @return:: integer with channel id - """ - return message['channel_id'] @staticmethod @@ -315,7 +309,6 @@ Returns request ID from packet @param message: complete Diality Packet @return:: integer with request ID - """ msg_id_array = message['message'][DenaliMessage.MSG_ID_INDEX: DenaliMessage.PAYLOAD_LENGTH_INDEX] @@ -351,7 +344,6 @@ @param message: dictionary with channel_id and message keys @return:: a payload array if exist """ - payload_length = DenaliMessage.get_payload_length(message) if payload_length == 0: @@ -381,7 +373,6 @@ Updates made to the "Message List.xlsx" document found in the Diality Software Team SharePoint, specifically in the CAN Channels sheet, should also be applied here. """ - td_alarm_broadcast_ch_id = 0x001 dd_alarm_broadcast_ch_id = 0x002 fp_alarm_broadcast_ch_id = 0x004 @@ -470,7 +461,6 @@ @param can_interface - string containing the can interface, e.g., 'can0" @return: DialityCanMessenger object - """ self.message_queue_mutex = threading.Lock() self.response_dictionary_mutex = threading.Lock() @@ -525,9 +515,7 @@ def start(self): """ starts listening to the can interface. - """ - if self.bus is None: self.logger.error("Cannot start can listener.") return @@ -546,7 +534,6 @@ def stop(self): """ Stop listening the can interface - """ self.run = False self.logger.debug("\nCan listener has stopped.") @@ -579,7 +566,6 @@ Handles messages added to the leahi_dialin canbus message queue @return: None """ - while True: if not self.message_queue: @@ -740,7 +726,6 @@ @param function_ptr: function reference """ - self.ui_received_function_ptr = function_ptr def send(self, @@ -827,7 +812,6 @@ @param send: (bool) Whether we're sending or receiving this packet @return: The styled message """ - tmp = str(message) data = tmp[-41:-18].upper() Index: leahi_dialin/td/modules/air_pump.py =================================================================== diff -u -r03dc6c3ff80d7f76a5b6438ba067e02a37e2ce93 -r18c90a1b2b6c7339bdd192a2d2fac32f2b8a35df --- leahi_dialin/td/modules/air_pump.py (.../air_pump.py) (revision 03dc6c3ff80d7f76a5b6438ba067e02a37e2ce93) +++ leahi_dialin/td/modules/air_pump.py (.../air_pump.py) (revision 18c90a1b2b6c7339bdd192a2d2fac32f2b8a35df) @@ -35,7 +35,6 @@ def __init__(self, can_interface, logger: Logger): """ - @param can_interface: Denali Can Messenger object """ super().__init__() Index: leahi_dialin/td/modules/air_trap.py =================================================================== diff -u -r03dc6c3ff80d7f76a5b6438ba067e02a37e2ce93 -r18c90a1b2b6c7339bdd192a2d2fac32f2b8a35df --- leahi_dialin/td/modules/air_trap.py (.../air_trap.py) (revision 03dc6c3ff80d7f76a5b6438ba067e02a37e2ce93) +++ leahi_dialin/td/modules/air_trap.py (.../air_trap.py) (revision 18c90a1b2b6c7339bdd192a2d2fac32f2b8a35df) @@ -39,7 +39,6 @@ def __init__(self, can_interface, logger: Logger): """ - @param can_interface: Denali Can Messenger object """ super().__init__() @@ -83,7 +82,6 @@ @param message: published air trap data message @return: None """ - lower = struct.unpack('i', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_1:MsgFieldPositions.END_POS_FIELD_1])) upper = struct.unpack('i', bytearray( @@ -140,7 +138,6 @@ @param detected: unsigned int - detected to override sensor with @param reset: integer - 1 to reset a previous override, 0 to override @return: 1 if successful, zero otherwise - """ rst = integer_to_bytearray(reset) det = integer_to_bytearray(detected) @@ -169,7 +166,6 @@ @param detected: unsigned int - detected (0=air, 1=fluid) to override sensor with @param reset: integer - 1 to reset a previous override, 0 to override @return: 1 if successful, zero otherwise - """ rst = integer_to_bytearray(reset) det = integer_to_bytearray(detected) Index: leahi_dialin/td/modules/blood_flow.py =================================================================== diff -u -r03dc6c3ff80d7f76a5b6438ba067e02a37e2ce93 -r18c90a1b2b6c7339bdd192a2d2fac32f2b8a35df --- leahi_dialin/td/modules/blood_flow.py (.../blood_flow.py) (revision 03dc6c3ff80d7f76a5b6438ba067e02a37e2ce93) +++ leahi_dialin/td/modules/blood_flow.py (.../blood_flow.py) (revision 18c90a1b2b6c7339bdd192a2d2fac32f2b8a35df) @@ -309,7 +309,6 @@ @param intercept: float - target value to override alpha y intercept with @param reset: integer - 1 to reset a previous override, 0 to override @return: 1 if successful, zero otherwise - """ reset_byte_array = integer_to_bytearray(reset) intercept_byte_array = float_to_bytearray(intercept) @@ -335,7 +334,6 @@ @param a_term: float - target value to override wear a term intercept with @param reset: integer - 1 to reset a previous override, 0 to override @return: 1 if successful, zero otherwise - """ reset_byte_array = integer_to_bytearray(reset) term_byte_array = float_to_bytearray(a_term) @@ -361,7 +359,6 @@ @param a_term: float - target value to override wear b term intercept with @param reset: integer - 1 to reset a previous override, 0 to override @return: 1 if successful, zero otherwise - """ reset_byte_array = integer_to_bytearray(reset) term_byte_array = float_to_bytearray(b_term) Index: leahi_dialin/td/modules/bubble_detector.py =================================================================== diff -u -r03dc6c3ff80d7f76a5b6438ba067e02a37e2ce93 -r18c90a1b2b6c7339bdd192a2d2fac32f2b8a35df --- leahi_dialin/td/modules/bubble_detector.py (.../bubble_detector.py) (revision 03dc6c3ff80d7f76a5b6438ba067e02a37e2ce93) +++ leahi_dialin/td/modules/bubble_detector.py (.../bubble_detector.py) (revision 18c90a1b2b6c7339bdd192a2d2fac32f2b8a35df) @@ -8,7 +8,7 @@ # @file air_bubbles.py # # @author (last) Zoltan Miskolci -# @date (last) 08-Jan-2026 +# @date (last) 09-Jan-2026 # @author (original) Peman Montazemi # @date (original) 18-May-2021 # @@ -17,7 +17,7 @@ import struct from logging import Logger -from .constants import NO_RESET +from leahi_dialin.common.constants import NO_RESET from leahi_dialin.common.msg_defs import MsgIds, MsgFieldPositions from leahi_dialin.common.override_templates import cmd_generic_broadcast_interval_override, cmd_generic_override from leahi_dialin.common.td_defs import TDAirBubbleDetectorNames, TDAirBubbleDetectorAttributes @@ -48,7 +48,6 @@ def __init__(self, can_interface, logger: Logger): """ - @param can_interface: Denali Can Messenger object """ super().__init__() @@ -121,7 +120,6 @@ @param reset: integer - 1 to reset a previous override, 0 to override @return: 1 if successful, zero otherwise """ - rst = integer_to_bytearray(reset) i = integer_to_bytearray(index) stat = integer_to_bytearray(status) Index: leahi_dialin/td/modules/buttons.py =================================================================== diff -u -r03dc6c3ff80d7f76a5b6438ba067e02a37e2ce93 -r18c90a1b2b6c7339bdd192a2d2fac32f2b8a35df --- leahi_dialin/td/modules/buttons.py (.../buttons.py) (revision 03dc6c3ff80d7f76a5b6438ba067e02a37e2ce93) +++ leahi_dialin/td/modules/buttons.py (.../buttons.py) (revision 18c90a1b2b6c7339bdd192a2d2fac32f2b8a35df) @@ -90,7 +90,6 @@ @param reset: integer - 1 to reset a previous override, 0 to override @return: 1 if successful, zero otherwise """ - rst = integer_to_bytearray(reset) sta = integer_to_bytearray(state) payload = rst + sta @@ -119,7 +118,6 @@ @param reset: integer - 1 to reset a previous override, 0 to override @return: 1 if successful, zero otherwise """ - rst = integer_to_bytearray(reset) sta = integer_to_bytearray(state) payload = rst + sta Fisheye: Tag 18c90a1b2b6c7339bdd192a2d2fac32f2b8a35df refers to a dead (removed) revision in file `leahi_dialin/td/modules/constants.py'. Fisheye: No comparison available. Pass `N' to diff? Index: leahi_dialin/td/modules/ejector.py =================================================================== diff -u -r03dc6c3ff80d7f76a5b6438ba067e02a37e2ce93 -r18c90a1b2b6c7339bdd192a2d2fac32f2b8a35df --- leahi_dialin/td/modules/ejector.py (.../ejector.py) (revision 03dc6c3ff80d7f76a5b6438ba067e02a37e2ce93) +++ leahi_dialin/td/modules/ejector.py (.../ejector.py) (revision 18c90a1b2b6c7339bdd192a2d2fac32f2b8a35df) @@ -35,7 +35,6 @@ def __init__(self, can_interface, logger: Logger): """ - @param can_interface: Denali Can Messenger object """ super().__init__() @@ -112,7 +111,6 @@ @param cmd: integer - ID of an ejector operation that is being requested @return: 1 if successful, zero otherwise """ - idx = integer_to_bytearray(cmd) payload = idx @@ -137,7 +135,6 @@ @return: 1 if successful, zero otherwise """ - spd = float_to_bytearray(speed) payload = spd @@ -169,7 +166,6 @@ @param reset: integer - 1 to reset a previous override, 0 to override @return: 1 if successful, zero otherwise """ - rst = integer_to_bytearray(reset) sen = integer_to_bytearray(sensor) active = integer_to_bytearray(sensor_active) Index: leahi_dialin/td/modules/events.py =================================================================== diff -u -r03dc6c3ff80d7f76a5b6438ba067e02a37e2ce93 -r18c90a1b2b6c7339bdd192a2d2fac32f2b8a35df --- leahi_dialin/td/modules/events.py (.../events.py) (revision 03dc6c3ff80d7f76a5b6438ba067e02a37e2ce93) +++ leahi_dialin/td/modules/events.py (.../events.py) (revision 18c90a1b2b6c7339bdd192a2d2fac32f2b8a35df) @@ -35,10 +35,8 @@ def __init__(self, can_interface, logger: Logger): """ - @param can_interface: Denali CAN Messenger object """ - super().__init__() self.can_interface = can_interface self.logger = logger Index: leahi_dialin/td/modules/pressure_sensors.py =================================================================== diff -u -r03dc6c3ff80d7f76a5b6438ba067e02a37e2ce93 -r18c90a1b2b6c7339bdd192a2d2fac32f2b8a35df --- leahi_dialin/td/modules/pressure_sensors.py (.../pressure_sensors.py) (revision 03dc6c3ff80d7f76a5b6438ba067e02a37e2ce93) +++ leahi_dialin/td/modules/pressure_sensors.py (.../pressure_sensors.py) (revision 18c90a1b2b6c7339bdd192a2d2fac32f2b8a35df) @@ -34,7 +34,6 @@ def __init__(self, can_interface, logger: Logger): """ TDPressureSensors constructor - """ super().__init__() self.can_interface = can_interface @@ -86,7 +85,6 @@ @param message: published pressure & occlusion data message @return: none """ - art = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_1:MsgFieldPositions.END_POS_FIELD_1])) ven = struct.unpack('f', bytearray( @@ -191,7 +189,6 @@ @param reset: integer - 1 to reset a previous override, 0 to override @return: 1 if successful, zero otherwise """ - rst = integer_to_bytearray(reset) prs = float_to_bytearray(pressure) payload = rst + prs Index: leahi_dialin/td/modules/switches.py =================================================================== diff -u -r03dc6c3ff80d7f76a5b6438ba067e02a37e2ce93 -r18c90a1b2b6c7339bdd192a2d2fac32f2b8a35df --- leahi_dialin/td/modules/switches.py (.../switches.py) (revision 03dc6c3ff80d7f76a5b6438ba067e02a37e2ce93) +++ leahi_dialin/td/modules/switches.py (.../switches.py) (revision 18c90a1b2b6c7339bdd192a2d2fac32f2b8a35df) @@ -34,7 +34,6 @@ def __init__(self, can_interface, logger: Logger): """ TDSwitches constructor - """ super().__init__() Index: leahi_dialin/td/modules/td_test_configs.py =================================================================== diff -u -r03dc6c3ff80d7f76a5b6438ba067e02a37e2ce93 -r18c90a1b2b6c7339bdd192a2d2fac32f2b8a35df --- leahi_dialin/td/modules/td_test_configs.py (.../td_test_configs.py) (revision 03dc6c3ff80d7f76a5b6438ba067e02a37e2ce93) +++ leahi_dialin/td/modules/td_test_configs.py (.../td_test_configs.py) (revision 18c90a1b2b6c7339bdd192a2d2fac32f2b8a35df) @@ -27,13 +27,11 @@ class TDTestConfig(AbstractSubSystem): """ - TD Dialin API sub-class for setting and getting the test configurations. """ def __init__(self, can_interface, logger: Logger): """ - @param can_interface: Denali CAN Messenger object """ super().__init__() Index: leahi_dialin/td/modules/temperature_sensors.py =================================================================== diff -u -r03dc6c3ff80d7f76a5b6438ba067e02a37e2ce93 -r18c90a1b2b6c7339bdd192a2d2fac32f2b8a35df --- leahi_dialin/td/modules/temperature_sensors.py (.../temperature_sensors.py) (revision 03dc6c3ff80d7f76a5b6438ba067e02a37e2ce93) +++ leahi_dialin/td/modules/temperature_sensors.py (.../temperature_sensors.py) (revision 18c90a1b2b6c7339bdd192a2d2fac32f2b8a35df) @@ -8,7 +8,7 @@ # @file temperature_sensors.py # # @author (last) Zoltan Miskolci -# @date (last) 08-Jan-2026 +# @date (last) 09-Jan-2026 # @author (original) Dara Navaei # @date (original) 09-Nov-2020 # @@ -17,7 +17,7 @@ import struct from logging import Logger -from .constants import RESET, NO_RESET +from leahi_dialin.common.constants import NO_RESET from leahi_dialin.common.msg_defs import MsgIds, MsgFieldPositions from leahi_dialin.common.override_templates import cmd_generic_broadcast_interval_override, cmd_generic_override from leahi_dialin.common.td_defs import TDTemperatureSensorNames @@ -34,7 +34,6 @@ def __init__(self, can_interface, logger: Logger): """ TDTemperatureSensors constructor - """ super().__init__() self.can_interface = can_interface Index: leahi_dialin/td/modules/treatment.py =================================================================== diff -u -r1813f6556e8a726a6e300caffe0bcafc40010aa9 -r18c90a1b2b6c7339bdd192a2d2fac32f2b8a35df --- leahi_dialin/td/modules/treatment.py (.../treatment.py) (revision 1813f6556e8a726a6e300caffe0bcafc40010aa9) +++ leahi_dialin/td/modules/treatment.py (.../treatment.py) (revision 18c90a1b2b6c7339bdd192a2d2fac32f2b8a35df) @@ -34,7 +34,6 @@ def __init__(self, can_interface, logger: Logger): """ TDTreatment constructor - """ super().__init__() self.can_interface = can_interface Index: leahi_dialin/td/modules/voltages.py =================================================================== diff -u -r1813f6556e8a726a6e300caffe0bcafc40010aa9 -r18c90a1b2b6c7339bdd192a2d2fac32f2b8a35df --- leahi_dialin/td/modules/voltages.py (.../voltages.py) (revision 1813f6556e8a726a6e300caffe0bcafc40010aa9) +++ leahi_dialin/td/modules/voltages.py (.../voltages.py) (revision 18c90a1b2b6c7339bdd192a2d2fac32f2b8a35df) @@ -34,7 +34,6 @@ def __init__(self, can_interface, logger: Logger): """ TDVoltages constructor - """ super().__init__() self.can_interface = can_interface @@ -128,7 +127,6 @@ @param reset: integer - 1 to reset a previous override, 0 to override @return: 1 if successful, zero otherwise """ - rst = integer_to_bytearray(reset) vlt = float_to_bytearray(volts) idx = integer_to_bytearray(signal) Index: leahi_dialin/td/proxies/ui_proxy.py =================================================================== diff -u -r1813f6556e8a726a6e300caffe0bcafc40010aa9 -r18c90a1b2b6c7339bdd192a2d2fac32f2b8a35df --- leahi_dialin/td/proxies/ui_proxy.py (.../ui_proxy.py) (revision 1813f6556e8a726a6e300caffe0bcafc40010aa9) +++ leahi_dialin/td/proxies/ui_proxy.py (.../ui_proxy.py) (revision 18c90a1b2b6c7339bdd192a2d2fac32f2b8a35df) @@ -38,7 +38,6 @@ @param can_interface: the Denali CAN interface object """ - super().__init__() self.can_interface = can_interface self.logger = logger Index: leahi_dialin/td/treatment_delivery.py =================================================================== diff -u -rf762fd31ac5b03734f000f9fcd671851581def8a -r18c90a1b2b6c7339bdd192a2d2fac32f2b8a35df --- leahi_dialin/td/treatment_delivery.py (.../treatment_delivery.py) (revision f762fd31ac5b03734f000f9fcd671851581def8a) +++ leahi_dialin/td/treatment_delivery.py (.../treatment_delivery.py) (revision 18c90a1b2b6c7339bdd192a2d2fac32f2b8a35df) @@ -277,7 +277,6 @@ @param reset: integer - 1 to reset a previous override, 0 to override @return: 1 if successful, zero otherwise """ - return cmd_generic_broadcast_interval_override( ms = ms, reset = reset, @@ -296,7 +295,6 @@ @param resend: (bool) if False (default), try to login once. Otherwise, tries to login indefinitely @return: 1 if logged in, 0 if log in failed """ - message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_td_ch_id, message_id=MsgIds.MSG_ID_TD_TESTER_LOGIN_REQUEST.value, payload=list(map(int, map(ord, self.TD_LOGIN_PASSWORD)))) @@ -339,9 +337,7 @@ TD_OP_MODE_POST_TREATMENT = 7 @return: 1 if successful, zero otherwise - """ - payload = integer_to_bytearray(new_mode) return cmd_generic_override( @@ -363,7 +359,6 @@ @return: None """ - return cmd_generic_override( payload = None, reset = NO_RESET, @@ -384,9 +379,7 @@ @param active: int - True to activate safety shutdown, False to deactivate @param reset: integer - 1 to reset a previous override, 0 to override @return: 1 if successful, zero otherwise - """ - rst = integer_to_bytearray(reset) saf = integer_to_bytearray(active) payload = rst + saf @@ -408,7 +401,6 @@ @return: none """ - message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_td_ch_id, message_id=MsgIds.MSG_ID_TD_UI_VERSION_INFO_REQUEST.value) @@ -424,7 +416,6 @@ @param reset: integer - 1 to reset a previous override, 0 to override @return: 1 if successful, zero otherwise """ - rst = integer_to_bytearray(reset) val = integer_to_bytearray(value) payload = rst + val Index: leahi_dialin/ui/dd_messaging.py =================================================================== diff -u -r02eb470cf6682c89062c8a62eaf0a08a2728b18a -r18c90a1b2b6c7339bdd192a2d2fac32f2b8a35df --- leahi_dialin/ui/dd_messaging.py (.../dd_messaging.py) (revision 02eb470cf6682c89062c8a62eaf0a08a2728b18a) +++ leahi_dialin/ui/dd_messaging.py (.../dd_messaging.py) (revision 18c90a1b2b6c7339bdd192a2d2fac32f2b8a35df) @@ -162,7 +162,6 @@ d6Level (int ): floater switch low, medium and high status d63Level (int ): bicarb level low or high status d46Level (int ): Spent dialysate air separation chamber level low or high status - """ payload = conversions.unsigned_integer_to_bytearray(d6Level ) payload += conversions.unsigned_integer_to_bytearray(d63Level ) @@ -206,7 +205,6 @@ d51PresTemp (float): Spent Dialysate temperature d18PresTemp (float): Fresh Dialysate temperature d41PresTemp (float): Transmembrane temperature - """ payload = conversions.float_to_bytearray(m1Pressure ) payload += conversions.float_to_bytearray(m3Pressure ) @@ -263,7 +261,6 @@ d50AvgTemp (float) : D50 moving average temperature value d28AvgTemp (float) : D28 moving average temperature value d30AvgTemp (float) : D30 moving average temperature value - """ payload = conversions.float_to_bytearray(d1Temp ) payload += conversions.float_to_bytearray(x6Temp ) @@ -325,7 +322,6 @@ dbg7 (optional) (float) : D50 moving average temperature value dbg8 (optional) (float) : D28 moving average temperature value dbg9 (optional) (float) : D30 moving average temperature value - """ payload = conversions.float_to_bytearray (d5_HeaterDC ) payload += conversions.float_to_bytearray (d45_HeaterDC ) @@ -405,7 +401,6 @@ d76PumpMeasuredRevCount (int ) : Concentrate pump D76_Pump measured revolution cou d76PumpState (int ) : Concentrate pump D76_Pump current state d76PumpPulseUS (float) : Concentrate pump D76_Pump pulse in microseconds - """ payload = conversions.float_to_bytearray (d11PumpCurrentSetSpeed ) payload += conversions.float_to_bytearray (d11PumpMeasuredSpeed ) @@ -484,7 +479,6 @@ d48PumpDirErrCnt (int ) : Dialysate pump D10_Pump park fault status d12PumpMeasuredDir (int ) : Dialysate pump D76_Pump target speed d48PumpMeasuredDir (int ) : Dialysate pump D76_Pump current set speed - """ payload = conversions.float_to_bytearray (d12PumpTargetRPM ) payload += conversions.float_to_bytearray (d48PumpTargetRPM ) @@ -519,7 +513,6 @@ Broadcasts the current DD Level Sensor data (Msg ID: 0x60, 96) Args: blood_leak (int ): Blood Leak status - """ payload = conversions.unsigned_integer_to_bytearray(blood_leak ) Index: leahi_dialin/ui/td_messaging.py =================================================================== diff -u -r082676758cf5454d87bb95c80c59d89e47c54e90 -r18c90a1b2b6c7339bdd192a2d2fac32f2b8a35df --- leahi_dialin/ui/td_messaging.py (.../td_messaging.py) (revision 082676758cf5454d87bb95c80c59d89e47c54e90) +++ leahi_dialin/ui/td_messaging.py (.../td_messaging.py) (revision 18c90a1b2b6c7339bdd192a2d2fac32f2b8a35df) @@ -37,7 +37,6 @@ Args: op_mode (int ): operation mode sub_mode (int, optional ): operation sub-mode. Defaults to 0. - """ if not self.can_enabled: raise ValueError("CAN Interface is not enabled") @@ -97,7 +96,6 @@ @param H6_rot_hall_state : Rotor hall state (1=home, 0=not home) @return: None """ - if not self.can_enabled: raise ValueError("CAN Interface is not enabled") @@ -139,7 +137,6 @@ @param controlling : air control @return: None """ - if not self.can_enabled: raise ValueError("CAN Interface is not enabled") @@ -319,7 +316,6 @@ @param fpga_vpvn (float): FPGA pvn voltage (1V) @return: None """ - if not self.can_enabled: raise ValueError("CAN Interface is not enabled") @@ -372,7 +368,6 @@ @param tmp_max (float) : TMP maximum @return: None """ - if not self.can_enabled: raise ValueError("CAN Interface is not enabled") @@ -409,7 +404,6 @@ @param time_remaining (int) : Heparin time remaining @return: None """ - if not self.can_enabled: raise ValueError("CAN Interface is not enabled") @@ -437,7 +431,6 @@ @param heartRate (int ) : heart rate @return: None """ - if not self.can_enabled: raise ValueError("CAN Interface is not enabled") @@ -466,7 +459,6 @@ @param state (int ) : Saline bolus state @return: None """ - if not self.can_enabled: raise ValueError("CAN Interface is not enabled") @@ -497,7 +489,6 @@ @param state (int ) : UF state @return: None """ - if not self.can_enabled: raise ValueError("CAN Interface is not enabled") @@ -526,7 +517,6 @@ @param tx_remaining_s (int) : Treatment time remaining (s) @return: None """ - if not self.can_enabled: raise ValueError("CAN Interface is not enabled") @@ -560,7 +550,6 @@ @param max_dial_rate_mLH : Maximum dial rate in mL/H. @return: None """ - if not self.can_enabled: raise ValueError("CAN Interface is not enabled") @@ -591,7 +580,6 @@ @param dialysate_temp (float) : Target Dialysate Temperature @return: None """ - if not self.can_enabled: raise ValueError("CAN Interface is not enabled") @@ -991,7 +979,7 @@ vRincebackFlowRateDefReason (int, optional): None zero value of rejection reason. Defaults to 0. vSubVolumeMinReason (int, optional): None zero value of rejection reason. Defaults to 0. vSubVolumeMaxReason (int, optional): None zero value of rejection reason. Defaults to 0. - vSubVolumeDefReason (int, optional): None zero value of rejection reason. Defaults to 0. + vSubVolumeDefReason (int, optional): None zero value of rejection reason. Defaults to 0. """ payload = conversions.integer_to_bytearray(vAccepted ) payload += conversions.integer_to_bytearray(vBloodFlowMinReason ) @@ -1166,7 +1154,7 @@ vChlorineWaterSampleCheckMinRejectionReason (int, optional): None zero value of rejection reason. Defaults to 0. vChlorineWaterSampleCheckMaxRejectionReason (int, optional): None zero value of rejection reason. Defaults to 0. vChlorineWaterSampleCheckDefRejectionReason (int, optional): None zero value of rejection reason. Defaults to 0. - vWaterSampleTestResultRequiredDefRejectionReason (int, optional): None zero value of rejection reason. Defaults to 0. + vWaterSampleTestResultRequiredDefRejectionReason (int, optional): None zero value of rejection reason. Defaults to 0. """ payload = conversions.integer_to_bytearray(vAccepted ) payload += conversions.integer_to_bytearray(vMinRORejectionRatioAlarmMaxRejectionReason ) @@ -1263,7 +1251,6 @@ vHeparinDispensingRateRejectReason (int, optional): None zero value of rejection reason. Defaults to 0. vHeparinBolusVolumeRejectReason (int, optional): None zero value of rejection reason. Defaults to 0. """ - if not self.can_enabled: raise ValueError("CAN Interface is not enabled") Index: leahi_dialin/ui/td_messaging_alarms.py =================================================================== diff -u -r287c39e4bb0d8f8d66a4f556f18ffc4e51f1e977 -r18c90a1b2b6c7339bdd192a2d2fac32f2b8a35df --- leahi_dialin/ui/td_messaging_alarms.py (.../td_messaging_alarms.py) (revision 287c39e4bb0d8f8d66a4f556f18ffc4e51f1e977) +++ leahi_dialin/ui/td_messaging_alarms.py (.../td_messaging_alarms.py) (revision 18c90a1b2b6c7339bdd192a2d2fac32f2b8a35df) @@ -45,7 +45,6 @@ @param flags: (int) See 'cmd_make_alarm_flags' @return: None """ - payload = conversions.integer_to_bytearray (state ) payload += conversions.integer_to_bytearray (alarm ) payload += conversions.integer_to_bytearray (silence_expires) Index: leahi_dialin/utils/base.py =================================================================== diff -u -r2138d06d100fdcf23f2e9069f35ee2fdee62008f -r18c90a1b2b6c7339bdd192a2d2fac32f2b8a35df --- leahi_dialin/utils/base.py (.../base.py) (revision 2138d06d100fdcf23f2e9069f35ee2fdee62008f) +++ leahi_dialin/utils/base.py (.../base.py) (revision 18c90a1b2b6c7339bdd192a2d2fac32f2b8a35df) @@ -77,11 +77,9 @@ def __init__(self, log_level=None, log_filepath="Dialin.log"): """ - @param log_level: (str) or (None) if not set, contains the logging level @param log_filepath: (str) the log filepath """ - self.log_level = log_level self.logging_enabled = self.log_level_enables_logging(log_level) self.log_filepath = self.get_available_log_path(log_filepath) @@ -125,7 +123,6 @@ @return: True if successful, False otherwise """ - # remove existing handlers if self.logger is not None: for handler in self.logger.handlers: @@ -199,7 +196,6 @@ @param filepath: The full path to the file @return: (str) The available log filepath """ - if not os.path.exists(filepath): return filepath @@ -217,7 +213,6 @@ """ Initialization function for the sub system # The abstract base class requires all abstract methods are overridden by children classes - """ self._observers = [] self._datetime_fmt = "%m.%d.%Y_%I.%M.%S.%f" @@ -247,7 +242,6 @@ def _decorator(func): """ - @param func: The handler function @return: The function to wrap around _publish """ Index: leahi_dialin/utils/data_logger.py =================================================================== diff -u -r126c206228086fbd13e820980c2fbb2fb58131bb -r18c90a1b2b6c7339bdd192a2d2fac32f2b8a35df --- leahi_dialin/utils/data_logger.py (.../data_logger.py) (revision 126c206228086fbd13e820980c2fbb2fb58131bb) +++ leahi_dialin/utils/data_logger.py (.../data_logger.py) (revision 18c90a1b2b6c7339bdd192a2d2fac32f2b8a35df) @@ -38,7 +38,6 @@ """ Logs data to xlsx file @param folder: (str) the destination filepath - """ super().__init__() self.queue = deque() # Thread safe @@ -62,7 +61,6 @@ def add_data(self, data: Tuple): """ - @param data: (Tuple) the data to add to the queue @return: None """ @@ -78,7 +76,6 @@ Called on teach timer event. Logs the data currently in deque @return: None """ - i = 0 while self.queue: module, timestamp, data_name, data_value = self.queue.pop() @@ -117,7 +114,6 @@ @param output_path: (str) the destination output path @return: None """ - Path(self.path_disable_logging).touch() self.logger.debug("Starting data export to {0}".format(output_path)) log_path = os.path.join(self.base_folder, "*Log") Index: leahi_dialin/utils/helpers.py =================================================================== diff -u -r2138d06d100fdcf23f2e9069f35ee2fdee62008f -r18c90a1b2b6c7339bdd192a2d2fac32f2b8a35df --- leahi_dialin/utils/helpers.py (.../helpers.py) (revision 2138d06d100fdcf23f2e9069f35ee2fdee62008f) +++ leahi_dialin/utils/helpers.py (.../helpers.py) (revision 18c90a1b2b6c7339bdd192a2d2fac32f2b8a35df) @@ -190,7 +190,6 @@ @param clear_before_write: (bool) if True, clear log file before write to it @return: (logging.Logger) The logger object """ - numeric_level = getattr(logging, level, logging.ERROR) current_time = datetime.now() Index: leahi_dialin/utils/nv_ops_utils.py =================================================================== diff -u -r2138d06d100fdcf23f2e9069f35ee2fdee62008f -r18c90a1b2b6c7339bdd192a2d2fac32f2b8a35df --- leahi_dialin/utils/nv_ops_utils.py (.../nv_ops_utils.py) (revision 2138d06d100fdcf23f2e9069f35ee2fdee62008f) +++ leahi_dialin/utils/nv_ops_utils.py (.../nv_ops_utils.py) (revision 18c90a1b2b6c7339bdd192a2d2fac32f2b8a35df) @@ -47,7 +47,6 @@ class NVUtilsObserver(AbstractObserver): """ - Observation class """ def __init__(self, prop): @@ -67,7 +66,6 @@ class NVOpsUtils: """ - Processes the calibration_record records, service records, system records, and the scheduled runs records. The records are prepared to be sent to firmware or to be received from firmware. """ @@ -148,7 +146,6 @@ @param logger: (Logger) the logger """ - self.logger = logger self._workspace_dir = '' self._excel_workbook = '' @@ -914,7 +911,6 @@ @return: padding size in bytes """ - # Calculate the padding size: # If bytes in the dictionary % max write bytes to RTC RAM (64) or EEPROM (16) is 0, not padding is needed # Else padding = (ceil(dictionary bytes/max write) * max write)-dictionary bytes Index: tests/DebugMsgCatcher.py =================================================================== diff -u -rb93016ee67204223658152cb2952e8ab16af1b94 -r18c90a1b2b6c7339bdd192a2d2fac32f2b8a35df --- tests/DebugMsgCatcher.py (.../DebugMsgCatcher.py) (revision b93016ee67204223658152cb2952e8ab16af1b94) +++ tests/DebugMsgCatcher.py (.../DebugMsgCatcher.py) (revision 18c90a1b2b6c7339bdd192a2d2fac32f2b8a35df) @@ -32,7 +32,6 @@ def _handler_debug_msg_catch(filename, message): """ - @param """ print("_handler_debug_msg_catch") Index: tests/data_capture_helpers/fp_helpers.py =================================================================== diff -u -r6e95e1705ce73dd7f159564b2ac3fde75f29b215 -r18c90a1b2b6c7339bdd192a2d2fac32f2b8a35df --- tests/data_capture_helpers/fp_helpers.py (.../fp_helpers.py) (revision 6e95e1705ce73dd7f159564b2ac3fde75f29b215) +++ tests/data_capture_helpers/fp_helpers.py (.../fp_helpers.py) (revision 18c90a1b2b6c7339bdd192a2d2fac32f2b8a35df) @@ -8,7 +8,7 @@ from leahi_dialin import FP -from leahi_dialin.fp.modules.conductivity_sensors import FPConductivitySensorsEnum +from leahi_dialin.fp.modules.conductivity_sensors import FPConductivitySensorNames from leahi_dialin.fp.modules.flow_sensors import FPFlowSensorNames from leahi_dialin.fp.modules.pressure_sensors import FPPressureSensorNames from leahi_dialin.fp.modules.levels import FPFloaterLevels @@ -152,8 +152,8 @@ write_mutex.acquire() with open(log_path, "a") as f: # collect data and log it - cond = "{}, ".format(FPConductivitySensorsEnum.P9_COND.name) + '{}'.format(fp.conductivity.p9_cond) + \ - ", {}, ".format(FPConductivitySensorsEnum.P18_COND.name) + '{}'.format(fp.conductivity.p18_cond) + \ + cond = "{}, ".format(FPConductivitySensorNames.P9_COND.name) + '{}'.format(fp.conductivity.p9_cond) + \ + ", {}, ".format(FPConductivitySensorNames.P18_COND.name) + '{}'.format(fp.conductivity.p18_cond) + \ ", {}\n".format(fp.conductivity.fp_conductivity_timestamp) f.write(cond) Index: tests/depreciated_tests/hd_test_pumps_open_loop.py =================================================================== diff -u -r68422d08c4141999a13496343264483a32314d37 -r18c90a1b2b6c7339bdd192a2d2fac32f2b8a35df --- tests/depreciated_tests/hd_test_pumps_open_loop.py (.../hd_test_pumps_open_loop.py) (revision 68422d08c4141999a13496343264483a32314d37) +++ tests/depreciated_tests/hd_test_pumps_open_loop.py (.../hd_test_pumps_open_loop.py) (revision 18c90a1b2b6c7339bdd192a2d2fac32f2b8a35df) @@ -27,7 +27,6 @@ Sets the target flow rate for all HD pumps using \returns None """ - # Create an instance of the HD Class called hd hd = HD() sleep(1) Index: tests/depreciated_tests/test_flush.py =================================================================== diff -u -r68422d08c4141999a13496343264483a32314d37 -r18c90a1b2b6c7339bdd192a2d2fac32f2b8a35df --- tests/depreciated_tests/test_flush.py (.../test_flush.py) (revision 68422d08c4141999a13496343264483a32314d37) +++ tests/depreciated_tests/test_flush.py (.../test_flush.py) (revision 18c90a1b2b6c7339bdd192a2d2fac32f2b8a35df) @@ -31,7 +31,6 @@ dg.flush.flush_drain_line_volume_l, hd.alarms.alarm_top, dg.events.get_dg_events(1, 0), dg.events.get_dg_nth_event(2), dg.events.get_dg_events(2, 70))) """ - info = ('State, {}, Overall_elapsed_time, {}, State_elapsed_time, {}, Drain_vol, {:5.3f}, Top_alarm, {}, ' .format(dg.flush.flush_state, dg.flush.overall_elapsed_time, dg.flush.state_elapsed_time, dg.flush.flush_drain_line_volume_l, hd.alarms.alarm_top)) Index: tests/peter/test_gen_requirements.py =================================================================== diff -u -r2138d06d100fdcf23f2e9069f35ee2fdee62008f -r18c90a1b2b6c7339bdd192a2d2fac32f2b8a35df --- tests/peter/test_gen_requirements.py (.../test_gen_requirements.py) (revision 2138d06d100fdcf23f2e9069f35ee2fdee62008f) +++ tests/peter/test_gen_requirements.py (.../test_gen_requirements.py) (revision 18c90a1b2b6c7339bdd192a2d2fac32f2b8a35df) @@ -54,7 +54,6 @@ @param module: the module to generate command requirements for @return: """ - result = {} for attr in dir(module): Index: tests/peter/test_hd_records.py =================================================================== diff -u -r2138d06d100fdcf23f2e9069f35ee2fdee62008f -r18c90a1b2b6c7339bdd192a2d2fac32f2b8a35df --- tests/peter/test_hd_records.py (.../test_hd_records.py) (revision 2138d06d100fdcf23f2e9069f35ee2fdee62008f) +++ tests/peter/test_hd_records.py (.../test_hd_records.py) (revision 18c90a1b2b6c7339bdd192a2d2fac32f2b8a35df) @@ -55,7 +55,6 @@ with open("/home/fw/projects/leahi_dialin/tests/peter/hd_cal_record.log", 'w') as f: f.write(record_old_formatted) """ - hd.calibration_record.hd_calibration_record["accelerometer_sensor"]["accelerometer"]["y_offset"][1] = 2.0 hd.calibration_record.hd_calibration_record["accelerometer_sensor"]["accelerometer"]["cal_time"][1] = \ NVOpsUtils.get_current_time_in_epoch() Index: tools/build_common_defs.py =================================================================== diff -u -r2138d06d100fdcf23f2e9069f35ee2fdee62008f -r18c90a1b2b6c7339bdd192a2d2fac32f2b8a35df --- tools/build_common_defs.py (.../build_common_defs.py) (revision 2138d06d100fdcf23f2e9069f35ee2fdee62008f) +++ tools/build_common_defs.py (.../build_common_defs.py) (revision 18c90a1b2b6c7339bdd192a2d2fac32f2b8a35df) @@ -36,7 +36,6 @@ @param custom_defs: (dict) custom enums (if mapped to None they are ignored) @return: True upon success, False upon failure """ - if os.path.exists(in_path): enums = [] try: @@ -145,7 +144,6 @@ @param custom_defs: (dict) custom enums (if mapped to None they are ignored) @return: None """ - if subprocess.call("bash gen_common_defs.sh {0} {1} {2} {3} {4}" .format(dst_alarms_txt, dst_common, common_branch, prefix_match, cpp_header), shell=True) != 0: print("Failure: Could not generate alarm ids.")