From 5d6b7b04d83a1ad48d8d074038e5b7a25e1f1dc4 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Sat, 8 Apr 2023 14:09:10 +1000 Subject: [PATCH] AP_HAL: rename more variables, types and defines --- libraries/AP_HAL/AP_HAL_Boards.h | 4 ++-- libraries/AP_HAL/board/esp32.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libraries/AP_HAL/AP_HAL_Boards.h b/libraries/AP_HAL/AP_HAL_Boards.h index 2a3706ad03..d6159d7e45 100644 --- a/libraries/AP_HAL/AP_HAL_Boards.h +++ b/libraries/AP_HAL/AP_HAL_Boards.h @@ -218,8 +218,8 @@ #define HAL_CANMANAGER_ENABLED (HAL_MAX_CAN_PROTOCOL_DRIVERS > 0) #endif -#ifndef HAL_ENABLE_LIBUAVCAN_DRIVERS -#define HAL_ENABLE_LIBUAVCAN_DRIVERS HAL_CANMANAGER_ENABLED +#ifndef HAL_ENABLE_DRONECAN_DRIVERS +#define HAL_ENABLE_DRONECAN_DRIVERS HAL_CANMANAGER_ENABLED #endif #ifndef AP_TEST_DRONECAN_DRIVERS diff --git a/libraries/AP_HAL/board/esp32.h b/libraries/AP_HAL/board/esp32.h index 8be292c0d6..560920fc09 100644 --- a/libraries/AP_HAL/board/esp32.h +++ b/libraries/AP_HAL/board/esp32.h @@ -13,7 +13,7 @@ #define HAL_BOARD_NAME "ESP32" #define HAL_CPU_CLASS HAL_CPU_CLASS_150 -#define HAL_WITH_UAVCAN 0 +#define HAL_WITH_DRONECAN 0 #define HAL_HAVE_SAFETY_SWITCH 0 #define HAL_HAVE_BOARD_VOLTAGE 0 #define HAL_HAVE_SERVO_VOLTAGE 0