Index: leahi_dialin/ui/td_messaging.py =================================================================== diff -u -r90a3a129210dafc100b78cd3dbfabdd73190f0d6 -r14369e7587dfe8de1cc117d021bdbd5af0386bd1 --- leahi_dialin/ui/td_messaging.py (.../td_messaging.py) (revision 90a3a129210dafc100b78cd3dbfabdd73190f0d6) +++ leahi_dialin/ui/td_messaging.py (.../td_messaging.py) (revision 14369e7587dfe8de1cc117d021bdbd5af0386bd1) @@ -72,13 +72,14 @@ self.can_interface.send(message, 0) - def td_blood_pump(self, set_flow: int, meas_flow: float, rot_speed: float, mot_speed: float, set_rpm: float, rot_count: int, pres_flow: int, rot_hall_state: int = 0): + def td_blood_pump(self, set_flow: int, meas_flow: float, rot_speed: float, mot_speed: float, curr_motor: float, set_rpm: float, rot_count: int, pres_flow: int, rot_hall_state: int = 0): """ Broadcasts the current TD Blood Pump Data @param set_flow : set flow rate @param meas_flow : meaured speed @param rot_speed : measured rotor speed @param mot_speed : measured blood pump speed + @param curr_motor : current motor @param set_rpm : set rpm @param pres_flow : pres_flow @param rot_count : rotation count @@ -94,6 +95,7 @@ payload += conversions.float_to_bytearray (meas_flow ) payload += conversions.float_to_bytearray (rot_speed ) payload += conversions.float_to_bytearray (mot_speed ) + payload += conversions.float_to_bytearray (curr_motor ) payload += conversions.float_to_bytearray (set_rpm ) payload += conversions.unsigned_integer_to_bytearray(rot_count ) payload += conversions.unsigned_integer_to_bytearray(pres_flow ) @@ -214,11 +216,11 @@ raise ValueError("CAN Interface is not enabled") - payload = conversions.integer_to_bytearray(valve_id ) - payload += conversions.integer_to_bytearray(state ) - payload += conversions.integer_to_bytearray(pos_name ) - payload += conversions.integer_to_bytearray(pos_count ) - payload += conversions.integer_to_bytearray(next_pos ) + payload = conversions.unsigned_integer_to_bytearray(valve_id ) + payload += conversions.unsigned_integer_to_bytearray(state ) + payload += conversions.unsigned_integer_to_bytearray(pos_name ) + payload += conversions.short_to_bytearray (pos_count ) + payload += conversions.short_to_bytearray (next_pos ) message = CAN.DenaliMessage.build_message( channel_id=CAN.DenaliChannels.td_sync_broadcast_ch_id, @@ -319,7 +321,7 @@ message = CAN.DenaliMessage.build_message( channel_id=CAN.DenaliChannels.td_to_ui_ch_id, - message_id=0x95, + message_id=0x99, payload=payload) self.can_interface.send(message, 0) \ No newline at end of file