Merge branch 'ArduPilot:master' into pynmeagps-no-formatting

ArduPilot · Feb 27, 2024 · 1a5ec63 · 1a5ec63
2 parents 34fc192 + 2f83d16
commit 1a5ec63
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git 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

diff --git 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 = []