Index: leahi_dialin/common/msg_ids.py =================================================================== diff -u -rd52fc4035c9768b0fab30d5454c19cd564e4bed8 -r1f1d2b6f4a848b28d21ed82d70575847ce24aedd --- leahi_dialin/common/msg_ids.py (.../msg_ids.py) (revision d52fc4035c9768b0fab30d5454c19cd564e4bed8) +++ leahi_dialin/common/msg_ids.py (.../msg_ids.py) (revision 1f1d2b6f4a848b28d21ed82d70575847ce24aedd) @@ -105,7 +105,8 @@ MSG_ID_DD_SERIAL_RESPONSE = 0x52 MSG_ID_TD_TEMPERATURE_DATA = 0x53 MSG_ID_TD_BATTERY_DATA = 0x54 - MSG_ID_FP_PERMEATE_FLUSH_DATA = 0x56 + MSG_ID_UI_ADJUST_PATIENT_DISCONNECT_CONFIRM_REQUEST = 0x55 + MSG_ID_TD_ADJUST_PATIENT_DISCONNECT_CONFIRM_RESPONSE = 0x56 MSG_ID_FP_CONCENTRATE_FLUSH_DATA = 0x57 MSG_ID_FP_GENP_DEF_DATA = 0x58 MSG_ID_FP_PRE_GEN_DEF_DATA = 0x59 @@ -187,10 +188,11 @@ MSG_ID_UI_RECIRCULATE_REQUEST = 0xA6 MSG_ID_TD_RECIRCULATE_RESPONSE = 0xA7 MSG_ID_TD_RECIRCULATE_DATA = 0xA8 - MSG_ID_TD_SYRINGE_PUMP_DATA = 0xA9 - + MSG_ID_UI_ADJUST_TREATMENT_LOGS_REQUEST = 0xA9 + MSG_ID_TD_ADJUST_TREATMENT_LOGS_RESPONSE = 0xAA MSG_ID_TD_WATER_SAMPLE_RESULT_RESPONSE = 0xAB MSG_ID_TD_WATER_SAMPLE_DATA = 0xAC + MSG_ID_TD_TREATMENT_LOG_AVERAGE_DATA = 0xAD MSG_ID_DD_PISTON_PUMP_CONTROL_DATA = 0xF0 Index: leahi_dialin/ui/td_messaging.py =================================================================== diff -u -ra6700586035c4818e70f8f3d0de9a708099b4cb7 -r1f1d2b6f4a848b28d21ed82d70575847ce24aedd --- leahi_dialin/ui/td_messaging.py (.../td_messaging.py) (revision a6700586035c4818e70f8f3d0de9a708099b4cb7) +++ leahi_dialin/ui/td_messaging.py (.../td_messaging.py) (revision 1f1d2b6f4a848b28d21ed82d70575847ce24aedd) @@ -1986,6 +1986,41 @@ self.can_interface.send(message, 0) + def td_treatment_log_average_data(self, + blood_flow_rate : float, + dialysate_flow_rate : float, + uf_flow_rate : float, + arterialPressure : float, + venousPressure : float, + tmpPressure : float, + dialysate_temp : float) -> None: + """ + send the treatment log data + @param blood_flow_rate : (F32) blood flow rate + @param dialysate_flow_rate : (F32) dialysate flow rate + @param uf_flow_rate : (F32) uf flow rate + @param arterialPressure : (F32) arterial Pressure + @param venousPressure : (F32) venous Pressure + @param tmpPressure : (F32) tmp Pressure + @param dialysate_temp : (F32) dialysate temp + @return: none + """ + payload = conversions.float_to_bytearray(blood_flow_rate ) + payload += conversions.float_to_bytearray(dialysate_flow_rate ) + payload += conversions.float_to_bytearray(uf_flow_rate ) + payload += conversions.float_to_bytearray(arterialPressure ) + payload += conversions.float_to_bytearray(venousPressure ) + payload += conversions.float_to_bytearray(tmpPressure ) + payload += conversions.float_to_bytearray(dialysate_temp ) + + message = CAN.DenaliMessage.build_message( + channel_id=CAN.DenaliChannels.td_to_ui_ch_id, + message_id=msg_ids.MsgIds.MSG_ID_TD_TREATMENT_LOG_AVERAGE_DATA.value, + payload=payload) + + self.can_interface.send(message, 0) + + def cmd_send_general_response(self, message_id: int, accepted: int, reason: int, is_pure_data: bool = False, has_parameters: bool = False,