Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-02-08 17:03:57 -04:00
Code Issues Packages Projects Releases Wiki Activity

Tools: allow parameters to be specified on a per-vehicle basis

Browse Source
This commit is contained in:
Peter Barker 2020-05-27 12:36:00 +10:00 committed by Andrew Tridgell
parent 799c538c3e
commit d1170db4bf
1 changed files with 25 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -34,7 +34,7 @@ args = parser.parse_args()
# Regular expressions for parsing the parameter metadata # Regular expressions for parsing the parameter metadata
prog_param = re.compile(r"@Param: (\w+).*((?:\n[ \t]*// @(\w+)(?:{([^}]+)})?: (.*))+)(?:\n[ \t\r]*\n|\n[ \t]+[A-Z])", re.MULTILINE) prog_param = re.compile(r"@Param(?:{([^}]+)})?: (\w+).*((?:\n[ \t]*// @(\w+)(?:{([^}]+)})?: (.*))+)(?:\n[ \t\r]*\n|\n[ \t]+[A-Z])", re.MULTILINE)
# match e.g @Value: 0=Unity, 1=Koala, 17=Liability # match e.g @Value: 0=Unity, 1=Koala, 17=Liability
prog_param_fields = re.compile(r"[ \t]*// @(\w+): ([^\r\n]*)") prog_param_fields = re.compile(r"[ \t]*// @(\w+): ([^\r\n]*)")
@ -89,6 +89,8 @@ truename_map = {
"ArduPlane": "Plane", "ArduPlane": "Plane",
"AntennaTracker": "Tracker", "AntennaTracker": "Tracker",
} }
valid_truenames = frozenset(truename_map.values())
for vehicle_path in vehicle_paths: for vehicle_path in vehicle_paths:
name = os.path.basename(os.path.dirname(vehicle_path)) name = os.path.basename(os.path.dirname(vehicle_path))
path = os.path.normpath(os.path.dirname(vehicle_path)) path = os.path.normpath(os.path.dirname(vehicle_path))
@ -122,10 +124,19 @@ for vehicle in vehicles:
libraries.append(lib) libraries.append(lib)
for param_match in param_matches: for param_match in param_matches:
p = Parameter(vehicle.name+":"+param_match[0], current_file) (only_vehicles, param_name, field_text) = (param_match[0],
param_match[1],
param_match[2])
if len(only_vehicles):
only_vehicles_list = [x.strip() for x in only_vehicles.split(",")]
for only_vehicle in only_vehicles_list:
if only_vehicle not in valid_truenames:
raise ValueError("Invalid only_vehicle %s" % only_vehicle)
if vehicle.truename not in only_vehicles_list:
continue
p = Parameter(vehicle.name+":"+param_name, current_file)
debug(p.name + ' ') debug(p.name + ' ')
current_param = p.name current_param = p.name
field_text = param_match[1]
fields = prog_param_fields.findall(field_text) fields = prog_param_fields.findall(field_text)
field_list = [] field_list = []
for field in fields: for field in fields:
@ -178,11 +189,20 @@ def process_library(vehicle, library, pathprefix=None):
param_matches = prog_param.findall(p_text) param_matches = prog_param.findall(p_text)
debug("Found %u documented parameters" % len(param_matches)) debug("Found %u documented parameters" % len(param_matches))
for param_match in param_matches: for param_match in param_matches:
p = Parameter(library.name+param_match[0], current_file) (only_vehicles, param_name, field_text) = (param_match[0],
param_match[1],
param_match[2])
if len(only_vehicles):
only_vehicles_list = [x.strip() for x in only_vehicles.split(",")]
for only_vehicle in only_vehicles_list:
if only_vehicle not in valid_truenames:
raise ValueError("Invalid only_vehicle %s" % only_vehicle)
if vehicle.truename not in only_vehicles_list:
continue
p = Parameter(library.name+param_name, current_file)
debug(p.name + ' ') debug(p.name + ' ')
global current_param global current_param
current_param = p.name current_param = p.name
field_text = param_match[1]
fields = prog_param_fields.findall(field_text) fields = prog_param_fields.findall(field_text)
non_vehicle_specific_values_seen = False non_vehicle_specific_values_seen = False
for field in fields: for field in fields: