Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-02-01 21:48:28 -04:00
Code Issues Packages Projects Releases Wiki Activity

hwdef: Parse parameters and detect defined defaults correctly

Browse Source
This commit is contained in:
James O'Shannessy 2024-09-03 17:04:50 +10:00
parent be5c68d74d
commit 0ea9bc3442
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libraries/AP_HAL_ChibiOS/hwdef/scripts/chibios_hwdef.py
View File

@ -2891,12 +2891,14 @@ Please run: Tools/scripts/build_bootloaders.py %s
def write_processed_defaults_file(self, filepath):
# see if board has a defaults.parm file or a --default-parameters file was specified
defaults_filename = os.path.join(os.path.dirname(self.hwdef[0]), 'defaults.parm')
defaults_path = os.path.join(os.path.dirname(self.hwdef[0]), args.params)
defaults_abspath = None
if os.path.exists(defaults_path):
defaults_abspath = os.path.abspath(self.default_params_filepath)
self.progress("Default parameters path from command line: %s" % self.default_params_filepath)
if isinstance(self.default_params_filepath, str):
defaults_path = os.path.join(os.path.dirname(self.hwdef[0]), self.default_params_filepath)
if not os.path.exists(defaults_path):
self.error(f"Specified defaults file not found at path {defaults_path}")
defaults_abspath = os.path.abspath(defaults_path)
self.progress("Default parameters path from command line: %s" % defaults_path)
elif os.path.exists(defaults_filename):
defaults_abspath = os.path.abspath(defaults_filename)
self.progress("Default parameters path from hwdef: %s" % defaults_filename)