Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-02-21 23:33:57 -04:00
Code Issues Packages Projects Releases Wiki Activity

AP_Arming: rename AP_UAVCAN to AP_DroneCAN

Browse Source
This commit is contained in:
Andrew Tridgell 2023-04-07 10:18:01 +10:00
parent c179ea3232
commit 85ce16deb6
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libraries/AP_Arming/AP_Arming.cpp
View File

@ -65,7 +65,7 @@
#if APM_BUILD_COPTER_OR_HELI || APM_BUILD_TYPE(APM_BUILD_ArduPlane) || APM_BUILD_TYPE(APM_BUILD_ArduSub) #if APM_BUILD_COPTER_OR_HELI || APM_BUILD_TYPE(APM_BUILD_ArduPlane) || APM_BUILD_TYPE(APM_BUILD_ArduSub)
#include <AP_KDECAN/AP_KDECAN.h> #include <AP_KDECAN/AP_KDECAN.h>
#endif #endif
#include <AP_UAVCAN/AP_UAVCAN.h> #include <AP_DroneCAN/AP_DroneCAN.h>
#endif #endif
#include <AP_Logger/AP_Logger.h> #include <AP_Logger/AP_Logger.h>
@ -1176,8 +1176,8 @@ bool AP_Arming::can_checks(bool report)
case AP_CANManager::Driver_Type_UAVCAN: case AP_CANManager::Driver_Type_UAVCAN:
{ {
#if HAL_ENABLE_LIBUAVCAN_DRIVERS #if HAL_ENABLE_LIBUAVCAN_DRIVERS
AP_UAVCAN *ap_uavcan = AP_UAVCAN::get_uavcan(i); AP_DroneCAN *ap_dronecan = AP_DroneCAN::get_uavcan(i);
if (ap_uavcan != nullptr && !ap_uavcan->prearm_check(fail_msg, ARRAY_SIZE(fail_msg))) { if (ap_dronecan != nullptr && !ap_dronecan->prearm_check(fail_msg, ARRAY_SIZE(fail_msg))) {
check_failed(ARMING_CHECK_SYSTEM, report, "UAVCAN: %s", fail_msg); check_failed(ARMING_CHECK_SYSTEM, report, "UAVCAN: %s", fail_msg);
return false; return false;
} }