mirror of https://github.com/ArduPilot/ardupilot
AP_Motors: standardize inclusion of libaries headers
This commit changes the way libraries headers are included in source files: - If the header is in the same directory the source belongs to, so the notation '#include ""' is used with the path relative to the directory containing the source. - If the header is outside the directory containing the source, then we use the notation '#include <>' with the path relative to libraries folder. Some of the advantages of such approach: - Only one search path for libraries headers. - OSs like Windows may have a better lookup time.
This commit is contained in:
parent
34d1a29ec1
commit
1e619c6c59
|
@ -20,8 +20,8 @@
|
|||
*
|
||||
*/
|
||||
|
||||
#include <AP_HAL.h>
|
||||
#include <AP_Math.h>
|
||||
#include <AP_HAL/AP_HAL.h>
|
||||
#include <AP_Math/AP_Math.h>
|
||||
#include "AP_MotorsCoax.h"
|
||||
|
||||
extern const AP_HAL::HAL& hal;
|
||||
|
|
|
@ -6,9 +6,9 @@
|
|||
#ifndef __AP_MOTORS_COAX_H__
|
||||
#define __AP_MOTORS_COAX_H__
|
||||
|
||||
#include <AP_Common.h>
|
||||
#include <AP_Math.h> // ArduPilot Mega Vector/Matrix math Library
|
||||
#include <RC_Channel.h> // RC Channel Library
|
||||
#include <AP_Common/AP_Common.h>
|
||||
#include <AP_Math/AP_Math.h> // ArduPilot Mega Vector/Matrix math Library
|
||||
#include <RC_Channel/RC_Channel.h> // RC Channel Library
|
||||
#include "AP_MotorsMulticopter.h"
|
||||
|
||||
// feedback direction
|
||||
|
|
|
@ -20,7 +20,7 @@
|
|||
*
|
||||
*/
|
||||
#include <stdlib.h>
|
||||
#include <AP_HAL.h>
|
||||
#include <AP_HAL/AP_HAL.h>
|
||||
#include "AP_MotorsHeli.h"
|
||||
|
||||
extern const AP_HAL::HAL& hal;
|
||||
|
|
|
@ -7,9 +7,9 @@
|
|||
#define __AP_MOTORS_HELI_H__
|
||||
|
||||
#include <inttypes.h>
|
||||
#include <AP_Common.h>
|
||||
#include <AP_Math.h> // ArduPilot Mega Vector/Matrix math Library
|
||||
#include <RC_Channel.h> // RC Channel Library
|
||||
#include <AP_Common/AP_Common.h>
|
||||
#include <AP_Math/AP_Math.h> // ArduPilot Mega Vector/Matrix math Library
|
||||
#include <RC_Channel/RC_Channel.h> // RC Channel Library
|
||||
#include "AP_Motors.h"
|
||||
|
||||
// maximum number of swashplate servos
|
||||
|
|
|
@ -6,9 +6,9 @@
|
|||
#ifndef __AP_MOTORS_HEXA_H__
|
||||
#define __AP_MOTORS_HEXA_H__
|
||||
|
||||
#include <AP_Common.h>
|
||||
#include <AP_Math.h> // ArduPilot Mega Vector/Matrix math Library
|
||||
#include <RC_Channel.h> // RC Channel Library
|
||||
#include <AP_Common/AP_Common.h>
|
||||
#include <AP_Math/AP_Math.h> // ArduPilot Mega Vector/Matrix math Library
|
||||
#include <RC_Channel/RC_Channel.h> // RC Channel Library
|
||||
#include "AP_MotorsMatrix.h" // Parent Motors Matrix library
|
||||
|
||||
/// @class AP_MotorsHexa
|
||||
|
|
|
@ -19,7 +19,7 @@
|
|||
* Code by RandyMackay. DIYDrones.com
|
||||
*
|
||||
*/
|
||||
#include <AP_HAL.h>
|
||||
#include <AP_HAL/AP_HAL.h>
|
||||
#include "AP_MotorsMatrix.h"
|
||||
|
||||
extern const AP_HAL::HAL& hal;
|
||||
|
|
|
@ -6,9 +6,9 @@
|
|||
#ifndef __AP_MOTORS_MATRIX_H__
|
||||
#define __AP_MOTORS_MATRIX_H__
|
||||
|
||||
#include <AP_Common.h>
|
||||
#include <AP_Math.h> // ArduPilot Mega Vector/Matrix math Library
|
||||
#include <RC_Channel.h> // RC Channel Library
|
||||
#include <AP_Common/AP_Common.h>
|
||||
#include <AP_Math/AP_Math.h> // ArduPilot Mega Vector/Matrix math Library
|
||||
#include <RC_Channel/RC_Channel.h> // RC Channel Library
|
||||
#include "AP_MotorsMulticopter.h"
|
||||
|
||||
#define AP_MOTORS_MATRIX_YAW_FACTOR_CW -1
|
||||
|
|
|
@ -21,7 +21,7 @@
|
|||
*/
|
||||
|
||||
#include "AP_MotorsMulticopter.h"
|
||||
#include <AP_HAL.h>
|
||||
#include <AP_HAL/AP_HAL.h>
|
||||
extern const AP_HAL::HAL& hal;
|
||||
|
||||
// parameters for the motor class
|
||||
|
|
|
@ -6,9 +6,9 @@
|
|||
#ifndef __AP_MOTORS_OCTA_H__
|
||||
#define __AP_MOTORS_OCTA_H__
|
||||
|
||||
#include <AP_Common.h>
|
||||
#include <AP_Math.h> // ArduPilot Mega Vector/Matrix math Library
|
||||
#include <RC_Channel.h> // RC Channel Library
|
||||
#include <AP_Common/AP_Common.h>
|
||||
#include <AP_Math/AP_Math.h> // ArduPilot Mega Vector/Matrix math Library
|
||||
#include <RC_Channel/RC_Channel.h> // RC Channel Library
|
||||
#include "AP_MotorsMatrix.h" // Parent Motors Matrix library
|
||||
|
||||
/// @class AP_MotorsOcta
|
||||
|
|
|
@ -6,9 +6,9 @@
|
|||
#ifndef __AP_MOTORS_OCTA_QUAD_H__
|
||||
#define __AP_MOTORS_OCTA_QUAD_H__
|
||||
|
||||
#include <AP_Common.h>
|
||||
#include <AP_Math.h> // ArduPilot Mega Vector/Matrix math Library
|
||||
#include <RC_Channel.h> // RC Channel Library
|
||||
#include <AP_Common/AP_Common.h>
|
||||
#include <AP_Math/AP_Math.h> // ArduPilot Mega Vector/Matrix math Library
|
||||
#include <RC_Channel/RC_Channel.h> // RC Channel Library
|
||||
#include "AP_MotorsMatrix.h" // Parent Motors Matrix library
|
||||
|
||||
/// @class AP_MotorsOcta
|
||||
|
|
|
@ -6,9 +6,9 @@
|
|||
#ifndef __AP_MOTORS_QUAD_H__
|
||||
#define __AP_MOTORS_QUAD_H__
|
||||
|
||||
#include <AP_Common.h>
|
||||
#include <AP_Math.h> // ArduPilot Mega Vector/Matrix math Library
|
||||
#include <RC_Channel.h> // RC Channel Library
|
||||
#include <AP_Common/AP_Common.h>
|
||||
#include <AP_Math/AP_Math.h> // ArduPilot Mega Vector/Matrix math Library
|
||||
#include <RC_Channel/RC_Channel.h> // RC Channel Library
|
||||
#include "AP_MotorsMatrix.h" // Parent Motors Matrix library
|
||||
|
||||
/// @class AP_MotorsQuad
|
||||
|
|
|
@ -20,8 +20,8 @@
|
|||
*
|
||||
*/
|
||||
|
||||
#include <AP_HAL.h>
|
||||
#include <AP_Math.h>
|
||||
#include <AP_HAL/AP_HAL.h>
|
||||
#include <AP_Math/AP_Math.h>
|
||||
#include "AP_MotorsSingle.h"
|
||||
|
||||
extern const AP_HAL::HAL& hal;
|
||||
|
|
|
@ -6,9 +6,9 @@
|
|||
#ifndef __AP_MOTORS_SING_H__
|
||||
#define __AP_MOTORS_SING_H__
|
||||
|
||||
#include <AP_Common.h>
|
||||
#include <AP_Math.h> // ArduPilot Mega Vector/Matrix math Library
|
||||
#include <RC_Channel.h> // RC Channel Library
|
||||
#include <AP_Common/AP_Common.h>
|
||||
#include <AP_Math/AP_Math.h> // ArduPilot Mega Vector/Matrix math Library
|
||||
#include <RC_Channel/RC_Channel.h> // RC Channel Library
|
||||
#include "AP_MotorsMulticopter.h"
|
||||
|
||||
// feedback direction
|
||||
|
|
|
@ -19,8 +19,8 @@
|
|||
* Code by RandyMackay. DIYDrones.com
|
||||
*
|
||||
*/
|
||||
#include <AP_HAL.h>
|
||||
#include <AP_Math.h>
|
||||
#include <AP_HAL/AP_HAL.h>
|
||||
#include <AP_Math/AP_Math.h>
|
||||
#include "AP_MotorsTri.h"
|
||||
|
||||
extern const AP_HAL::HAL& hal;
|
||||
|
|
|
@ -6,9 +6,9 @@
|
|||
#ifndef __AP_MOTORS_TRI_H__
|
||||
#define __AP_MOTORS_TRI_H__
|
||||
|
||||
#include <AP_Common.h>
|
||||
#include <AP_Math.h> // ArduPilot Mega Vector/Matrix math Library
|
||||
#include <RC_Channel.h> // RC Channel Library
|
||||
#include <AP_Common/AP_Common.h>
|
||||
#include <AP_Math/AP_Math.h> // ArduPilot Mega Vector/Matrix math Library
|
||||
#include <RC_Channel/RC_Channel.h> // RC Channel Library
|
||||
#include "AP_MotorsMulticopter.h"
|
||||
|
||||
// tail servo uses channel 7
|
||||
|
|
|
@ -6,10 +6,10 @@
|
|||
#ifndef __AP_MOTORS_Y6_H__
|
||||
#define __AP_MOTORS_Y6_H__
|
||||
|
||||
#include <AP_Common.h>
|
||||
#include <AP_Math.h> // ArduPilot Mega Vector/Matrix math Library
|
||||
#include <RC_Channel.h> // RC Channel Library
|
||||
#include <AP_MotorsMatrix.h> // Parent Motors Matrix library
|
||||
#include <AP_Common/AP_Common.h>
|
||||
#include <AP_Math/AP_Math.h> // ArduPilot Mega Vector/Matrix math Library
|
||||
#include <RC_Channel/RC_Channel.h> // RC Channel Library
|
||||
#include "AP_MotorsMatrix.h" // Parent Motors Matrix library
|
||||
|
||||
#define AP_MOTORS_Y6_YAW_DIRECTION 1 // this really should be a user selectable parameter
|
||||
|
||||
|
|
|
@ -21,7 +21,7 @@
|
|||
*/
|
||||
|
||||
#include "AP_Motors_Class.h"
|
||||
#include <AP_HAL.h>
|
||||
#include <AP_HAL/AP_HAL.h>
|
||||
extern const AP_HAL::HAL& hal;
|
||||
|
||||
// initialise motor map
|
||||
|
|
|
@ -3,12 +3,12 @@
|
|||
#ifndef __AP_MOTORS_CLASS_H__
|
||||
#define __AP_MOTORS_CLASS_H__
|
||||
|
||||
#include <AP_Common.h>
|
||||
#include <AP_Progmem.h>
|
||||
#include <AP_Math.h> // ArduPilot Mega Vector/Matrix math Library
|
||||
#include <AP_Notify.h> // Notify library
|
||||
#include <RC_Channel.h> // RC Channel Library
|
||||
#include <Filter.h> // filter library
|
||||
#include <AP_Common/AP_Common.h>
|
||||
#include <AP_Progmem/AP_Progmem.h>
|
||||
#include <AP_Math/AP_Math.h> // ArduPilot Mega Vector/Matrix math Library
|
||||
#include <AP_Notify/AP_Notify.h> // Notify library
|
||||
#include <RC_Channel/RC_Channel.h> // RC Channel Library
|
||||
#include <Filter/Filter.h> // filter library
|
||||
|
||||
// offsets for motors in motor_out, _motor_filtered and _motor_to_channel_map arrays
|
||||
#define AP_MOTORS_MOT_1 0
|
||||
|
|
|
@ -4,38 +4,38 @@
|
|||
*/
|
||||
|
||||
// Libraries
|
||||
#include <AP_Common.h>
|
||||
#include <AP_Progmem.h>
|
||||
#include <AP_Param.h>
|
||||
#include <AP_HAL.h>
|
||||
#include <AP_HAL_AVR.h>
|
||||
#include <AP_HAL_PX4.h>
|
||||
#include <AP_HAL_Linux.h>
|
||||
#include <AP_HAL_Empty.h>
|
||||
#include <AP_Math.h> // ArduPilot Mega Vector/Matrix math Library
|
||||
#include <RC_Channel.h> // RC Channel Library
|
||||
#include <AP_Motors.h>
|
||||
#include <AP_Curve.h>
|
||||
#include <AP_Notify.h>
|
||||
#include <AP_GPS.h>
|
||||
#include <DataFlash.h>
|
||||
#include <AP_InertialSensor.h>
|
||||
#include <AP_ADC.h>
|
||||
#include <GCS_MAVLink.h>
|
||||
#include <AP_Baro.h>
|
||||
#include <Filter.h>
|
||||
#include <AP_AHRS.h>
|
||||
#include <AP_Compass.h>
|
||||
#include <AP_Declination.h>
|
||||
#include <AP_Airspeed.h>
|
||||
#include <AP_Vehicle.h>
|
||||
#include <AP_ADC_AnalogSource.h>
|
||||
#include <AP_Mission.h>
|
||||
#include <StorageManager.h>
|
||||
#include <AP_Terrain.h>
|
||||
#include <AP_NavEKF.h>
|
||||
#include <AP_BattMonitor.h>
|
||||
#include <AP_RangeFinder.h>
|
||||
#include <AP_Common/AP_Common.h>
|
||||
#include <AP_Progmem/AP_Progmem.h>
|
||||
#include <AP_Param/AP_Param.h>
|
||||
#include <AP_HAL/AP_HAL.h>
|
||||
#include <AP_HAL_AVR/AP_HAL_AVR.h>
|
||||
#include <AP_HAL_PX4/AP_HAL_PX4.h>
|
||||
#include <AP_HAL_Linux/AP_HAL_Linux.h>
|
||||
#include <AP_HAL_Empty/AP_HAL_Empty.h>
|
||||
#include <AP_Math/AP_Math.h> // ArduPilot Mega Vector/Matrix math Library
|
||||
#include <RC_Channel/RC_Channel.h> // RC Channel Library
|
||||
#include <AP_Motors/AP_Motors.h>
|
||||
#include <AP_Curve/AP_Curve.h>
|
||||
#include <AP_Notify/AP_Notify.h>
|
||||
#include <AP_GPS/AP_GPS.h>
|
||||
#include <DataFlash/DataFlash.h>
|
||||
#include <AP_InertialSensor/AP_InertialSensor.h>
|
||||
#include <AP_ADC/AP_ADC.h>
|
||||
#include <GCS_MAVLink/GCS_MAVLink.h>
|
||||
#include <AP_Baro/AP_Baro.h>
|
||||
#include <Filter/Filter.h>
|
||||
#include <AP_AHRS/AP_AHRS.h>
|
||||
#include <AP_Compass/AP_Compass.h>
|
||||
#include <AP_Declination/AP_Declination.h>
|
||||
#include <AP_Airspeed/AP_Airspeed.h>
|
||||
#include <AP_Vehicle/AP_Vehicle.h>
|
||||
#include <AP_ADC_AnalogSource/AP_ADC_AnalogSource.h>
|
||||
#include <AP_Mission/AP_Mission.h>
|
||||
#include <StorageManager/StorageManager.h>
|
||||
#include <AP_Terrain/AP_Terrain.h>
|
||||
#include <AP_NavEKF/AP_NavEKF.h>
|
||||
#include <AP_BattMonitor/AP_BattMonitor.h>
|
||||
#include <AP_RangeFinder/AP_RangeFinder.h>
|
||||
|
||||
const AP_HAL::HAL& hal = AP_HAL_BOARD_DRIVER;
|
||||
|
||||
|
|
|
@ -4,38 +4,38 @@
|
|||
*/
|
||||
|
||||
// Libraries
|
||||
#include <AP_Common.h>
|
||||
#include <AP_Progmem.h>
|
||||
#include <AP_Param.h>
|
||||
#include <AP_HAL.h>
|
||||
#include <AP_HAL_AVR.h>
|
||||
#include <AP_HAL_PX4.h>
|
||||
#include <AP_HAL_Linux.h>
|
||||
#include <AP_HAL_Empty.h>
|
||||
#include <AP_Math.h> // ArduPilot Mega Vector/Matrix math Library
|
||||
#include <RC_Channel.h> // RC Channel Library
|
||||
#include <AP_Motors.h>
|
||||
#include <AP_Curve.h>
|
||||
#include <AP_Notify.h>
|
||||
#include <AP_GPS.h>
|
||||
#include <DataFlash.h>
|
||||
#include <AP_InertialSensor.h>
|
||||
#include <AP_ADC.h>
|
||||
#include <GCS_MAVLink.h>
|
||||
#include <AP_Baro.h>
|
||||
#include <Filter.h>
|
||||
#include <AP_AHRS.h>
|
||||
#include <AP_Compass.h>
|
||||
#include <AP_Declination.h>
|
||||
#include <AP_Airspeed.h>
|
||||
#include <AP_Vehicle.h>
|
||||
#include <AP_ADC_AnalogSource.h>
|
||||
#include <AP_Mission.h>
|
||||
#include <StorageManager.h>
|
||||
#include <AP_Terrain.h>
|
||||
#include <AP_NavEKF.h>
|
||||
#include <AP_BattMonitor.h>
|
||||
#include <AP_RangeFinder.h>
|
||||
#include <AP_Common/AP_Common.h>
|
||||
#include <AP_Progmem/AP_Progmem.h>
|
||||
#include <AP_Param/AP_Param.h>
|
||||
#include <AP_HAL/AP_HAL.h>
|
||||
#include <AP_HAL_AVR/AP_HAL_AVR.h>
|
||||
#include <AP_HAL_PX4/AP_HAL_PX4.h>
|
||||
#include <AP_HAL_Linux/AP_HAL_Linux.h>
|
||||
#include <AP_HAL_Empty/AP_HAL_Empty.h>
|
||||
#include <AP_Math/AP_Math.h> // ArduPilot Mega Vector/Matrix math Library
|
||||
#include <RC_Channel/RC_Channel.h> // RC Channel Library
|
||||
#include <AP_Motors/AP_Motors.h>
|
||||
#include <AP_Curve/AP_Curve.h>
|
||||
#include <AP_Notify/AP_Notify.h>
|
||||
#include <AP_GPS/AP_GPS.h>
|
||||
#include <DataFlash/DataFlash.h>
|
||||
#include <AP_InertialSensor/AP_InertialSensor.h>
|
||||
#include <AP_ADC/AP_ADC.h>
|
||||
#include <GCS_MAVLink/GCS_MAVLink.h>
|
||||
#include <AP_Baro/AP_Baro.h>
|
||||
#include <Filter/Filter.h>
|
||||
#include <AP_AHRS/AP_AHRS.h>
|
||||
#include <AP_Compass/AP_Compass.h>
|
||||
#include <AP_Declination/AP_Declination.h>
|
||||
#include <AP_Airspeed/AP_Airspeed.h>
|
||||
#include <AP_Vehicle/AP_Vehicle.h>
|
||||
#include <AP_ADC_AnalogSource/AP_ADC_AnalogSource.h>
|
||||
#include <AP_Mission/AP_Mission.h>
|
||||
#include <StorageManager/StorageManager.h>
|
||||
#include <AP_Terrain/AP_Terrain.h>
|
||||
#include <AP_NavEKF/AP_NavEKF.h>
|
||||
#include <AP_BattMonitor/AP_BattMonitor.h>
|
||||
#include <AP_RangeFinder/AP_RangeFinder.h>
|
||||
|
||||
const AP_HAL::HAL& hal = AP_HAL_BOARD_DRIVER;
|
||||
|
||||
|
|
Loading…
Reference in New Issue