Index: leahi_dialin/ui/td_messaging.py =================================================================== diff -u -r0571a865492bb7439b1dda0d867239efff2c6dd4 -rd710522ba28b7ea7534904a42940c2c41f3558e4 --- leahi_dialin/ui/td_messaging.py (.../td_messaging.py) (revision 0571a865492bb7439b1dda0d867239efff2c6dd4) +++ leahi_dialin/ui/td_messaging.py (.../td_messaging.py) (revision d710522ba28b7ea7534904a42940c2c41f3558e4) @@ -875,25 +875,31 @@ def td_isolated_uf( self, duration : int , - set_volume : int , - volume_delivered : int , - rate : int ): + elapsedTime : int , + timeRemaining : int , + set_volume : float , + volume_delivered : float , + rate : float ): """ Broadcasts the current TD Isolated Ultrafiltration data (Msg ID: 0x9A, 154) Args: @param duration (int) : isolated UF duration (min) - @param set_volume (int) : isolated UF set volume (mL) - @param volume_delivered (int) : isolated UF volume delivered (mL) - @param rate (int) : isolated UF rate (mL/Hr) + @param elapsedTime (int) : isolated UF elapsed time (min) + @param timeRemaining (int) : isolated UF time remianing (min) + @param set_volume (float) : isolated UF set volume (mL) + @param volume_delivered (float) : isolated UF volume delivered (mL) + @param rate (float) : isolated UF rate (mL/Hr) @return: None """ if not self.can_enabled: raise ValueError("CAN Interface is not enabled") payload = conversions.unsigned_integer_to_bytearray(duration ) - payload += conversions.unsigned_integer_to_bytearray(set_volume ) - payload += conversions.unsigned_integer_to_bytearray(volume_delivered ) - payload += conversions.unsigned_integer_to_bytearray(rate ) + payload += conversions.unsigned_integer_to_bytearray(elapsedTime ) + payload += conversions.unsigned_integer_to_bytearray(timeRemaining ) + payload += conversions.float_to_bytearray (set_volume ) + payload += conversions.float_to_bytearray (volume_delivered ) + payload += conversions.float_to_bytearray (rate ) message = CAN.CanMessage.build_message( channel_id=CAN.CanChannels.td_sync_broadcast_ch_id, @@ -1681,6 +1687,25 @@ self.can_interface.send(message, 0) + def td_isolated_state_response(self, vAccepted: int, vRejectionReason: int): + """ + the isolated uf confirm response message (msg id: 0xA0, 160) + args: + @param vRejectionReason (int) : response rejection reason, + if rejection reason is 0, then accepted (0) will be sent, + otherwise rejected (1) + @return: none + """ + payload = conversions.integer_to_bytearray(vAccepted ) + payload += conversions.integer_to_bytearray(vRejectionReason ) + + message = CAN.CanMessage.build_message( + channel_id=CAN.CanChannels.td_to_ui_ch_id, + message_id=msg_ids.MsgIds.MSG_ID_TD_ISO_UF_STATE_RESPONSE.value, + payload=payload) + self.can_interface.send(message, 0) + + def td_blood_set_auto_load_response(self,vRejectionReason: int): """ the blood set auto eject response message method(Msg ID: 0xXX, XXX)