From 7e74fde24c8c7c3acc8bae5b29ca7fe34b702102 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <andrew@tridgell.net>
Date: Fri, 7 Apr 2023 10:18:01 +1000
Subject: [PATCH] AP_EFI: rename AP_UAVCAN to AP_DroneCAN

---
 libraries/AP_EFI/AP_EFI_DroneCAN.cpp | 10 +++++-----
 libraries/AP_EFI/AP_EFI_DroneCAN.h   |  6 +++---
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/libraries/AP_EFI/AP_EFI_DroneCAN.cpp b/libraries/AP_EFI/AP_EFI_DroneCAN.cpp
index 18332295e0..c242598cf0 100644
--- a/libraries/AP_EFI/AP_EFI_DroneCAN.cpp
+++ b/libraries/AP_EFI/AP_EFI_DroneCAN.cpp
@@ -5,7 +5,7 @@
 #if AP_EFI_DRONECAN_ENABLED
 
 #include <AP_CANManager/AP_CANManager.h>
-#include <AP_UAVCAN/AP_UAVCAN.h>
+#include <AP_DroneCAN/AP_DroneCAN.h>
 #include <AP_BoardConfig/AP_BoardConfig.h>
 
 extern const AP_HAL::HAL& hal;
@@ -20,13 +20,13 @@ AP_EFI_DroneCAN::AP_EFI_DroneCAN(AP_EFI &_frontend) :
 }
 
 // links the DroneCAN message to this backend
-void AP_EFI_DroneCAN::subscribe_msgs(AP_UAVCAN *ap_uavcan)
+void AP_EFI_DroneCAN::subscribe_msgs(AP_DroneCAN *ap_dronecan)
 {
-    if (ap_uavcan == nullptr) {
+    if (ap_dronecan == nullptr) {
         return;
     }
 
-    if (Canard::allocate_sub_arg_callback(ap_uavcan, &trampoline_status, ap_uavcan->get_driver_index()) == nullptr) {
+    if (Canard::allocate_sub_arg_callback(ap_dronecan, &trampoline_status, ap_dronecan->get_driver_index()) == nullptr) {
         AP_BoardConfig::allocation_error("status_sub");
     }
 }
@@ -37,7 +37,7 @@ void AP_EFI_DroneCAN::update()
 }
 
 // EFI message handler
-void AP_EFI_DroneCAN::trampoline_status(AP_UAVCAN *ap_uavcan, const CanardRxTransfer& transfer, const uavcan_equipment_ice_reciprocating_Status &msg)
+void AP_EFI_DroneCAN::trampoline_status(AP_DroneCAN *ap_dronecan, const CanardRxTransfer& transfer, const uavcan_equipment_ice_reciprocating_Status &msg)
 {
     if (driver == nullptr) {
         return;
diff --git a/libraries/AP_EFI/AP_EFI_DroneCAN.h b/libraries/AP_EFI/AP_EFI_DroneCAN.h
index fc695962be..c4f9dde22c 100644
--- a/libraries/AP_EFI/AP_EFI_DroneCAN.h
+++ b/libraries/AP_EFI/AP_EFI_DroneCAN.h
@@ -4,7 +4,7 @@
 #include "AP_EFI_Backend.h"
 
 #if AP_EFI_DRONECAN_ENABLED
-#include <AP_UAVCAN/AP_UAVCAN.h>
+#include <AP_DroneCAN/AP_DroneCAN.h>
 
 class AP_EFI_DroneCAN : public AP_EFI_Backend {
 public:
@@ -12,8 +12,8 @@ public:
 
     void update() override;
 
-    static void subscribe_msgs(AP_UAVCAN* ap_uavcan);
-    static void trampoline_status(AP_UAVCAN *ap_uavcan, const CanardRxTransfer& transfer, const uavcan_equipment_ice_reciprocating_Status &msg);
+    static void subscribe_msgs(AP_DroneCAN* ap_dronecan);
+    static void trampoline_status(AP_DroneCAN *ap_dronecan, const CanardRxTransfer& transfer, const uavcan_equipment_ice_reciprocating_Status &msg);
 
 private:
     void handle_status(const uavcan_equipment_ice_reciprocating_Status &pkt);