Skip to content

Correct rover param download #1546

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

Merged
stephendade merged 2 commits into from
Apr 13, 2025
Merged

Correct rover param download #1546

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
80853a2
params: Change to new URLs and filenames for definitions
stephendade Apr 8, 2025
9acd845
Build: Add Blimp param definitions
stephendade Apr 13, 2025
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
9 changes: 5 additions & 4 deletions .github/workflows/windows_build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,12 +45,13 @@ jobs:
run: |
mkdir Parameters
$wc = New-Object System.Net.WebClient
$wc.DownloadFile('https://autotest.ardupilot.org/Parameters/APMrover2/apm.pdef.xml', 'Parameters\Rover.xml')
$wc.DownloadFile('https://autotest.ardupilot.org/Parameters/ArduCopter/apm.pdef.xml', 'Parameters\ArduCopter.xml')
$wc.DownloadFile('https://autotest.ardupilot.org/Parameters/ArduPlane/apm.pdef.xml', 'Parameters\ArduPlane.xml')
$wc.DownloadFile('https://autotest.ardupilot.org/Parameters/ArduSub/apm.pdef.xml', 'Parameters\ArduSub.xml')
$wc.DownloadFile('https://autotest.ardupilot.org/Parameters/Rover/apm.pdef.xml', 'Parameters\Rover.xml')
$wc.DownloadFile('https://autotest.ardupilot.org/Parameters/Copter/apm.pdef.xml', 'Parameters\Copter.xml')
$wc.DownloadFile('https://autotest.ardupilot.org/Parameters/Plane/apm.pdef.xml', 'Parameters\Plane.xml')
$wc.DownloadFile('https://autotest.ardupilot.org/Parameters/Sub/apm.pdef.xml', 'Parameters\Sub.xml')
Copy link
Contributor

@peterbarker peterbarker Apr 13, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not your bug, but missing Blimp here

$wc.DownloadFile('https://autotest.ardupilot.org/Parameters/AntennaTracker/apm.pdef.xml', 'Parameters\AntennaTracker.xml')
$wc.DownloadFile('https://autotest.ardupilot.org/Parameters/Heli/apm.pdef.xml', 'Parameters\Heli.xml')
$wc.DownloadFile('https://autotest.ardupilot.org/Parameters/Blimp/apm.pdef.xml', 'Parameters\Blimp.xml')
- name: Build installer
run: |
cd windows
Expand Down
26 changes: 21 additions & 5 deletions MAVProxy/modules/lib/param_help.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ def __init__(self):
def param_help_download(self):
'''download XML files for parameters'''
files = []
for vehicle in ['Rover', 'ArduCopter', 'ArduPlane', 'ArduSub', 'AntennaTracker', 'Blimp', 'Heli']:
for vehicle in ['Rover', 'Copter', 'Plane', 'Sub', 'AntennaTracker', 'Blimp', 'Heli']:
url = 'http://autotest.ardupilot.org/Parameters/%s/apm.pdef.xml.gz' % vehicle
path = mp_util.dot_mavproxy("%s.xml" % vehicle)
files.append((url, path))
Expand All @@ -26,6 +26,21 @@ def param_help_download(self):
def param_use_xml_filepath(self, filepath):
self.xml_filepath = filepath

def convert_vehicle_name(self):
'''convert vehicle name new format'''
if self.vehicle_name is None:
return None
if self.vehicle_name == 'APMrover2':
return 'Rover'
elif self.vehicle_name == 'ArduPlane':
return 'Plane'
elif self.vehicle_name == 'ArduSub':
return 'Sub'
elif self.vehicle_name == 'ArduCopter':
return 'Copter'
else:
return self.vehicle_name

