Index: leahi_dialin/ui/td_messaging.py =================================================================== diff -u -r2f16a7a2c39725a71bb1b5bbe4c7bd410ac2ba89 -r4754eaa7ddc8a2e69ecc76bedd1330e3778b5190 --- leahi_dialin/ui/td_messaging.py (.../td_messaging.py) (revision 2f16a7a2c39725a71bb1b5bbe4c7bd410ac2ba89) +++ leahi_dialin/ui/td_messaging.py (.../td_messaging.py) (revision 4754eaa7ddc8a2e69ecc76bedd1330e3778b5190) @@ -648,20 +648,25 @@ self.can_interface.send(message, 0) - def td_rinseback_progress(self, targetVolume: float, deliveredVolume: float, flowRate: int, timeout: int, - countdown: int, isCompleted: int): + def td_rinseback_progress(self, vTargetVolume: float, vDeliveredVolume: float, vFlowRate: int, vTimeout: int, + vCountdown: int, vIsCompleted: int): """ - rinseback progress message method(Msg ID: 0x56, 86) + rinseback progress message (Msg ID: 0x8F, 143) Args: - None + @param vTargetVolume : (float) target volume (mL) + @param vDeliveredVolume : (float) delivered volume (mL) + @param vFlowRate : (int) flow rate (mL/min) + @param vTimeout : (int) timeout (s) + @param vCountdown : (int) countdown time (s) + @param vIsCompleted : (int) completed flag @return: None """ - payload = conversions.float_to_bytearray (targetVolume ) - payload += conversions.float_to_bytearray (deliveredVolume ) - payload += conversions.unsigned_integer_to_bytearray (flowRate ) - payload += conversions.unsigned_integer_to_bytearray (timeout ) - payload += conversions.unsigned_integer_to_bytearray (countdown ) - payload += conversions.integer_to_bytearray (isCompleted ) + payload = conversions.float_to_bytearray (vTargetVolume ) + payload += conversions.float_to_bytearray (vDeliveredVolume ) + payload += conversions.unsigned_integer_to_bytearray (vFlowRate ) + payload += conversions.unsigned_integer_to_bytearray (vTimeout ) + payload += conversions.unsigned_integer_to_bytearray (vCountdown ) + payload += conversions.integer_to_bytearray (vIsCompleted ) message = CAN.DenaliMessage.build_message( channel_id=CAN.DenaliChannels.td_to_ui_ch_id, @@ -670,6 +675,23 @@ self.can_interface.send(message, 0) + def td_rinseback_cmd_response(self, vRejectionReason: int): + """ + rinseback command response message (Msg ID: 0x91, 145) + Args: + @param vRejectionReason : (int) rejection reason + @return: None + """ + payload = conversions.integer_to_bytearray(1 if vRejectionReason == 0 else 0) + payload += conversions.integer_to_bytearray(vRejectionReason) + + message = CAN.DenaliMessage.build_message( + channel_id=CAN.DenaliChannels.td_to_ui_ch_id, + message_id=msg_ids.MsgIds.MSG_ID_TD_RINSEBACK_CMD_RESPONSE.value, + payload=payload) + self.can_interface.send(message, 0) + + def td_vitals_adjustment_response(self,vRejectionReason: int): """ the vitals adjustment response message method(Msg ID: 0x64, 100)