From 13753a192e263879026afebbc1e68a4e04c1a5b6 Mon Sep 17 00:00:00 2001
From: Gustavo Jose de Sousa <gustavo.sousa@intel.com>
Date: Tue, 11 Aug 2015 16:28:42 +1000
Subject: [PATCH] AP_BattMonitor: 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.
---
 libraries/AP_BattMonitor/AP_BattMonitor.h     |  6 +-
 .../AP_BattMonitor/AP_BattMonitor_Analog.cpp  |  6 +-
 .../AP_BattMonitor/AP_BattMonitor_Analog.h    |  4 +-
 .../AP_BattMonitor/AP_BattMonitor_Backend.cpp |  4 +-
 .../AP_BattMonitor/AP_BattMonitor_Backend.h   |  4 +-
 .../AP_BattMonitor/AP_BattMonitor_Bebop.cpp   |  4 +-
 .../AP_BattMonitor/AP_BattMonitor_Bebop.h     |  4 +-
 .../AP_BattMonitor/AP_BattMonitor_SMBus.h     |  6 +-
 .../AP_BattMonitor_SMBus_I2C.cpp              |  8 +--
 .../AP_BattMonitor/AP_BattMonitor_SMBus_I2C.h |  6 +-
 .../AP_BattMonitor_SMBus_PX4.cpp              |  2 +-
 .../AP_BattMonitor/AP_BattMonitor_SMBus_PX4.h |  6 +-
 .../AP_BattMonitor_test.cpp                   | 58 +++++++++----------
 13 files changed, 59 insertions(+), 59 deletions(-)

diff --git a/libraries/AP_BattMonitor/AP_BattMonitor.h b/libraries/AP_BattMonitor/AP_BattMonitor.h
index 98f8f5311b..ab9721b873 100644
--- a/libraries/AP_BattMonitor/AP_BattMonitor.h
+++ b/libraries/AP_BattMonitor/AP_BattMonitor.h
@@ -2,9 +2,9 @@
 #ifndef AP_BATTMONITOR_H
 #define AP_BATTMONITOR_H
 
-#include <AP_Common.h>
-#include <AP_Param.h>
-#include <AP_Math.h>
+#include <AP_Common/AP_Common.h>
+#include <AP_Param/AP_Param.h>
+#include <AP_Math/AP_Math.h>
 
 // maximum number of battery monitors
 #define AP_BATT_MONITOR_MAX_INSTANCES       2
diff --git a/libraries/AP_BattMonitor/AP_BattMonitor_Analog.cpp b/libraries/AP_BattMonitor/AP_BattMonitor_Analog.cpp
index 61f5cd547e..991d6bad19 100644
--- a/libraries/AP_BattMonitor/AP_BattMonitor_Analog.cpp
+++ b/libraries/AP_BattMonitor/AP_BattMonitor_Analog.cpp
@@ -1,7 +1,7 @@
 /// -*- tab-width: 4; Mode: C++; c-basic-offset: 4; indent-tabs-mode: nil -*-
-#include <AP_HAL.h>
-#include <AP_Common.h>
-#include <AP_Math.h>
+#include <AP_HAL/AP_HAL.h>
+#include <AP_Common/AP_Common.h>
+#include <AP_Math/AP_Math.h>
 #include "AP_BattMonitor.h"
 #include "AP_BattMonitor_Analog.h"
 
diff --git a/libraries/AP_BattMonitor/AP_BattMonitor_Analog.h b/libraries/AP_BattMonitor/AP_BattMonitor_Analog.h
index a5f9cd87f4..4a6f85040f 100644
--- a/libraries/AP_BattMonitor/AP_BattMonitor_Analog.h
+++ b/libraries/AP_BattMonitor/AP_BattMonitor_Analog.h
@@ -2,8 +2,8 @@
 #ifndef AP_BATTMONITOR_ANALOG_H
 #define AP_BATTMONITOR_ANALOG_H
 
-#include <AP_ADC.h>                 // ArduPilot Mega Analog to Digital Converter Library
-#include <AP_ADC_AnalogSource.h>
+#include <AP_ADC/AP_ADC.h>                 // ArduPilot Mega Analog to Digital Converter Library
+#include <AP_ADC_AnalogSource/AP_ADC_AnalogSource.h>
 #include "AP_BattMonitor.h"
 #include "AP_BattMonitor_Backend.h"
 
diff --git a/libraries/AP_BattMonitor/AP_BattMonitor_Backend.cpp b/libraries/AP_BattMonitor/AP_BattMonitor_Backend.cpp
index c63f6d13a6..ffa25c437a 100644
--- a/libraries/AP_BattMonitor/AP_BattMonitor_Backend.cpp
+++ b/libraries/AP_BattMonitor/AP_BattMonitor_Backend.cpp
@@ -14,8 +14,8 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <AP_Common.h>
-#include <AP_HAL.h>
+#include <AP_Common/AP_Common.h>
+#include <AP_HAL/AP_HAL.h>
 #include "AP_BattMonitor.h"
 #include "AP_BattMonitor_Backend.h"
 