def param_help_tree(self, verbose=False):
'''return a "help tree", a map between a parameter and its metadata. May return None if help is not available'''
if self.last_pair == (self.xml_filepath, self.vehicle_name):
Expand All @@ -39,13 +54,14 @@ def param_help_tree(self, verbose=False):
if verbose:
print("Unknown vehicle type")
return None
path = mp_util.dot_mavproxy("%s.xml" % self.vehicle_name)
# Map between new and old names
path = mp_util.dot_mavproxy("%s.xml" % self.convert_vehicle_name())
# Otherwise try legacy name
if not os.path.exists(path):
if self.vehicle_name == 'APMrover2':
path = mp_util.dot_mavproxy("%s.xml" % "Rover")
path = mp_util.dot_mavproxy("%s.xml" % self.vehicle_name)
if not os.path.exists(path):
if verbose:
print("Please run 'param download' first (vehicle_name=%s)" % self.vehicle_name)
print("Please run 'param download' first (vehicle_name=%s)" % self.convert_vehicle_name())
return None
if not os.path.exists(path):
if verbose:
Expand Down
10 changes: 3 additions & 7 deletions MAVProxy/modules/mavproxy_param.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -446,13 +446,9 @@ def param_diff(self, args):
wildcard = '*'
if len(args) < 1 or args[0].find('*') != -1:
defaults = self.default_params
if defaults is None and self.vehicle_name is not None:
filename = mp_util.dot_mavproxy("%s-defaults.parm" % self.vehicle_name)
if not os.path.exists(filename):
print("Please run 'param download' first (vehicle_name=%s)" % self.vehicle_name)
return
defaults = mavparm.MAVParmDict()
defaults.load(filename)
if defaults is None:
print("Cannot find default parameters")
return
if len(args) >= 1:
wildcard = args[0]
else:
Expand Down
9 changes: 5 additions & 4 deletions windows/MAVProxyWinBuild.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,12 +53,13 @@ rem -----Create version Info-----
rem -----Download parameter files-----
cd ..\
mkdir Parameters
powershell.exe "Start-BitsTransfer -Source 'http://autotest.ardupilot.org/Parameters/APMrover2/apm.pdef.xml' -Destination 'Parameters\Rover.xml'"
powershell.exe "Start-BitsTransfer -Source 'http://autotest.ardupilot.org/Parameters/ArduCopter/apm.pdef.xml' -Destination 'Parameters\ArduCopter.xml'"
powershell.exe "Start-BitsTransfer -Source 'http://autotest.ardupilot.org/Parameters/ArduPlane/apm.pdef.xml' -Destination 'Parameters\ArduPlane.xml'"
powershell.exe "Start-BitsTransfer -Source 'http://autotest.ardupilot.org/Parameters/ArduSub/apm.pdef.xml' -Destination 'Parameters\ArduSub.xml'"
powershell.exe "Start-BitsTransfer -Source 'http://autotest.ardupilot.org/Parameters/Rover/apm.pdef.xml' -Destination 'Parameters\Rover.xml'"
powershell.exe "Start-BitsTransfer -Source 'http://autotest.ardupilot.org/Parameters/Copter/apm.pdef.xml' -Destination 'Parameters\Copter.xml'"
powershell.exe "Start-BitsTransfer -Source 'http://autotest.ardupilot.org/Parameters/Plane/apm.pdef.xml' -Destination 'Parameters\Plane.xml'"
powershell.exe "Start-BitsTransfer -Source 'http://autotest.ardupilot.org/Parameters/Sub/apm.pdef.xml' -Destination 'Parameters\Sub.xml'"
Copy link
Contributor

@peterbarker peterbarker Apr 13, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Missing Blimp here, too

powershell.exe "Start-BitsTransfer -Source 'http://autotest.ardupilot.org/Parameters/AntennaTracker/apm.pdef.xml' -Destination 'Parameters\AntennaTracker.xml'"
powershell.exe "Start-BitsTransfer -Source 'http://autotest.ardupilot.org/Parameters/Heli/apm.pdef.xml' -Destination 'Parameters\Heli.xml'"
powershell.exe "Start-BitsTransfer -Source 'http://autotest.ardupilot.org/Parameters/Blimp/apm.pdef.xml' -Destination 'Parameters\Blimp.xml'"

rem -----Build the Installer-----
cd .\windows
Expand Down