Index: dialin/ui/hd_simulator.py =================================================================== diff -u -r0e3af06905af539b1a86ba8407189dfd5153ad33 -rbe49f73b02ba10623fe07bfc8b6b310d37cac80b --- dialin/ui/hd_simulator.py (.../hd_simulator.py) (revision 0e3af06905af539b1a86ba8407189dfd5153ad33) +++ dialin/ui/hd_simulator.py (.../hd_simulator.py) (revision be49f73b02ba10623fe07bfc8b6b310d37cac80b) @@ -2087,19 +2087,17 @@ self.can_interface.send(message, 0) - def cmd_send_treatment_log_data(self, timestamp: int, bloodFlowRate: int, dialysateFlowRate: int, ufRate: float, arterialPressure: float, venousPressure: float) -> None: + def cmd_send_treatment_log_data(self, bloodFlowRate: int, dialysateFlowRate: int, ufRate: float, arterialPressure: float, venousPressure: float) -> None: """ send the treatment log data - :param timestamp: (U32) timestamp :param bloodFlowRate: (U32) blood flow rate :param dialysateFlowRate: (U32) Dialysate Flow Rate :param ufRate: (F32) UF Rate :param arterialPressure: (F32) Arterial Pressure :param venousPressure: (F32) Venous Pressure :return: None """ - payload = integer_to_bytearray(timestamp) - payload += integer_to_bytearray(bloodFlowRate) + payload = integer_to_bytearray(bloodFlowRate) payload += integer_to_bytearray(dialysateFlowRate) payload += float_to_bytearray(ufRate) payload += float_to_bytearray(arterialPressure) @@ -2111,17 +2109,15 @@ self.can_interface.send(message, 0) - def cmd_send_treatment_log_alarm(self, timestamp: int, alarmID: int, parameter1: float, parameter2: float) -> None: + def cmd_send_treatment_log_alarm(self, alarmID: int, parameter1: float, parameter2: float) -> None: """ send the treatment log data - :param timestamp: (U32) timestamp :param alarmID: (U32) alarm ID :param parameter1: (F32) paramter 1 (it's not clear yet how many paramters with what type is required and this is only plceholder) :param parameter2: (F32) paramter 2 (it's not clear yet how many paramters with what type is required and this is only plceholder) :return: None """ - payload = integer_to_bytearray(timestamp) - payload += integer_to_bytearray(alarmID) + payload = integer_to_bytearray(alarmID) payload += integer_to_bytearray(parameter1) payload += integer_to_bytearray(parameter2) @@ -2131,17 +2127,15 @@ self.can_interface.send(message, 0) - def cmd_send_treatment_log_event(self, timestamp: int, eventID: int, oldValue: float, newValue: float) -> None: + def cmd_send_treatment_log_event(self, eventID: int, oldValue: float, newValue: float) -> None: """ send the treatment log data - :param timestamp: (U32) timestamp :param alarmID: (U32) alarm ID :param oldValue: (F32) the old value :param newValue: (F32) the new value :return: none """ - payload = integer_to_bytearray(timestamp) - payload += integer_to_bytearray(eventID) + payload = integer_to_bytearray(eventID) payload += float_to_bytearray(oldValue) payload += float_to_bytearray(newValue)