Mirror
/
ardupilot
mirror of https://github.com/ArduPilot/ardupilot
5
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

AP_Baro: change UAVCAN_ENABLED to DRONECAN_ENABLED

This commit is contained in:
Andrew Tridgell 2023-04-08 13:58:12 +10:00
parent d2882c79de
commit 8d21ef71d3
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libraries/AP_Baro/AP_Baro.cpp
View File

@ -613,7 +613,7 @@ void AP_Baro::init(void)
#endif
#endif
#if AP_BARO_UAVCAN_ENABLED
#if AP_BARO_DRONECAN_ENABLED
// Detect UAVCAN Modules, try as many times as there are driver slots
for (uint8_t i = 0; i < BARO_MAX_DRIVERS; i++) {
ADD_BACKEND(AP_Baro_UAVCAN::probe(*this));

4
libraries/AP_Baro/AP_Baro_DroneCAN.cpp
View File

@ -1,6 +1,6 @@
#include "AP_Baro_DroneCAN.h"
#if AP_BARO_UAVCAN_ENABLED
#if AP_BARO_DRONECAN_ENABLED
#include <AP_CANManager/AP_CANManager.h>
#include <AP_BoardConfig/AP_BoardConfig.h>
@ -174,4 +174,4 @@ void AP_Baro_UAVCAN::update(void)
}
}
#endif // AP_BARO_UAVCAN_ENABLED
#endif // AP_BARO_DRONECAN_ENABLED

4
libraries/AP_Baro/AP_Baro_DroneCAN.h
View File

@ -2,7 +2,7 @@
#include "AP_Baro_Backend.h"
#if AP_BARO_UAVCAN_ENABLED
#if AP_BARO_DRONECAN_ENABLED
#include <AP_DroneCAN/AP_DroneCAN.h>
#if AP_TEST_DRONECAN_DRIVERS
@ -49,4 +49,4 @@ private:
static HAL_Semaphore _sem_registry;
};
#endif // AP_BARO_UAVCAN_ENABLED
#endif // AP_BARO_DRONECAN_ENABLED

4
libraries/AP_Baro/AP_Baro_config.h
View File

@ -77,6 +77,6 @@
#define AP_BARO_SPL06_ENABLED AP_BARO_BACKEND_DEFAULT_ENABLED
#endif
#ifndef AP_BARO_UAVCAN_ENABLED
#define AP_BARO_UAVCAN_ENABLED (AP_BARO_BACKEND_DEFAULT_ENABLED && HAL_ENABLE_LIBUAVCAN_DRIVERS)
#ifndef AP_BARO_DRONECAN_ENABLED
#define AP_BARO_DRONECAN_ENABLED (AP_BARO_BACKEND_DEFAULT_ENABLED && HAL_ENABLE_LIBUAVCAN_DRIVERS)
#endif