From 70a7115312eafa6e01d74eba1efbb033baadd264 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <andrew@tridgell.net>
Date: Sat, 8 Apr 2023 14:27:51 +1000
Subject: [PATCH] AP_Baro: text messages and more defines

---
 libraries/AP_Baro/AP_Baro_DroneCAN.cpp | 10 +++++-----
 libraries/AP_Baro/AP_Baro_DroneCAN.h   |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/libraries/AP_Baro/AP_Baro_DroneCAN.cpp b/libraries/AP_Baro/AP_Baro_DroneCAN.cpp
index eb0cdecce9..ee1ee9e427 100644
--- a/libraries/AP_Baro/AP_Baro_DroneCAN.cpp
+++ b/libraries/AP_Baro/AP_Baro_DroneCAN.cpp
@@ -46,7 +46,7 @@ AP_Baro_Backend* AP_Baro_DroneCAN::probe(AP_Baro &baro)
             if (backend == nullptr) {
                 AP::can().log_text(AP_CANManager::LOG_ERROR,
                             LOG_TAG,
-                            "Failed register UAVCAN Baro Node %d on Bus %d\n",
+                            "Failed register DroneCAN Baro Node %d on Bus %d\n",
                             _detected_modules[i].node_id,
                             _detected_modules[i].ap_dronecan->get_driver_index());
             } else {
@@ -63,7 +63,7 @@ AP_Baro_Backend* AP_Baro_DroneCAN::probe(AP_Baro &baro)
 
                 AP::can().log_text(AP_CANManager::LOG_INFO,
                             LOG_TAG,
-                            "Registered UAVCAN Baro Node %d on Bus %d\n",
+                            "Registered DroneCAN Baro Node %d on Bus %d\n",
                             _detected_modules[i].node_id,
                             _detected_modules[i].ap_dronecan->get_driver_index());
             }
@@ -73,7 +73,7 @@ AP_Baro_Backend* AP_Baro_DroneCAN::probe(AP_Baro &baro)
     return backend;
 }
 
-AP_Baro_DroneCAN* AP_Baro_DroneCAN::get_uavcan_backend(AP_DroneCAN* ap_dronecan, uint8_t node_id, bool create_new)
+AP_Baro_DroneCAN* AP_Baro_DroneCAN::get_dronecan_backend(AP_DroneCAN* ap_dronecan, uint8_t node_id, bool create_new)
 {
     if (ap_dronecan == nullptr) {
         return nullptr;
@@ -126,7 +126,7 @@ void AP_Baro_DroneCAN::handle_pressure(AP_DroneCAN *ap_dronecan, const CanardRxT
     AP_Baro_DroneCAN* driver;
     {
         WITH_SEMAPHORE(_sem_registry);
-        driver = get_uavcan_backend(ap_dronecan, transfer.source_node_id, true);
+        driver = get_dronecan_backend(ap_dronecan, transfer.source_node_id, true);
         if (driver == nullptr) {
             return;
         }
@@ -143,7 +143,7 @@ void AP_Baro_DroneCAN::handle_temperature(AP_DroneCAN *ap_dronecan, const Canard
     AP_Baro_DroneCAN* driver;
     {
         WITH_SEMAPHORE(_sem_registry);
-        driver = get_uavcan_backend(ap_dronecan, transfer.source_node_id, false);
+        driver = get_dronecan_backend(ap_dronecan, transfer.source_node_id, false);
         if (driver == nullptr) {
             return;
         }
diff --git a/libraries/AP_Baro/AP_Baro_DroneCAN.h b/libraries/AP_Baro/AP_Baro_DroneCAN.h
index 19278c28e7..3040b97ab6 100644
--- a/libraries/AP_Baro/AP_Baro_DroneCAN.h
+++ b/libraries/AP_Baro/AP_Baro_DroneCAN.h
@@ -16,7 +16,7 @@ public:
     void update() override;
 
     static void subscribe_msgs(AP_DroneCAN* ap_dronecan);
-    static AP_Baro_DroneCAN* get_uavcan_backend(AP_DroneCAN* ap_dronecan, uint8_t node_id, bool create_new);
+    static AP_Baro_DroneCAN* get_dronecan_backend(AP_DroneCAN* ap_dronecan, uint8_t node_id, bool create_new);
     static AP_Baro_Backend* probe(AP_Baro &baro);
 
     static void handle_pressure(AP_DroneCAN *ap_dronecan, const CanardRxTransfer& transfer, const uavcan_equipment_air_data_StaticPressure &msg);