From 1d0f6cf0a62a86f9083b634aec30017ba5d5c7aa Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Tue, 27 Feb 2024 13:58:33 +1100 Subject: [PATCH 1/2] MAVExplorer: allow VEH msg to behave like GPS so "map VEH" works with dual-vehicle logs --- MAVProxy/tools/mavflightview.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/MAVProxy/tools/mavflightview.py b/MAVProxy/tools/mavflightview.py index f92f42d822..b49bd57893 100755 --- a/MAVProxy/tools/mavflightview.py +++ b/MAVProxy/tools/mavflightview.py @@ -374,8 +374,8 @@ def mavflightview_mav(mlog, options=None, flightmode_selections=[]): # may only be present for colour-source expressions to work continue - if type == 'GPS' and hasattr(m,'I'): - type = 'GPS[%u]' % m.I + if type in ['GPS','VEH'] and hasattr(m,'I'): + type = '%s[%u]' % (type, m.I) if not all_false and len(flightmode_selections) > 0 and idx < len(options._flightmodes) and m._timestamp >= options._flightmodes[idx][2]: idx += 1 From 2f83d167de3bdcc6fc6c0f59e65d0d0cbfbce1bc Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Tue, 27 Feb 2024 14:14:58 +1100 Subject: [PATCH 2/2] prepare for 1.8.70 --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index b9089678b0..6eb2ea285a 100755 --- a/setup.py +++ b/setup.py @@ -1,7 +1,7 @@ from setuptools import setup import os, platform, sys -version = "1.8.69" +version = "1.8.70" def package_files(directory): paths = []