Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 13 additions & 6 deletions MAVProxy/tools/MAVExplorer.py
Original file line number Diff line number Diff line change
Expand Up @@ -1097,18 +1097,25 @@ def get_error_code(subsys, ecode):
mstr = m.text

# special handling for statustext:
if hasattr(m, 'id') and hasattr(m, 'chunk_seq') and m.chunk_seq != 0: # assume STATUSTEXT
if m.id != statustext_current_id:
chunking_id = getattr(m, "id", getattr(m, "ID", None))
chunking_seq = getattr(m, "chunk_seq", getattr(m, "Seq", None))

if chunking_id is not None and chunking_seq is not None and chunking_id != 0:
if chunking_id != statustext_current_id:
if statustext_accumulation is not None:
print_if_match(statustext_timestring, statustext_accumulation)
statustext_accumulation = ""
statustext_current_id = m.id
statustext_current_id = chunking_id
statustext_next_seq = 0
statustext_timestring = timestring(m)
if m.chunk_seq != statustext_next_seq:
if chunking_seq != statustext_next_seq:
statustext_accumulation += "..."
statustext_next_seq = m.chunk_seq + 1
statustext_accumulation += m.text
statustext_next_seq = chunking_seq + 1
t_str = getattr(m, "text", None)
if t_str is None:
t_str = getattr(m, 'Message')
statustext_accumulation += t_str

continue

print_if_match(timestring(m), mstr)
Expand Down