|
|
|
|
@ -66,7 +66,7 @@ class Message():
|
|
|
|
|
if not isinstance(msg_type, MessageType):
|
|
|
|
|
raise TypeError("Argument message_type must be a MessageType")
|
|
|
|
|
self._msg_type = msg_type
|
|
|
|
|
self._msg_name = msg_name
|
|
|
|
|
self._msg_name = str(msg_name)
|
|
|
|
|
self._arguments = arguments
|
|
|
|
|
self._multipart_args = multipart_args
|
|
|
|
|
|
|
|
|
|
@ -250,7 +250,7 @@ class MessageHandler():
|
|
|
|
|
send_str = F"{self._tx_message.msg_type}{self._tx_message.msg_name}{argstr}\n"
|
|
|
|
|
self.port.write(send_str.encode('utf-8'))
|
|
|
|
|
self._tx_sent_time = time.time()
|
|
|
|
|
print(send_str)
|
|
|
|
|
#print(F"TX: {send_str}")
|
|
|
|
|
# Only keep the current message around if we need to track a response
|
|
|
|
|
if not self._tx_message.needs_response:
|
|
|
|
|
self._tx_message = None
|
|
|
|
|
@ -301,6 +301,7 @@ class MessageHandler():
|
|
|
|
|
Only called from the serial_comm thread
|
|
|
|
|
"""
|
|
|
|
|
|
|
|
|
|
#print(F"RX: {msg_str}")
|
|
|
|
|
self._last_rx_time = time.time()
|
|
|
|
|
|
|
|
|
|
msg_name, _, msg_args_text = msg_str.strip(' \t').partition(':')
|
|
|
|
|
@ -362,6 +363,8 @@ class MessageHandler():
|
|
|
|
|
and dispatches any necessary actions.
|
|
|
|
|
Clears self._rx_message after it's done.
|
|
|
|
|
"""
|
|
|
|
|
#print(F"Process rx_msg: {self._rx_message.msg_name}")
|
|
|
|
|
#print(F"tx message during processing is {self._tx_message.msg_name}")
|
|
|
|
|
|
|
|
|
|
if (self._tx_message is not None) and (self._tx_message.msg_name == self._rx_message.msg_name) and (self._rx_message.msg_type == MessageType.COMMENT):
|
|
|
|
|
# _tx_message only hangs around if it's waiting for response.
|
|
|
|
|
|