Index: leahi_dialin/common/msg_ids.py =================================================================== diff -u -rd52fc4035c9768b0fab30d5454c19cd564e4bed8 -ree6a964026f5167389daf212aa57e753f5d95ab9 --- leahi_dialin/common/msg_ids.py (.../msg_ids.py) (revision d52fc4035c9768b0fab30d5454c19cd564e4bed8) +++ leahi_dialin/common/msg_ids.py (.../msg_ids.py) (revision ee6a964026f5167389daf212aa57e753f5d95ab9) @@ -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 -ree6a964026f5167389daf212aa57e753f5d95ab9 --- leahi_dialin/ui/td_messaging.py (.../td_messaging.py) (revision a6700586035c4818e70f8f3d0de9a708099b4cb7) +++ leahi_dialin/ui/td_messaging.py (.../td_messaging.py) (revision ee6a964026f5167389daf212aa57e753f5d95ab9) @@ -477,26 +477,26 @@ def td_saline( self, target_volume : int , - cumulative_volume : float , bolus_volume : float , - state : int ): + cumulative_volume : float , + bolusPermitted : int ): """ Broadcasts the current TD Saline data (Msg ID: 0x3D, 61) Args: @param target_volume (int ) : Saline target volume @param cumulative_volume (float) : Saline cumulative volume @param bolus_volume (float) : Saline bolus set volume - @param state (int ) : Saline bolus state + @param bolusPermitted (int ) : Saline bolus permitted state @return: None """ if not self.can_enabled: raise ValueError("CAN Interface is not enabled") payload = conversions.unsigned_integer_to_bytearray(target_volume ) - payload += conversions.float_to_bytearray (cumulative_volume ) payload += conversions.float_to_bytearray (bolus_volume ) - payload += conversions.unsigned_integer_to_bytearray(state ) + payload += conversions.float_to_bytearray (cumulative_volume ) + payload += conversions.unsigned_integer_to_bytearray(bolusPermitted ) message = CAN.DenaliMessage.build_message( channel_id=CAN.DenaliChannels.td_sync_broadcast_ch_id,