diff --git a/libraries/AP_BattMonitor/AP_BattMonitor_Backend.h b/libraries/AP_BattMonitor/AP_BattMonitor_Backend.h
index 7b84c97108..86bab451bd 100644
--- a/libraries/AP_BattMonitor/AP_BattMonitor_Backend.h
+++ b/libraries/AP_BattMonitor/AP_BattMonitor_Backend.h
@@ -17,8 +17,8 @@
 #ifndef __AP_BATTMONITOR_BACKEND_H__
 #define __AP_BATTMONITOR_BACKEND_H__
 
-#include <AP_Common.h>
-#include <AP_HAL.h>
+#include <AP_Common/AP_Common.h>
+#include <AP_HAL/AP_HAL.h>
 #include "AP_BattMonitor.h"
 
 class AP_BattMonitor_Backend
diff --git a/libraries/AP_BattMonitor/AP_BattMonitor_Bebop.cpp b/libraries/AP_BattMonitor/AP_BattMonitor_Bebop.cpp
index a65ac5dcb2..df7fa34dc1 100644
--- a/libraries/AP_BattMonitor/AP_BattMonitor_Bebop.cpp
+++ b/libraries/AP_BattMonitor/AP_BattMonitor_Bebop.cpp
@@ -15,13 +15,13 @@
  */
 
 
-#include <AP_HAL.h>
+#include <AP_HAL/AP_HAL.h>
 
 #if CONFIG_HAL_BOARD_TYPE == CONFIG_HAL_BOARD_TYPE_LINUX && \
     CONFIG_HAL_BOARD_SUBTYPE == HAL_BOARD_SUBTYPE_LINUX_BEBOP
 
 #include "AP_BattMonitor_Bebop.h"
-#include "RCOutput_Bebop.h"
+#include <AP_HAL_Linux/RCOutput_Bebop.h>
 
 extern const AP_HAL::HAL& hal;
 
diff --git a/libraries/AP_BattMonitor/AP_BattMonitor_Bebop.h b/libraries/AP_BattMonitor/AP_BattMonitor_Bebop.h
index 9f1e6a420f..0535b7e313 100644
--- a/libraries/AP_BattMonitor/AP_BattMonitor_Bebop.h
+++ b/libraries/AP_BattMonitor/AP_BattMonitor_Bebop.h
@@ -17,8 +17,8 @@
 #ifndef __AP_BATTMONITOR_BEBOP_H__
 #define __AP_BATTMONITOR_BEBOP_H__
 
-#include <AP_Common.h>
-#include <AP_HAL.h>
+#include <AP_Common/AP_Common.h>
+#include <AP_HAL/AP_HAL.h>
 #include "AP_BattMonitor_Backend.h"
 
 class AP_BattMonitor_Bebop :public AP_BattMonitor_Backend
diff --git a/libraries/AP_BattMonitor/AP_BattMonitor_SMBus.h b/libraries/AP_BattMonitor/AP_BattMonitor_SMBus.h
index 444e1df333..110b87492a 100644
--- a/libraries/AP_BattMonitor/AP_BattMonitor_SMBus.h
+++ b/libraries/AP_BattMonitor/AP_BattMonitor_SMBus.h
@@ -2,9 +2,9 @@
 #ifndef AP_BATTMONITOR_SMBUS_H
 #define AP_BATTMONITOR_SMBUS_H
 
-#include <AP_Common.h>
-#include <AP_Param.h>
-#include <AP_Math.h>
+#include <AP_Common/AP_Common.h>
+#include <AP_Param/AP_Param.h>
+#include <AP_Math/AP_Math.h>
 #include "AP_BattMonitor_Backend.h"
 
 #define AP_BATTMONITOR_SMBUS_TIMEOUT_MICROS 5000000    // sensor becomes unhealthy if no successful readings for 5 seconds
diff --git a/libraries/AP_BattMonitor/AP_BattMonitor_SMBus_I2C.cpp b/libraries/AP_BattMonitor/AP_BattMonitor_SMBus_I2C.cpp
index af8be9c5ba..011161ad75 100644
--- a/libraries/AP_BattMonitor/AP_BattMonitor_SMBus_I2C.cpp
+++ b/libraries/AP_BattMonitor/AP_BattMonitor_SMBus_I2C.cpp
@@ -1,13 +1,13 @@
 /// -*- tab-width: 4; Mode: C++; c-basic-offset: 4; indent-tabs-mode: nil -*-
-#include <AP_HAL.h>
-#include <AP_Common.h>
-#include <AP_Math.h>
+#include <AP_HAL/AP_HAL.h>
+#include <AP_Common/AP_Common.h>
+#include <AP_Math/AP_Math.h>
 #include "AP_BattMonitor.h"
 #include "AP_BattMonitor_SMBus_I2C.h"
 
 extern const AP_HAL::HAL& hal;
 
-#include <AP_HAL.h>
+#include <AP_HAL/AP_HAL.h>
 
 #if CONFIG_HAL_BOARD != HAL_BOARD_PX4
 
