Skip to content

Fix condition data discarding when --meta is set #908

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
peterbarker merged 2 commits into from
Jan 22, 2024
+2 −2
Merged

Fix condition data discarding when --meta is set #908

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e5eaa31
Fix condition data discarding when --meta is set
amilcarlucas Jan 22, 2024
b5a59e9
Merge branch 'master' into pr_fix_meta
amilcarlucas Jan 22, 2024
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
4 changes: 2 additions & 2 deletions tools/mavlogdump.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ def reduce_rate_msg(m, reduction_rate):
'''return True if this msg should be discarded by reduction'''
global last_msg_rate_t
mtype = m.get_type()
if mtype in ['PARM','MSG','FMT','FMTU','MULT','MODE','EVT']:
if mtype in ['PARM','MSG','FMT','FMTU','MULT','MODE','EVT','UNIT']:
return False
t = getattr(m,'_timestamp',None)
if t is None:
Expand Down Expand Up @@ -258,7 +258,7 @@ def match_type(mtype, patterns):
continue

if not mavutil.evaluate_condition(args.condition, mlog.messages) and (
not (m_type in ['FMT', 'FMTU', 'MULT','PARM','MODE'] and args.meta)):
not (m_type in ['FMT', 'FMTU', 'MULT', 'PARM', 'MODE', 'UNIT'] and args.meta)):
continue
if args.source_system is not None and args.source_system != m.get_srcSystem():
continue
Expand Down