From 75ed340efabc4501be31018699eaf899a62c4a0d Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <andrew@tridgell.net>
Date: Fri, 7 Apr 2023 10:17:10 +1000
Subject: [PATCH] waf: rename UAVCAN to DroneCAN

---
 Tools/ardupilotwaf/boards.py  | 2 +-
 Tools/ardupilotwaf/chibios.py | 2 +-
 wscript                       | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Tools/ardupilotwaf/boards.py b/Tools/ardupilotwaf/boards.py
index 1b34843015..c1b8c6cd9c 100644
--- a/Tools/ardupilotwaf/boards.py
+++ b/Tools/ardupilotwaf/boards.py
@@ -435,7 +435,7 @@ class Board:
                 )
             else:
                 env.AP_LIBRARIES += [
-                    'AP_UAVCAN',
+                    'AP_DroneCAN',
                     'modules/DroneCAN/libcanard/*.c',
                     ]
             if cfg.options.enable_dronecan_tests:
diff --git a/Tools/ardupilotwaf/chibios.py b/Tools/ardupilotwaf/chibios.py
index 68c30fa683..63eeb0a42b 100644
--- a/Tools/ardupilotwaf/chibios.py
+++ b/Tools/ardupilotwaf/chibios.py
@@ -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'''
     env = cfg.env
     env.AP_LIBRARIES += [
-        'AP_UAVCAN',
+        'AP_DroneCAN',
         'modules/DroneCAN/libcanard/*.c',
         ]
     env.INCLUDES += [
diff --git a/wscript b/wscript
index 2a54205555..0a36e56b57 100644
--- a/wscript
+++ b/wscript
@@ -678,19 +678,19 @@ def _build_dynamic_sources(bld):
         else:
             bld(
                 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/',
                 name='dronecan',
                 export_includes=[
                     bld.bldnode.make_node('modules/DroneCAN/libcanard/dsdlc_generated/include').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:
         bld(
             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/',
             name='dronecan',
             export_includes=[