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

waf: rename UAVCAN to DroneCAN

This commit is contained in:
Andrew Tridgell 2023-04-07 10:17:10 +10:00
parent 1efd640624
commit 75ed340efa
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Tools/ardupilotwaf/boards.py
View File

@ -435,7 +435,7 @@ class Board:
) )
else: else:
env.AP_LIBRARIES += [ env.AP_LIBRARIES += [
'AP_UAVCAN', 'AP_DroneCAN',
'modules/DroneCAN/libcanard/*.c', 'modules/DroneCAN/libcanard/*.c',
] ]
if cfg.options.enable_dronecan_tests: if cfg.options.enable_dronecan_tests:

2
Tools/ardupilotwaf/chibios.py
View File

@ -442,7 +442,7 @@ def setup_canmgr_build(cfg):
the build based on the presence of CAN pins in hwdef.dat except for AP_Periph builds''' the build based on the presence of CAN pins in hwdef.dat except for AP_Periph builds'''
env = cfg.env env = cfg.env
env.AP_LIBRARIES += [ env.AP_LIBRARIES += [
'AP_UAVCAN', 'AP_DroneCAN',
'modules/DroneCAN/libcanard/*.c', 'modules/DroneCAN/libcanard/*.c',
] ]
env.INCLUDES += [ env.INCLUDES += [

6
wscript
View File

@ -678,19 +678,19 @@ def _build_dynamic_sources(bld):
else: else:
bld( bld(
features='dronecangen', features='dronecangen',
source=bld.srcnode.ant_glob('modules/DroneCAN/DSDL/* libraries/AP_UAVCAN/dsdl/*', dir=True, src=False), source=bld.srcnode.ant_glob('modules/DroneCAN/DSDL/* libraries/AP_DroneCAN/dsdl/*', dir=True, src=False),
output_dir='modules/DroneCAN/libcanard/dsdlc_generated/', output_dir='modules/DroneCAN/libcanard/dsdlc_generated/',
name='dronecan', name='dronecan',
export_includes=[ export_includes=[
bld.bldnode.make_node('modules/DroneCAN/libcanard/dsdlc_generated/include').abspath(), bld.bldnode.make_node('modules/DroneCAN/libcanard/dsdlc_generated/include').abspath(),
bld.srcnode.find_dir('modules/DroneCAN/libcanard/').abspath(), bld.srcnode.find_dir('modules/DroneCAN/libcanard/').abspath(),
bld.srcnode.find_dir('libraries/AP_UAVCAN/canard/').abspath(), bld.srcnode.find_dir('libraries/AP_DroneCAN/canard/').abspath(),
] ]
) )
elif bld.env.AP_PERIPH: elif bld.env.AP_PERIPH:
bld( bld(
features='dronecangen', features='dronecangen',
source=bld.srcnode.ant_glob('modules/DroneCAN/DSDL/* libraries/AP_UAVCAN/dsdl/*', dir=True, src=False), source=bld.srcnode.ant_glob('modules/DroneCAN/DSDL/* libraries/AP_DroneCAN/dsdl/*', dir=True, src=False),
output_dir='modules/DroneCAN/libcanard/dsdlc_generated/', output_dir='modules/DroneCAN/libcanard/dsdlc_generated/',
name='dronecan', name='dronecan',
export_includes=[ export_includes=[