Skip to content
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

Jump to bottom

Correct plotting of mission in MAVExplorer #1459

Merged
merged 2 commits into from
Sep 28, 2024
Merged

Correct plotting of mission in MAVExplorer #1459

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6dac54e
MAVExplorer.py: CMD does not count as a line when determining colour …
peterbarker Sep 27, 2024
80ac5d7
mavflightview.py: plot CMD by default
peterbarker Sep 27, 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 MAVProxy/tools/MAVExplorer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -453,10 +453,10 @@ def cmd_map(args):
options._flightmodes = mestate.mlog._flightmodes
options.show_flightmode_legend = mestate.settings.show_flightmode
options.colour_source='flightmode'
options.nkf_sample = 1
if len(args) > 0:
options.types = ':'.join(args)
if len(options.types) > 1:
filtered_args = list(filter(lambda x : x != "CMD", options.types))
if len(filtered_args) > 1:
options.colour_source='type'
mfv_mav_ret = mavflightview.mavflightview_mav(mestate.mlog, options, mestate.flightmode_selections)
if mfv_mav_ret is None:
Expand Down
2 changes: 1 addition & 1 deletion MAVProxy/tools/mavflightview.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -337,7 +337,7 @@ def mavflightview_mav(mlog, options=None, flightmode_selections=[]):
type_list = options.types.split(',')
expressions.extend(pos_expressions(type_list))
else:
expressions.extend(pos_expressions(['POS', 'GLOBAL_POSITION_INT']))
expressions.extend(pos_expressions(['POS', 'GLOBAL_POSITION_INT', 'CMD']))
if options.rawgps or options.dualgps:
expressions.extend(pos_expressions(['GPS', 'GPS_RAW_INT']))
if options.rawgps2 or options.dualgps:
Expand Down