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

AP_RangeFinder: change UAVCAN_ENABLED to DRONECAN_ENABLED

This commit is contained in:
Andrew Tridgell 2023-04-08 13:58:13 +10:00
parent 9d5815ce7b
commit 7b1337adaf
3 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_RangeFinder/AP_RangeFinder.cpp
View File

@ -488,7 +488,7 @@ void RangeFinder::detect_instance(uint8_t instance, uint8_t& serial_instance)
break;
case Type::UAVCAN:
#if AP_RANGEFINDER_UAVCAN_ENABLED
#if AP_RANGEFINDER_DRONECAN_ENABLED
/*
the UAVCAN driver gets created when we first receive a
measurement. We take the instance slot now, even if we don't

4
libraries/AP_RangeFinder/AP_RangeFinder_DroneCAN.cpp
View File

@ -1,6 +1,6 @@
#include "AP_RangeFinder_DroneCAN.h"
#if AP_RANGEFINDER_UAVCAN_ENABLED
#if AP_RANGEFINDER_DRONECAN_ENABLED
#include <AP_HAL/AP_HAL.h>
#include <AP_CANManager/AP_CANManager.h>
@ -161,4 +161,4 @@ void AP_RangeFinder_UAVCAN::handle_measurement(AP_DroneCAN *ap_dronecan, const C
}
}
#endif // AP_RANGEFINDER_UAVCAN_ENABLED
#endif // AP_RANGEFINDER_DRONECAN_ENABLED

8
libraries/AP_RangeFinder/AP_RangeFinder_DroneCAN.h
View File

@ -2,11 +2,11 @@
#include "AP_RangeFinder_Backend.h"
#ifndef AP_RANGEFINDER_UAVCAN_ENABLED
#define AP_RANGEFINDER_UAVCAN_ENABLED (HAL_ENABLE_LIBUAVCAN_DRIVERS && AP_RANGEFINDER_BACKEND_DEFAULT_ENABLED)
#ifndef AP_RANGEFINDER_DRONECAN_ENABLED
#define AP_RANGEFINDER_DRONECAN_ENABLED (HAL_ENABLE_LIBUAVCAN_DRIVERS && AP_RANGEFINDER_BACKEND_DEFAULT_ENABLED)
#endif
#if AP_RANGEFINDER_UAVCAN_ENABLED
#if AP_RANGEFINDER_DRONECAN_ENABLED
#include <AP_DroneCAN/AP_DroneCAN.h>
@ -39,4 +39,4 @@ private:
bool new_data;
MAV_DISTANCE_SENSOR _sensor_type;
};
#endif // AP_RANGEFINDER_UAVCAN_ENABLED
#endif // AP_RANGEFINDER_DRONECAN_ENABLED