aepko/Ardupilot2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

AP_Notify: rename AP_UAVCAN to AP_DroneCAN

Browse Source
This commit is contained in:
Andrew Tridgell 2023-04-07 10:18:01 +10:00
parent 420ceec553
commit 9c6d84ddb1
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libraries/AP_Notify/MMLPlayer.cpp
View File

@ -7,7 +7,7 @@
#include <AP_Notify/AP_Notify.h>
#if HAL_CANMANAGER_ENABLED
#include <AP_UAVCAN/AP_UAVCAN.h>
#include <AP_DroneCAN/AP_DroneCAN.h>
#include <AP_CANManager/AP_CANManager.h>
#endif
@ -69,7 +69,7 @@ void MMLPlayer::start_note(float duration, float frequency, float volume)
uint8_t can_num_drivers = AP::can().get_num_drivers();
for (uint8_t i = 0; i < can_num_drivers; i++) {
AP_UAVCAN *uavcan = AP_UAVCAN::get_uavcan(i);
AP_DroneCAN *uavcan = AP_DroneCAN::get_uavcan(i);
if (uavcan != nullptr &&
(AP::notify().get_buzzer_types() & AP_Notify::Notify_Buzz_UAVCAN)) {
uavcan->set_buzzer_tone(frequency, _note_duration_us*1.0e-6);

6
libraries/AP_Notify/UAVCAN_RGB_LED.cpp
View File

@ -20,7 +20,7 @@
#if HAL_ENABLE_LIBUAVCAN_DRIVERS
#include "UAVCAN_RGB_LED.h"
#include <AP_UAVCAN/AP_UAVCAN.h>
#include <AP_DroneCAN/AP_DroneCAN.h>
#include <AP_CANManager/AP_CANManager.h>
@ -47,7 +47,7 @@ bool UAVCAN_RGB_LED::init()
{
const uint8_t can_num_drivers = AP::can().get_num_drivers();
for (uint8_t i = 0; i < can_num_drivers; i++) {
AP_UAVCAN *uavcan = AP_UAVCAN::get_uavcan(i);
AP_DroneCAN *uavcan = AP_DroneCAN::get_uavcan(i);
if (uavcan != nullptr) {
return true;
}
@ -63,7 +63,7 @@ bool UAVCAN_RGB_LED::hw_set_rgb(uint8_t red, uint8_t green, uint8_t blue)
uint8_t can_num_drivers = AP::can().get_num_drivers();
for (uint8_t i = 0; i < can_num_drivers; i++) {
AP_UAVCAN *uavcan = AP_UAVCAN::get_uavcan(i);
AP_DroneCAN *uavcan = AP_DroneCAN::get_uavcan(i);
if (uavcan != nullptr) {
success = uavcan->led_write(_led_index, red, green, blue) || success;
}