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

Tools: call the chibios hwdef generator rather than subcall it

This commit is contained in:
James O'Shannessy 2024-09-03 17:05:33 +10:00
parent 0ea9bc3442
commit b5a19838f9
1 changed files with 29 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
Tools/ardupilotwaf/chibios.py
View File

@ -16,6 +16,10 @@ import struct
import base64 import base64
import subprocess import subprocess
# modify our search path:
sys.path.append(os.path.join(os.path.dirname(os.path.realpath(__file__)), '../../libraries/AP_HAL_ChibiOS/hwdef/scripts'))
import chibios_hwdef
_dynamic_env_data = {} _dynamic_env_data = {}
def _load_dynamic_env_data(bld): def _load_dynamic_env_data(bld):
bldnode = bld.bldnode.make_node('modules/ChibiOS') bldnode = bld.bldnode.make_node('modules/ChibiOS')
@ -638,17 +642,27 @@ def generate_hwdef_h(env):
print(env.BOOTLOADER_OPTION) print(env.BOOTLOADER_OPTION)
env.BOOTLOADER_OPTION += " --signed-fw" env.BOOTLOADER_OPTION += " --signed-fw"
print(env.BOOTLOADER_OPTION) print(env.BOOTLOADER_OPTION)
hwdef_script = os.path.join(env.SRCROOT, 'libraries/AP_HAL_ChibiOS/hwdef/scripts/chibios_hwdef.py')
hwdef_out = env.BUILDROOT hwdef_out = env.BUILDROOT
if not os.path.exists(hwdef_out): if not os.path.exists(hwdef_out):
os.mkdir(hwdef_out) os.mkdir(hwdef_out)
python = sys.executable
cmd = "{0} '{1}' -D '{2}' --params '{3}' '{4}'".format(python, hwdef_script, hwdef_out, env.DEFAULT_PARAMETERS, env.HWDEF) # Build a list of the hardware definitions
hwdef_arr = [env.HWDEF]
if env.HWDEF_EXTRA: if env.HWDEF_EXTRA:
cmd += " '{0}'".format(env.HWDEF_EXTRA) # Add any extra hwdefs that may be defined
if env.BOOTLOADER_OPTION: hwdef_arr.append(env.HWDEF_EXTRA)
cmd += " " + env.BOOTLOADER_OPTION ch = chibios_hwdef.ChibiOSHWDef(outdir=hwdef_out,
return subprocess.call(cmd, shell=True) bootloader=env.BOOTLOADER,
signed_fw=env.AP_SIGNED_FIRMWARE,
default_params_filepath=env.DEFAULT_PARAMETERS,
hwdef=hwdef_arr)
try:
ch.run()
# Return success for subprocess call
return 0
except SystemExit:
# The run failed, so return the error code
return 1
def pre_build(bld): def pre_build(bld):
'''pre-build hook to change dynamic sources''' '''pre-build hook to change dynamic sources'''
@ -668,21 +682,18 @@ def pre_build(bld):
def build(bld): def build(bld):
hwdef_arr = [bld.env.HWDEF]
hwdef_rule="%s '%s/hwdef/scripts/chibios_hwdef.py' -D '%s' --params '%s' '%s'" % (
bld.env.get_flat('PYTHON'),
bld.env.AP_HAL_ROOT,
bld.env.BUILDROOT,
bld.env.default_parameters,
bld.env.HWDEF)
if bld.env.HWDEF_EXTRA: if bld.env.HWDEF_EXTRA:
hwdef_rule += " " + bld.env.HWDEF_EXTRA hwdef_arr.append(bld.env.HWDEF_EXTRA)
if bld.env.BOOTLOADER_OPTION: ch = chibios_hwdef.ChibiOSHWDef(outdir=bld.env.BUILDROOT,
hwdef_rule += " " + bld.env.BOOTLOADER_OPTION bootloader=bld.env.BOOTLOADER,
signed_fw=bld.env.AP_SIGNED_FIRMWARE,
default_params_filepath=bld.env.DEFAULT_PARAMETERS,
hwdef=hwdef_arr)
bld( bld(
# build hwdef.h from hwdef.dat. This is needed after a waf clean # build hwdef.h from hwdef.dat. This is needed after a waf clean
source=bld.path.ant_glob(bld.env.HWDEF), source=bld.path.ant_glob(bld.env.HWDEF),
rule=hwdef_rule, rule=ch.run,
group='dynamic_sources', group='dynamic_sources',
target=[bld.bldnode.find_or_declare('hwdef.h'), target=[bld.bldnode.find_or_declare('hwdef.h'),
bld.bldnode.find_or_declare('ldscript.ld'), bld.bldnode.find_or_declare('ldscript.ld'),