mirror of https://github.com/ArduPilot/ardupilot
AP_CANManager: change namespace of MultiCopter and FixedWing params
this stops the libraries knowing anything about AP_Vehicle
This commit is contained in:
parent
bbae74c060
commit
6cf2136691
|
@ -17,7 +17,7 @@
|
|||
|
||||
#if HAL_MAX_CAN_PROTOCOL_DRIVERS && HAL_CANMANAGER_ENABLED
|
||||
#include "AP_CANManager.h"
|
||||
#include <AP_Vehicle/AP_Vehicle.h>
|
||||
#include <AP_Vehicle/AP_Vehicle_Type.h>
|
||||
|
||||
#include <AP_UAVCAN/AP_UAVCAN.h>
|
||||
#include <AP_PiccoloCAN/AP_PiccoloCAN.h>
|
||||
|
|
|
@ -22,7 +22,8 @@
|
|||
|
||||
#if HAL_CANMANAGER_ENABLED
|
||||
|
||||
#include <AP_Vehicle/AP_Vehicle.h>
|
||||
#include <AP_BoardConfig/AP_BoardConfig.h>
|
||||
#include <AP_Vehicle/AP_Vehicle_Type.h>
|
||||
#include <AP_UAVCAN/AP_UAVCAN.h>
|
||||
#include <AP_KDECAN/AP_KDECAN.h>
|
||||
#include <AP_SerialManager/AP_SerialManager.h>
|
||||
|
|
|
@ -24,7 +24,7 @@
|
|||
#if HAL_MAX_CAN_PROTOCOL_DRIVERS > 1 && !HAL_MINIMIZE_FEATURES && HAL_CANMANAGER_ENABLED && HAL_ENABLE_CANTESTER
|
||||
#include <AP_SerialManager/AP_SerialManager.h>
|
||||
#include <stdio.h>
|
||||
#include <AP_Vehicle/AP_Vehicle.h>
|
||||
#include <AP_Vehicle/AP_Vehicle_Type.h>
|
||||
#include <AP_UAVCAN/AP_UAVCAN.h>
|
||||
#include <uavcan/protocol/dynamic_node_id_client.hpp>
|
||||
#include <uavcan/equipment/esc/Status.hpp>
|
||||
|
|
|
@ -24,7 +24,7 @@
|
|||
#include "AP_CANManager.h"
|
||||
#include <AP_Math/AP_Math.h>
|
||||
#include <AP_HAL/utility/sparse-endian.h>
|
||||
#include <AP_Vehicle/AP_Vehicle.h>
|
||||
#include <AP_Vehicle/AP_Vehicle_Type.h>
|
||||
|
||||
#define debug_can(level_debug, fmt, args...) do { AP::can().log_text(level_debug, "TestKDECAN", fmt, ##args); } while (0)
|
||||
extern const AP_HAL::HAL& hal;
|
||||
|
|
|
@ -27,7 +27,7 @@
|
|||
|
||||
#include <AP_SerialManager/AP_SerialManager.h>
|
||||
#include <stdio.h>
|
||||
#include <AP_Vehicle/AP_Vehicle.h>
|
||||
#include <AP_Vehicle/AP_Vehicle_Type.h>
|
||||
|
||||
#define LOG_TAG "SLCAN"
|
||||
|
||||
|
|
Loading…
Reference in New Issue