Mirror
/
ardupilot
mirror of https://github.com/ArduPilot/ardupilot
5
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

param_metadata: reinstance @Values/@Bitmask magic for excluding params from vehicle output

This commit is contained in:
Peter Barker 2021-05-15 10:51:21 +10:00 committed by Peter Barker
parent eb2b1b3231
commit 0a06a9e446
1 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Tools/autotest/param_metadata/param_parse.py
View File

@ -254,6 +254,10 @@ def process_library(vehicle, library, pathprefix=None):
error("param: unknown parameter metadata field %s" % field[0])
debug("matching %s" % field_text)
fields = prog_param_tagged_fields.findall(field_text)
# a parameter is considered to be vehicle-specific if
# there does not exist a Values: or Values{VehicleName}
# for that vehicle but @Values{OtherVehcicle} exists.
seen_values_or_bitmask_for_other_vehicle = False
for field in fields:
only_for_vehicles = field[1].split(",")
only_for_vehicles = [x.rstrip().lstrip() for x in only_for_vehicles]
@ -266,10 +270,23 @@ def process_library(vehicle, library, pathprefix=None):
error("tagged param: unknown parameter metadata field '%s'" % field[0])
continue
if vehicle.name not in only_for_vehicles:
if len(only_for_vehicles) and field[0] in ['Values', 'Bitmask']:
seen_values_or_bitmask_for_other_vehicle = True
continue
value = re.sub('@PREFIX@', library.name, field[2])
setattr(p, field[0], value)
if (getattr(p, 'Values', None) is None and
getattr(p, 'Bitmask', None) is None):
# values and Bitmask available for this vehicle
if seen_values_or_bitmask_for_other_vehicle:
# we've (e.g.) seen @Values{Copter} when we're
# processing for Rover, and haven't seen either
# @Values: or @Vales{Rover} - so we omit this
# parameter on the assumption that it is not
# applicable for this vehicle.
continue
p.path = path # Add path. Later deleted - only used for duplicates
library.params.append(p)