From 116e456d359189e05397e27b38f696200bc68d9c Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Sat, 8 Apr 2023 14:09:10 +1000 Subject: [PATCH] AP_Arming: rename more variables, types and defines --- libraries/AP_Arming/AP_Arming.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libraries/AP_Arming/AP_Arming.cpp b/libraries/AP_Arming/AP_Arming.cpp index a74d50b2ba..d53a3b9fd4 100644 --- a/libraries/AP_Arming/AP_Arming.cpp +++ b/libraries/AP_Arming/AP_Arming.cpp @@ -1173,9 +1173,9 @@ bool AP_Arming::can_checks(bool report) #endif break; } - case AP_CANManager::Driver_Type_UAVCAN: + case AP_CANManager::Driver_Type_DroneCAN: { -#if HAL_ENABLE_LIBUAVCAN_DRIVERS +#if HAL_ENABLE_DRONECAN_DRIVERS AP_DroneCAN *ap_dronecan = AP_DroneCAN::get_uavcan(i); if (ap_dronecan != nullptr && !ap_dronecan->prearm_check(fail_msg, ARRAY_SIZE(fail_msg))) { check_failed(ARMING_CHECK_SYSTEM, report, "UAVCAN: %s", fail_msg);