Skip to content

Commit c43a90a

Browse files
committed
MAVExplorer.py: add ability to reassemble chunked MSG messages
1 parent cdd2f0b commit c43a90a

File tree

1 file changed

+13
-6
lines changed

1 file changed

+13
-6
lines changed

MAVProxy/tools/MAVExplorer.py

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1097,18 +1097,25 @@ def get_error_code(subsys, ecode):
10971097
mstr = m.text
10981098

10991099
# special handling for statustext:
1100-
if hasattr(m, 'id') and hasattr(m, 'chunk_seq') and m.chunk_seq != 0: # assume STATUSTEXT
1101-
if m.id != statustext_current_id:
1100+
chunking_id = getattr(m, "id", getattr(m, "ID", None))
1101+
chunking_seq = getattr(m, "chunk_seq", getattr(m, "Seq", None))
1102+
1103+
if chunking_id is not None and chunking_seq is not None and chunking_id != 0:
1104+
if chunking_id != statustext_current_id:
11021105
if statustext_accumulation is not None:
11031106
print_if_match(statustext_timestring, statustext_accumulation)
11041107
statustext_accumulation = ""
1105-
statustext_current_id = m.id
1108+
statustext_current_id = chunking_id
11061109
statustext_next_seq = 0
11071110
statustext_timestring = timestring(m)
1108-
if m.chunk_seq != statustext_next_seq:
1111+
if chunking_seq != statustext_next_seq:
11091112
statustext_accumulation += "..."
1110-
statustext_next_seq = m.chunk_seq + 1
1111-
statustext_accumulation += m.text
1113+
statustext_next_seq = chunking_seq + 1
1114+
t_str = getattr(m, "text", None)
1115+
if t_str is None:
1116+
t_str = getattr(m, 'Message')
1117+
statustext_accumulation += t_str
1118+
11121119
continue
11131120

11141121
print_if_match(timestring(m), mstr)

0 commit comments

Comments
 (0)