Index: leahi_dialin/common/msg_ids.py =================================================================== diff -u -r39755dffc6faeacd116ffb695f1ae3699126f38c -rf5f9c52dd36e75873587352cd3d0701523bb47e9 --- leahi_dialin/common/msg_ids.py (.../msg_ids.py) (revision 39755dffc6faeacd116ffb695f1ae3699126f38c) +++ leahi_dialin/common/msg_ids.py (.../msg_ids.py) (revision f5f9c52dd36e75873587352cd3d0701523bb47e9) @@ -362,7 +362,11 @@ MSG_ID_TD_SYRINGE_PUMP_FORCE_SENSOR_CALIBRATION_REQUEST = 0x8060 MSG_ID_TD_GET_ALARM_PROPERTIES_REQUEST = 0x8061 MSG_ID_TD_ALARM_PROPERTIES_RESPONSE = 0x8062 + MSG_ID_BATTERY_REGISTERS_OVERRIDE_REQUEST = 0x8063 + MSG_ID_TD_BATTERY_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0x8064 + MSG_ID_TD_BATTERY_I2C_STATUS_OVERRIDE_REQUEST = 0x8068 + MSG_ID_TD_TRAINING_TEST_OVERRIDE_REQUEST = 0x8999 MSG_ID_DD_TESTER_LOGIN_REQUEST = 0xA000 Index: leahi_dialin/ui/td_messaging.py =================================================================== diff -u -r39755dffc6faeacd116ffb695f1ae3699126f38c -rf5f9c52dd36e75873587352cd3d0701523bb47e9 --- leahi_dialin/ui/td_messaging.py (.../td_messaging.py) (revision 39755dffc6faeacd116ffb695f1ae3699126f38c) +++ leahi_dialin/ui/td_messaging.py (.../td_messaging.py) (revision f5f9c52dd36e75873587352cd3d0701523bb47e9) @@ -749,17 +749,14 @@ self.can_interface.send(message, 0) - def td_recirculate_progress(self, vTimeout: int, - vCountdown: int): + def td_recirculate_progress(self, vCountdown: int): """ rinseback progress message (Msg ID: 0x8F, 143) Args: - @param vTimeout : (int) Total Timeout of Recirculate delivery @param vCountdown : (int) Current Timeout count down of Recirculate delivery @return: None """ - payload = conversions.unsigned_integer_to_bytearray (vTimeout ) - payload += conversions.unsigned_integer_to_bytearray (vCountdown ) + payload = conversions.unsigned_integer_to_bytearray (vCountdown ) message = CAN.CanMessage.build_message( channel_id=CAN.CanChannels.td_to_ui_ch_id, @@ -1458,7 +1455,7 @@ def td_rinseback_progress(self, vTargetVolume: float, vDeliveredVolume: float, vFlowRate: int, vTimeout: int, - vCountdown: int, vIsCompleted: int): + vCountdown: int, vIsCompleted: int, vIsAllowed: int): """ rinseback progress message (Msg ID: 0x8F, 143) Args: @@ -1476,6 +1473,7 @@ payload += conversions.unsigned_integer_to_bytearray (vTimeout ) payload += conversions.unsigned_integer_to_bytearray (vCountdown ) payload += conversions.integer_to_bytearray (vIsCompleted ) + payload += conversions.integer_to_bytearray (vIsAllowed ) message = CAN.CanMessage.build_message( channel_id=CAN.CanChannels.td_to_ui_ch_id,