Index: leahi_dialin/ui/fp_messaging.py =================================================================== diff -u -r6c90336ac2cd8cf34ac620cff431a847d9ddf557 -rd8acf30b89a5a688ebbd832b601d07c5f8f8750e --- leahi_dialin/ui/fp_messaging.py (.../fp_messaging.py) (revision 6c90336ac2cd8cf34ac620cff431a847d9ddf557) +++ leahi_dialin/ui/fp_messaging.py (.../fp_messaging.py) (revision d8acf30b89a5a688ebbd832b601d07c5f8f8750e) @@ -323,7 +323,7 @@ payload += conversions.unsigned_integer_to_bytearray(genPermeateState ) message = CAN.DenaliMessage.build_message( - channel_id=CAN.DenaliChannels.fp_sync_broadcast_ch_id, + channel_id=CAN.CanChannels.fp_sync_broadcast_ch_id, message_id=msg_ids.MsgIds.MSG_ID_FP_RO_REJECTION_RATIO_DATA.value, payload=payload) Index: leahi_dialin/ui/td_messaging.py =================================================================== diff -u -r685c057e3f5b9dc9370b0571b37aba7f231ed415 -rd8acf30b89a5a688ebbd832b601d07c5f8f8750e --- leahi_dialin/ui/td_messaging.py (.../td_messaging.py) (revision 685c057e3f5b9dc9370b0571b37aba7f231ed415) +++ leahi_dialin/ui/td_messaging.py (.../td_messaging.py) (revision d8acf30b89a5a688ebbd832b601d07c5f8f8750e) @@ -580,8 +580,8 @@ payload = conversions.unsigned_integer_to_bytearray (valve ) payload += conversions.unsigned_integer_to_bytearray (timeout ) - message = CAN.DenaliMessage.build_message( - channel_id=CAN.DenaliChannels.td_sync_broadcast_ch_id, + message = CAN.CanMessage.build_message( + channel_id=CAN.CanChannels.td_sync_broadcast_ch_id, message_id=msg_ids.MsgIds.MSG_ID_TD_WATER_SAMPLE_DATA.value, payload=payload) self.can_interface.send(message, 0) @@ -600,8 +600,8 @@ payload += conversions.integer_to_bytearray (vRejectionReason) payload += conversions.float_to_bytearray (vValue ) - message = CAN.DenaliMessage.build_message( - channel_id=CAN.DenaliChannels.td_to_ui_ch_id, + message = CAN.CanMessage.build_message( + channel_id=CAN.CanChannels.td_to_ui_ch_id, message_id=msg_ids.MsgIds.MSG_ID_TD_WATER_SAMPLE_RESULT_RESPONSE.value, payload=payload) self.can_interface.send(message, 0) @@ -1489,7 +1489,26 @@ self.can_interface.send(message, 0) + def td_confirm(self, vID : int , + vCommand: int , + vReason : int ): + """ + rinseback command response message (Msg ID: 0x91, 145) + Args: + @param vRejectionReason : (int) rejection reason + @return: None + """ + payload = conversions.integer_to_bytearray(vID ) + payload += conversions.integer_to_bytearray(vCommand ) + payload += conversions.integer_to_bytearray(vReason ) + message = CAN.CanMessage.build_message( + channel_id=CAN.CanChannels.td_to_ui_ch_id, + message_id=msg_ids.MsgIds.MSG_ID_TD_UI_CONFIRMATION_REQUEST.value, + payload=payload) + self.can_interface.send(message, 0) + + def td_isolated_uf_duration_change_response(self, vRejectionReason: int, vVolumeMax: int): """ the isolated uf duration change response message (msg id: 0x9C, 156) @@ -1605,8 +1624,8 @@ payload += conversions.integer_to_bytearray(vVenousAsymmetricRejectReason ) payload += conversions.integer_to_bytearray(vTmpWindowRejectReason ) - message = CAN.DenaliMessage.build_message( - channel_id=CAN.DenaliChannels.td_to_ui_ch_id, + message = CAN.CanMessage.build_message( + channel_id=CAN.CanChannels.td_to_ui_ch_id, message_id=msg_ids.MsgIds.MSG_ID_TD_PRESSURE_LIMITS_CHANGE_RESPONSE.value, payload=payload) self.can_interface.send(message, 0) @@ -1641,8 +1660,8 @@ payload += conversions.integer_to_bytearray(vSodiumRejectReason ) payload += conversions.integer_to_bytearray(vBicarbonateRejectReason ) - message = CAN.DenaliMessage.build_message( - channel_id=CAN.DenaliChannels.td_to_ui_ch_id, + message = CAN.CanMessage.build_message( + channel_id=CAN.CanChannels.td_to_ui_ch_id, message_id=msg_ids.MsgIds.MSG_ID_TD_TREATMENT_SET_POINTS_CHANGE_RESPONSE.value, payload=payload) self.can_interface.send(message, 0) @@ -1658,8 +1677,8 @@ payload = conversions.integer_to_bytearray(vAccepted) payload += conversions.integer_to_bytearray(vRejectionReason) - message = CAN.DenaliMessage.build_message( - channel_id=CAN.DenaliChannels.td_to_ui_ch_id, + message = CAN.CanMessage.build_message( + channel_id=CAN.CanChannels.td_to_ui_ch_id, message_id=msg_ids.MsgIds.MSG_ID_TD_ADJUST_PATIENT_DISCONNECT_CONFIRM_RESPONSE.value, payload=payload) self.can_interface.send(message, 0) @@ -1821,8 +1840,8 @@ payload += conversions.float_to_bytearray( vIsoUfRateTarget ) payload += conversions.float_to_bytearray( vWaterSampleTestResult ) - message = CAN.DenaliMessage.build_message( - channel_id=CAN.DenaliChannels.td_to_ui_ch_id, + message = CAN.CanMessage.build_message( + channel_id=CAN.CanChannels.td_to_ui_ch_id, message_id=msg_ids.MsgIds.MSG_ID_TD_ADJUST_TREATMENT_LOGS_RESPONSE.value, payload=payload) self.can_interface.send(message, 0)