Index: leahi_dialin/ui/td_messaging.py =================================================================== diff -u -r64744c14a4ab6b2b665cff84edf70b1be861b2ef -r90a3a129210dafc100b78cd3dbfabdd73190f0d6 --- leahi_dialin/ui/td_messaging.py (.../td_messaging.py) (revision 64744c14a4ab6b2b665cff84edf70b1be861b2ef) +++ leahi_dialin/ui/td_messaging.py (.../td_messaging.py) (revision 90a3a129210dafc100b78cd3dbfabdd73190f0d6) @@ -136,34 +136,31 @@ self.can_interface.send(message, 0) - def td_ejector(self, position: int, steps_per_min: int = 0): + def td_ejector(self, state: int, set_speed: float = 0): """ Broadcasts the current TD operation mode - @param position : ejector position - @param steps_per_min : ejector steps per min + @param state : ejector state + @param set_speed : ejector set speed @return: None """ - # TODO: replace with proper payload and message ID once message is defined if not self.can_enabled: raise ValueError("CAN Interface is not enabled") - payload = conversions.integer_to_bytearray(position ) - payload += conversions.integer_to_bytearray(steps_per_min) + payload = conversions.integer_to_bytearray(state ) + payload += conversions.float_to_bytearray (set_speed) message = CAN.DenaliMessage.build_message( channel_id=CAN.DenaliChannels.td_sync_broadcast_ch_id, - message_id=0x92, + message_id=0x4E, # TODO replace with Dialin enum payload=payload) self.can_interface.send(message, 0) - def td_switches(self, door: int, rot_1: int = 0, rot_2: int = 0): + def td_switches(self, door: int): """ Broadcasts the current TD switch Data @param door : door status - @param rot_1 : rot_1 status - @param rot_2 : rot_2 status @return: None """ # TODO: replace with proper payload and message ID once message is defined @@ -172,12 +169,10 @@ payload = conversions.integer_to_bytearray(door ) - payload += conversions.integer_to_bytearray(rot_1) - payload += conversions.integer_to_bytearray(rot_2) message = CAN.DenaliMessage.build_message( channel_id=CAN.DenaliChannels.td_sync_broadcast_ch_id, - message_id=0x93, + message_id=0x21, # TODO replace with Dialin enum payload=payload) self.can_interface.send(message, 0) @@ -204,20 +199,26 @@ self.can_interface.send(message, 0) - def td_valves(self, arterial: int, venous: int = 0): + def td_valves(self, valve_id: int, state: int, pos_name: int, pos_count: int, next_pos: int): """ Broadcasts the current TD Battery Data - @param arterial : arterial valve - @param venous : venous valve + @param valve_id : Valve ID + @param state : Valve State + @param pos_name : Position Name + @param pos_count : Position Count + @param next_pos : Next Position @return: None """ if not self.can_enabled: raise ValueError("CAN Interface is not enabled") - payload = conversions.integer_to_bytearray(arterial) - payload += conversions.integer_to_bytearray(venous ) + 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 ) message = CAN.DenaliMessage.build_message( channel_id=CAN.DenaliChannels.td_sync_broadcast_ch_id,