Index: leahi_dialin/ui/td_messaging.py =================================================================== diff -u -r1694ea3d36a661eac4fb97a751da18754c844121 -rbd23fb920d859e4a3a4db9bd8e9ef6fd3d9e8223 --- leahi_dialin/ui/td_messaging.py (.../td_messaging.py) (revision 1694ea3d36a661eac4fb97a751da18754c844121) +++ leahi_dialin/ui/td_messaging.py (.../td_messaging.py) (revision bd23fb920d859e4a3a4db9bd8e9ef6fd3d9e8223) @@ -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,