AP_OpticalFlow: move to using CANManager library

This commit is contained in:
Siddharth Purohit 2020-05-31 18:06:07 +05:30 committed by Andrew Tridgell
parent 81c7099848
commit 8a31448709
3 changed files with 6 additions and 8 deletions

View File

@ -1,18 +1,16 @@
#include <AP_HAL/AP_HAL.h>
#if HAL_WITH_UAVCAN
#if HAL_ENABLE_LIBUAVCAN_DRIVERS
#include "AP_OpticalFlow_HereFlow.h"
#include <AP_BoardConfig/AP_BoardConfig_CAN.h>
#include <AP_CANManager/AP_CANManager.h>
#include <AP_UAVCAN/AP_UAVCAN.h>
#include <com/hex/equipment/flow/Measurement.hpp>
extern const AP_HAL::HAL& hal;
#define debug_flow_uavcan(level_debug, can_driver, fmt, args...) do { if ((level_debug) <= AP::can().get_debug_level_driver(can_driver)) { hal.console->printf(fmt, ##args); }} while (0)
//UAVCAN Frontend Registry Binder
UC_REGISTRY_BINDER(MeasurementCb, com::hex::equipment::flow::Measurement);
@ -103,5 +101,5 @@ void AP_OpticalFlow_HereFlow::_push_state(void)
new_data = false;
}
#endif // HAL_WITH_UAVCAN
#endif // HAL_ENABLE_LIBUAVCAN_DRIVERS

View File

@ -1,7 +1,7 @@
#pragma once
#include "OpticalFlow_backend.h"
#if HAL_WITH_UAVCAN
#if HAL_ENABLE_LIBUAVCAN_DRIVERS
#include <AP_UAVCAN/AP_UAVCAN.h>
@ -32,4 +32,4 @@ private:
void _push_state(void);
};
#endif //HAL_WITH_UAVCAN
#endif //HAL_ENABLE_LIBUAVCAN_DRIVERS

View File

@ -131,7 +131,7 @@ void OpticalFlow::init(uint32_t log_bit)
backend = AP_OpticalFlow_MAV::detect(*this);
break;
case OpticalFlowType::UAVCAN:
#if HAL_WITH_UAVCAN
#if HAL_ENABLE_LIBUAVCAN_DRIVERS
backend = new AP_OpticalFlow_HereFlow(*this);
#endif
break;