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

AP_GPS: 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:
Gustavo Jose de Sousa 2015-08-11 16:28:43 +10:00 committed by Randy Mackay
parent 967308577d
commit 71eb9ed24e
18 changed files with 107 additions and 107 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libraries/AP_GPS/AP_GPS.cpp
View File

@ -14,11 +14,11 @@
along with this program. If not, see <http://www.gnu.org/licenses/>. along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include <AP_Common.h> #include <AP_Common/AP_Common.h>
#include <AP_Math.h> #include <AP_Math/AP_Math.h>
#include <AP_HAL.h> #include <AP_HAL/AP_HAL.h>
#include <AP_Notify.h> #include <AP_Notify/AP_Notify.h>
#include <AP_GPS.h> #include "AP_GPS.h"
extern const AP_HAL::HAL& hal; extern const AP_HAL::HAL& hal;

30
libraries/AP_GPS/AP_GPS.h
View File

@ -17,14 +17,14 @@
#ifndef __AP_GPS_H__ #ifndef __AP_GPS_H__
#define __AP_GPS_H__ #define __AP_GPS_H__
#include <AP_HAL.h> #include <AP_HAL/AP_HAL.h>
#include <inttypes.h> #include <inttypes.h>
#include <AP_Progmem.h> #include <AP_Progmem/AP_Progmem.h>
#include <AP_Common.h> #include <AP_Common/AP_Common.h>
#include <AP_Param.h> #include <AP_Param/AP_Param.h>
#include <AP_Math.h> #include <AP_Math/AP_Math.h>
#include <GCS_MAVLink.h> #include <GCS_MAVLink/GCS_MAVLink.h>
#include <AP_Vehicle.h> #include <AP_Vehicle/AP_Vehicle.h>
#include "GPS_detect_state.h" #include "GPS_detect_state.h"
#include "../AP_SerialManager/AP_SerialManager.h" #include "../AP_SerialManager/AP_SerialManager.h"
@ -416,13 +416,13 @@ private:
#define GPS_BAUD_TIME_MS 1200 #define GPS_BAUD_TIME_MS 1200
#include <GPS_Backend.h> #include "GPS_Backend.h"
#include <AP_GPS_UBLOX.h> #include "AP_GPS_UBLOX.h"
#include <AP_GPS_MTK.h> #include "AP_GPS_MTK.h"
#include <AP_GPS_MTK19.h> #include "AP_GPS_MTK19.h"
#include <AP_GPS_NMEA.h> #include "AP_GPS_NMEA.h"
#include <AP_GPS_SIRF.h> #include "AP_GPS_SIRF.h"
#include <AP_GPS_SBP.h> #include "AP_GPS_SBP.h"
#include <AP_GPS_PX4.h> #include "AP_GPS_PX4.h"
#endif // __AP_GPS_H__ #endif // __AP_GPS_H__

2
libraries/AP_GPS/AP_GPS_MTK.cpp
View File

@ -21,7 +21,7 @@
// GPS configuration : Custom protocol per "DIYDrones Custom Binary Sentence Specification V1.1" // GPS configuration : Custom protocol per "DIYDrones Custom Binary Sentence Specification V1.1"
// //
#include <AP_GPS.h> #include "AP_GPS.h"
#include "AP_GPS_MTK.h" #include "AP_GPS_MTK.h"
// initialisation blobs to send to the GPS to try to get it into the // initialisation blobs to send to the GPS to try to get it into the

2
libraries/AP_GPS/AP_GPS_MTK.h
View File

