Index: leahi_dialin/ui/td_messaging.py =================================================================== diff -u -rb40b6d73d23cb6c3520ad06b98c1198ef70fd24e -r71ac3afa8dddb9ce74c9de0a508e76467f1dcc3a --- leahi_dialin/ui/td_messaging.py (.../td_messaging.py) (revision b40b6d73d23cb6c3520ad06b98c1198ef70fd24e) +++ leahi_dialin/ui/td_messaging.py (.../td_messaging.py) (revision 71ac3afa8dddb9ce74c9de0a508e76467f1dcc3a) @@ -430,14 +430,14 @@ self.can_interface.send(message, 0) def td_treatment_time( self, - tx_duration_s : float , - tx_elapsed_s : float , - tx_remaining_s : float ): + tx_duration_s : int , + tx_elapsed_s : int , + tx_remaining_s : int ): """ Broadcasts the current TD vpressures data - @param tx_duration_s (float) : Treatment set duration (s) - @param tx_elapsed_s (float) : Treatment elaspsed time (s) - @param tx_remaining_s (float) : Treatment time remaining (s) + @param tx_duration_s (int) : Treatment set duration (s) + @param tx_elapsed_s (int) : Treatment elaspsed time (s) + @param tx_remaining_s (int) : Treatment time remaining (s) @return: None """ @@ -446,8 +446,8 @@ payload = conversions.unsigned_integer_to_bytearray(tx_duration_s ) - payload += conversions.float_to_bytearray (tx_elapsed_s ) - payload += conversions.float_to_bytearray (tx_remaining_s ) + payload += conversions.unsigned_integer_to_bytearray(tx_elapsed_s ) + payload += conversions.unsigned_integer_to_bytearray(tx_remaining_s ) message = CAN.DenaliMessage.build_message( channel_id=CAN.DenaliChannels.td_sync_broadcast_ch_id, @@ -472,13 +472,13 @@ raise ValueError("CAN Interface is not enabled") - payload = conversions.float_to_bytearray (blood_flow ) - payload += conversions.float_to_bytearray (dialysate_flow ) + payload = conversions.unsigned_integer_to_bytearray(blood_flow ) + payload += conversions.unsigned_integer_to_bytearray(dialysate_flow ) payload += conversions.float_to_bytearray (dialysate_temp ) message = CAN.DenaliMessage.build_message( channel_id=CAN.DenaliChannels.td_sync_broadcast_ch_id, - message_id=msg_ids.MsgIds.MSG_ID_TD_ULTRAFILTRATION_DATA.value, + message_id=msg_ids.MsgIds.MSG_ID_TD_TREATMENT_SET_POINTS_DATA.value, payload=payload) self.can_interface.send(message, 0)