From 2ede296486c64f540f7aa4a8bc74cd9049afd99e Mon Sep 17 00:00:00 2001 From: bugobliterator Date: Thu, 5 Jan 2023 11:20:51 +1100 Subject: [PATCH] AP_Notify: replace libuavcan with libcanard based driver --- libraries/AP_Notify/AP_Notify.cpp | 4 ++-- libraries/AP_Notify/MMLPlayer.cpp | 2 +- libraries/AP_Notify/UAVCAN_RGB_LED.cpp | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libraries/AP_Notify/AP_Notify.cpp b/libraries/AP_Notify/AP_Notify.cpp index 80103df7232..b3b3b28cac0 100644 --- a/libraries/AP_Notify/AP_Notify.cpp +++ b/libraries/AP_Notify/AP_Notify.cpp @@ -348,9 +348,9 @@ void AP_Notify::add_backends(void) #endif break; case Notify_LED_UAVCAN: -#if HAL_CANMANAGER_ENABLED +#if HAL_ENABLE_LIBUAVCAN_DRIVERS ADD_BACKEND(new UAVCAN_RGB_LED(0)); -#endif // HAL_CANMANAGER_ENABLED +#endif // HAL_ENABLE_LIBUAVCAN_DRIVERS break; case Notify_LED_Scripting: diff --git a/libraries/AP_Notify/MMLPlayer.cpp b/libraries/AP_Notify/MMLPlayer.cpp index a48fc1f1276..68bf2e8164a 100644 --- a/libraries/AP_Notify/MMLPlayer.cpp +++ b/libraries/AP_Notify/MMLPlayer.cpp @@ -64,7 +64,7 @@ void MMLPlayer::start_note(float duration, float frequency, float volume) _note_duration_us = duration*1e6; hal.util->toneAlarm_set_buzzer_tone(frequency, volume, _note_duration_us/1000U); -#if HAL_CANMANAGER_ENABLED +#if HAL_ENABLE_LIBUAVCAN_DRIVERS // support CAN buzzers too uint8_t can_num_drivers = AP::can().get_num_drivers(); diff --git a/libraries/AP_Notify/UAVCAN_RGB_LED.cpp b/libraries/AP_Notify/UAVCAN_RGB_LED.cpp index 3d21c095374..5b705235a79 100644 --- a/libraries/AP_Notify/UAVCAN_RGB_LED.cpp +++ b/libraries/AP_Notify/UAVCAN_RGB_LED.cpp @@ -17,7 +17,7 @@ #include #include -#if HAL_CANMANAGER_ENABLED +#if HAL_ENABLE_LIBUAVCAN_DRIVERS #include "UAVCAN_RGB_LED.h" #include