@ -25,7 +25,7 @@
#ifndef __AP_GPS_MTK_H__ #ifndef __AP_GPS_MTK_H__
#define __AP_GPS_MTK_H__ #define __AP_GPS_MTK_H__
#include <AP_GPS.h> #include "AP_GPS.h"
#include "AP_GPS_MTK_Common.h" #include "AP_GPS_MTK_Common.h"
class AP_GPS_MTK : public AP_GPS_Backend { class AP_GPS_MTK : public AP_GPS_Backend {

2
libraries/AP_GPS/AP_GPS_MTK19.h
View File

@ -23,7 +23,7 @@
#ifndef AP_GPS_MTK19_h #ifndef AP_GPS_MTK19_h
#define AP_GPS_MTK19_h #define AP_GPS_MTK19_h
#include <AP_GPS.h> #include "AP_GPS.h"
#include "AP_GPS_MTK_Common.h" #include "AP_GPS_MTK_Common.h"
#define MTK_GPS_REVISION_V16 16 #define MTK_GPS_REVISION_V16 16

4
libraries/AP_GPS/AP_GPS_NMEA.cpp
View File

@ -29,9 +29,9 @@
/// TinyGPS parser by Mikal Hart. /// TinyGPS parser by Mikal Hart.
/// ///
#include <AP_Common.h> #include <AP_Common/AP_Common.h>
#include <AP_Progmem.h> #include <AP_Progmem/AP_Progmem.h>
#include <ctype.h> #include <ctype.h>
#include <stdint.h> #include <stdint.h>
#include <stdlib.h> #include <stdlib.h>

2
libraries/AP_GPS/AP_GPS_NMEA.h
View File

@ -47,7 +47,7 @@
#ifndef __AP_GPS_NMEA_H__ #ifndef __AP_GPS_NMEA_H__
#define __AP_GPS_NMEA_H__ #define __AP_GPS_NMEA_H__
#include <AP_GPS.h> #include "AP_GPS.h"
/// NMEA parser /// NMEA parser
/// ///

2
libraries/AP_GPS/AP_GPS_PX4.cpp
View File

@ -22,7 +22,7 @@
// //
// Code by Holger Steinhaus // Code by Holger Steinhaus
#include <AP_HAL.h> #include <AP_HAL/AP_HAL.h>
#if CONFIG_HAL_BOARD == HAL_BOARD_PX4 #if CONFIG_HAL_BOARD == HAL_BOARD_PX4
#include "AP_GPS_PX4.h" #include "AP_GPS_PX4.h"

4
libraries/AP_GPS/AP_GPS_PX4.h
View File

@ -21,8 +21,8 @@
#ifndef __AP_GPS_PX4_H__ #ifndef __AP_GPS_PX4_H__
#define __AP_GPS_PX4_H__ #define __AP_GPS_PX4_H__
#include <AP_HAL.h> #include <AP_HAL/AP_HAL.h>
#include <AP_GPS.h> #include "AP_GPS.h"
#if CONFIG_HAL_BOARD == HAL_BOARD_PX4 #if CONFIG_HAL_BOARD == HAL_BOARD_PX4
#include <modules/uORB/topics/vehicle_gps_position.h> #include <modules/uORB/topics/vehicle_gps_position.h>

4
libraries/AP_GPS/AP_GPS_SBP.cpp
View File

@ -21,9 +21,9 @@
// Swift Binary Protocol format: http://docs.swift-nav.com/ // Swift Binary Protocol format: http://docs.swift-nav.com/
// //
#include <AP_GPS.h> #include "AP_GPS.h"
#include "AP_GPS_SBP.h" #include "AP_GPS_SBP.h"
#include <DataFlash.h> #include <DataFlash/DataFlash.h>
#if GPS_RTK_AVAILABLE #if GPS_RTK_AVAILABLE

2
libraries/AP_GPS/AP_GPS_SBP.h
View File

@ -24,7 +24,7 @@
#ifndef __AP_GPS_SBP_H__ #ifndef __AP_GPS_SBP_H__
#define __AP_GPS_SBP_H__ #define __AP_GPS_SBP_H__
#include <AP_GPS.h> #include "AP_GPS.h"
class AP_GPS_SBP : public AP_GPS_Backend class AP_GPS_SBP : public AP_GPS_Backend
{ {

6
libraries/AP_GPS/AP_GPS_SIRF.h
View File

@ -21,9 +21,9 @@
#ifndef __AP_GPS_SIRF_H__ #ifndef __AP_GPS_SIRF_H__
#define __AP_GPS_SIRF_H__ #define __AP_GPS_SIRF_H__
#include <AP_HAL.h> #include <AP_HAL/AP_HAL.h>
#include <AP_Common.h> #include <AP_Common/AP_Common.h>
#include <AP_GPS.h> #include "AP_GPS.h"
#define SIRF_SET_BINARY "$PSRF100,0,38400,8,1,0*3C\r\n" #define SIRF_SET_BINARY "$PSRF100,0,38400,8,1,0*3C\r\n"

4
libraries/AP_GPS/AP_GPS_UBLOX.cpp
View File

@ -19,9 +19,9 @@
// Origin code by Michael Smith, Jordi Munoz and Jose Julio, DIYDrones.com // Origin code by Michael Smith, Jordi Munoz and Jose Julio, DIYDrones.com
// Substantially rewitten for new GPS driver structure by Andrew Tridgell // Substantially rewitten for new GPS driver structure by Andrew Tridgell
// //
#include <AP_GPS.h> #include "AP_GPS.h"
#include "AP_GPS_UBLOX.h" #include "AP_GPS_UBLOX.h"
#include <DataFlash.h> #include <DataFlash/DataFlash.h>
#if CONFIG_HAL_BOARD_SUBTYPE == HAL_BOARD_SUBTYPE_LINUX_NAVIO #if CONFIG_HAL_BOARD_SUBTYPE == HAL_BOARD_SUBTYPE_LINUX_NAVIO
#define UBLOX_VERSION_AUTODETECTION 1 #define UBLOX_VERSION_AUTODETECTION 1

4
libraries/AP_GPS/AP_GPS_UBLOX.h
View File

@ -23,8 +23,8 @@
#ifndef __AP_GPS_UBLOX_H__ #ifndef __AP_GPS_UBLOX_H__
#define __AP_GPS_UBLOX_H__ #define __AP_GPS_UBLOX_H__
#include <AP_HAL.h> #include <AP_HAL/AP_HAL.h>
#include <AP_GPS.h> #include "AP_GPS.h"
/* /*
* try to put a UBlox into binary mode. This is in two parts. * try to put a UBlox into binary mode. This is in two parts.

2
libraries/AP_GPS/GPS_Backend.cpp
View File

@ -14,7 +14,7 @@
along with this program. If not, see <http://www.gnu.org/licenses/>. along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include <AP_GPS.h> #include "AP_GPS.h"
extern const AP_HAL::HAL& hal; extern const AP_HAL::HAL& hal;

4
libraries/AP_GPS/GPS_Backend.h
View File

@ -20,8 +20,8 @@
#ifndef __AP_GPS_BACKEND_H__ #ifndef __AP_GPS_BACKEND_H__
#define __AP_GPS_BACKEND_H__ #define __AP_GPS_BACKEND_H__
#include <GCS_MAVLink.h> #include <GCS_MAVLink/GCS_MAVLink.h>
#include <AP_GPS.h> #include "AP_GPS.h"
class AP_GPS_Backend class AP_GPS_Backend
{ {

68
libraries/AP_GPS/examples/GPS_AUTO_test/GPS_AUTO_test.cpp
View File

@ -5,40 +5,40 @@
#include <stdlib.h> #include <stdlib.h>
#include <AP_Common.h> #include <AP_Common/AP_Common.h>
#include <AP_Progmem.h> #include <AP_Progmem/AP_Progmem.h>
#include <AP_Param.h> #include <AP_Param/AP_Param.h>
#include <AP_HAL.h> #include <AP_HAL/AP_HAL.h>
#include <AP_HAL_AVR.h> #include <AP_HAL_AVR/AP_HAL_AVR.h>
#include <AP_HAL_SITL.h> #include <AP_HAL_SITL/AP_HAL_SITL.h>
#include <AP_HAL_PX4.h> #include <AP_HAL_PX4/AP_HAL_PX4.h>
#include <AP_HAL_Linux.h> #include <AP_HAL_Linux/AP_HAL_Linux.h>
#include <AP_HAL_Empty.h> #include <AP_HAL_Empty/AP_HAL_Empty.h>
#include <AP_GPS.h> #include <AP_GPS/AP_GPS.h>
#include <DataFlash.h> #include <DataFlash/DataFlash.h>
#include <AP_InertialSensor.h> #include <AP_InertialSensor/AP_InertialSensor.h>
#include <AP_ADC.h> #include <AP_ADC/AP_ADC.h>
#include <GCS_MAVLink.h> #include <GCS_MAVLink/GCS_MAVLink.h>
#include <AP_Baro.h> #include <AP_Baro/AP_Baro.h>
#include <Filter.h> #include <Filter/Filter.h>
#include <AP_AHRS.h> #include <AP_AHRS/AP_AHRS.h>
#include <AP_Compass.h> #include <AP_Compass/AP_Compass.h>
#include <AP_Declination.h> #include <AP_Declination/AP_Declination.h>
#include <AP_Airspeed.h> #include <AP_Airspeed/AP_Airspeed.h>
#include <AP_Vehicle.h> #include <AP_Vehicle/AP_Vehicle.h>
#include <AP_ADC_AnalogSource.h> #include <AP_ADC_AnalogSource/AP_ADC_AnalogSource.h>
#include <AP_Mission.h> #include <AP_Mission/AP_Mission.h>
#include <StorageManager.h> #include <StorageManager/StorageManager.h>
#include <AP_Terrain.h> #include <AP_Terrain/AP_Terrain.h>
#include <AP_Math.h> #include <AP_Math/AP_Math.h>
#include <AP_Notify.h> #include <AP_Notify/AP_Notify.h>
#include <AP_BoardLED.h> #include <AP_Notify/AP_BoardLED.h>
#include <AP_NavEKF.h> #include <AP_NavEKF/AP_NavEKF.h>
#include <AP_Rally.h> #include <AP_Rally/AP_Rally.h>
#include <AP_Scheduler.h> #include <AP_Scheduler/AP_Scheduler.h>
#include <AP_BattMonitor.h> #include <AP_BattMonitor/AP_BattMonitor.h>
#include <AP_SerialManager.h> #include <AP_SerialManager/AP_SerialManager.h>
#include <AP_RangeFinder.h> #include <AP_RangeFinder/AP_RangeFinder.h>
const AP_HAL::HAL& hal = AP_HAL_BOARD_DRIVER; const AP_HAL::HAL& hal = AP_HAL_BOARD_DRIVER;

62
libraries/AP_GPS/examples/GPS_UBLOX_passthrough/GPS_UBLOX_passthrough.cpp
View File

@ -7,37 +7,37 @@
*/ */
#include <stdlib.h> #include <stdlib.h>
#include <AP_Common.h> #include <AP_Common/AP_Common.h>
#include <AP_Progmem.h> #include <AP_Progmem/AP_Progmem.h>
#include <AP_Param.h> #include <AP_Param/AP_Param.h>
#include <AP_HAL.h> #include <AP_HAL/AP_HAL.h>
#include <AP_HAL_AVR.h> #include <AP_HAL_AVR/AP_HAL_AVR.h>
#include <AP_HAL_Empty.h> #include <AP_HAL_Empty/AP_HAL_Empty.h>
#include <AP_HAL_PX4.h> #include <AP_HAL_PX4/AP_HAL_PX4.h>
#include <AP_HAL_Linux.h> #include <AP_HAL_Linux/AP_HAL_Linux.h>
#include <AP_GPS.h> #include <AP_GPS/AP_GPS.h>
#include <DataFlash.h> #include <DataFlash/DataFlash.h>
#include <AP_InertialSensor.h> #include <AP_InertialSensor/AP_InertialSensor.h>
#include <AP_ADC.h> #include <AP_ADC/AP_ADC.h>
#include <GCS_MAVLink.h> #include <GCS_MAVLink/GCS_MAVLink.h>
#include <AP_Baro.h> #include <AP_Baro/AP_Baro.h>
#include <Filter.h> #include <Filter/Filter.h>
#include <AP_AHRS.h> #include <AP_AHRS/AP_AHRS.h>
#include <AP_Compass.h> #include <AP_Compass/AP_Compass.h>
#include <AP_Declination.h> #include <AP_Declination/AP_Declination.h>
#include <AP_Airspeed.h> #include <AP_Airspeed/AP_Airspeed.h>
#include <AP_Vehicle.h> #include <AP_Vehicle/AP_Vehicle.h>
#include <AP_ADC_AnalogSource.h> #include <AP_ADC_AnalogSource/AP_ADC_AnalogSource.h>
#include <AP_Mission.h> #include <AP_Mission/AP_Mission.h>
#include <StorageManager.h> #include <StorageManager/StorageManager.h>
#include <AP_Terrain.h> #include <AP_Terrain/AP_Terrain.h>
#include <AP_Math.h> #include <AP_Math/AP_Math.h>
#include <AP_Notify.h> #include <AP_Notify/AP_Notify.h>
#include <AP_NavEKF.h> #include <AP_NavEKF/AP_NavEKF.h>
#include <AP_Rally.h> #include <AP_Rally/AP_Rally.h>
#include <AP_Scheduler.h> #include <AP_Scheduler/AP_Scheduler.h>
#include <AP_BattMonitor.h> #include <AP_BattMonitor/AP_BattMonitor.h>
#include <AP_RangeFinder.h> #include <AP_RangeFinder/AP_RangeFinder.h>
const AP_HAL::HAL& hal = AP_HAL_BOARD_DRIVER; const AP_HAL::HAL& hal = AP_HAL_BOARD_DRIVER;