diff --git a/libraries/AP_BattMonitor/AP_BattMonitor_SMBus_I2C.h b/libraries/AP_BattMonitor/AP_BattMonitor_SMBus_I2C.h
index 916784826d..0f43627de9 100644
--- a/libraries/AP_BattMonitor/AP_BattMonitor_SMBus_I2C.h
+++ b/libraries/AP_BattMonitor/AP_BattMonitor_SMBus_I2C.h
@@ -2,9 +2,9 @@
 #ifndef AP_BATTMONITOR_SMBUS_I2C_H
 #define AP_BATTMONITOR_SMBUS_I2C_H
 
-#include <AP_Common.h>
-#include <AP_Param.h>
-#include <AP_Math.h>
+#include <AP_Common/AP_Common.h>
+#include <AP_Param/AP_Param.h>
+#include <AP_Math/AP_Math.h>
 #include "AP_BattMonitor_SMBus.h"
 
 class AP_BattMonitor_SMBus_I2C : public AP_BattMonitor_SMBus
diff --git a/libraries/AP_BattMonitor/AP_BattMonitor_SMBus_PX4.cpp b/libraries/AP_BattMonitor/AP_BattMonitor_SMBus_PX4.cpp
index f583db180d..7f7fd0a272 100644
--- a/libraries/AP_BattMonitor/AP_BattMonitor_SMBus_PX4.cpp
+++ b/libraries/AP_BattMonitor/AP_BattMonitor_SMBus_PX4.cpp
@@ -16,7 +16,7 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <AP_HAL.h>
+#include <AP_HAL/AP_HAL.h>
 
 #if CONFIG_HAL_BOARD == HAL_BOARD_PX4
 
diff --git a/libraries/AP_BattMonitor/AP_BattMonitor_SMBus_PX4.h b/libraries/AP_BattMonitor/AP_BattMonitor_SMBus_PX4.h
index e32fde1d19..07fc41de04 100644
--- a/libraries/AP_BattMonitor/AP_BattMonitor_SMBus_PX4.h
+++ b/libraries/AP_BattMonitor/AP_BattMonitor_SMBus_PX4.h
@@ -18,9 +18,9 @@
 #ifndef AP_BATTMONITOR_SMBUS_PX4_H
 #define AP_BATTMONITOR_SMBUS_PX4_H
 
-#include <AP_Common.h>
-#include <AP_Param.h>
-#include <AP_Math.h>
+#include <AP_Common/AP_Common.h>
+#include <AP_Param/AP_Param.h>
+#include <AP_Math/AP_Math.h>
 #include "AP_BattMonitor_SMBus.h"
 
 class AP_BattMonitor_SMBus_PX4 : public AP_BattMonitor_SMBus
diff --git a/libraries/AP_BattMonitor/examples/AP_BattMonitor_test/AP_BattMonitor_test.cpp b/libraries/AP_BattMonitor/examples/AP_BattMonitor_test/AP_BattMonitor_test.cpp
index 5654241b79..1fdfb32d2f 100644
--- a/libraries/AP_BattMonitor/examples/AP_BattMonitor_test/AP_BattMonitor_test.cpp
+++ b/libraries/AP_BattMonitor/examples/AP_BattMonitor_test/AP_BattMonitor_test.cpp
@@ -3,35 +3,35 @@
  *       Code by DIYDrones.com
  */
 
-#include <AP_Common.h>
-#include <AP_Progmem.h>
-#include <AP_Param.h>
-#include <AP_Math.h>                // ArduPilot Mega Vector/Matrix math Library
-#include <AP_ADC.h>                 // ArduPilot Mega Analog to Digital Converter Library
-#include <AP_ADC_AnalogSource.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_BattMonitor.h>
-#include <GCS_MAVLink.h>
-#include <DataFlash.h>
-#include <AP_GPS.h>
-#include <AP_InertialSensor.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_NavEKF.h>
-#include <AP_Notify.h>
-#include <AP_Mission.h>
-#include <StorageManager.h>
-#include <AP_Terrain.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_Math/AP_Math.h>                // ArduPilot Mega Vector/Matrix math Library
+#include <AP_ADC/AP_ADC.h>                 // ArduPilot Mega Analog to Digital Converter Library
+#include <AP_ADC_AnalogSource/AP_ADC_AnalogSource.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_BattMonitor/AP_BattMonitor.h>
+#include <GCS_MAVLink/GCS_MAVLink.h>
+#include <DataFlash/DataFlash.h>
+#include <AP_GPS/AP_GPS.h>
+#include <AP_InertialSensor/AP_InertialSensor.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_NavEKF/AP_NavEKF.h>
+#include <AP_Notify/AP_Notify.h>
+#include <AP_Mission/AP_Mission.h>
+#include <StorageManager/StorageManager.h>
+#include <AP_Terrain/AP_Terrain.h>
+#include <AP_RangeFinder/AP_RangeFinder.h>
 
 const AP_HAL::HAL& hal = AP_HAL_BOARD_DRIVER;