move all barometers to the same folder

cmake/configs/nuttx_aerocore2_default.cmake

@@ -7,6 +7,7 @@ set(config_module_list
 	#
 	# Board support modules
 	#
+	drivers/barometer
 	drivers/differential_pressure
 	drivers/distance_sensor
 	#drivers/magnetometer
@@ -20,7 +21,6 @@ set(config_module_list
 	drivers/boards
 	drivers/lsm303d
 	drivers/l3gd20
-	drivers/ms5611
 	drivers/gps
 	drivers/pwm_out_sim
 	drivers/airspeed

cmake/configs/nuttx_aerofc-v1_default.cmake

@@ -16,7 +16,6 @@ set(config_module_list
 	drivers/magnetometer/hmc5883
 	drivers/magnetometer/ist8310
 	drivers/mpu9250
-	drivers/ms5611
 	drivers/px4fmu
 	drivers/stm32
 	drivers/tap_esc

cmake/configs/nuttx_auav-x21_default.cmake

@@ -7,6 +7,7 @@ set(config_module_list
 	#
 	# Board support modules
 	#
+	drivers/barometer
 	drivers/differential_pressure
 	drivers/distance_sensor
 	drivers/magnetometer
@@ -22,7 +23,6 @@ set(config_module_list
 	drivers/rgbled
 	drivers/mpu6000
 	drivers/mpu9250
-	drivers/ms5611
 	drivers/gps
 	drivers/pwm_out_sim
 	drivers/hott

cmake/configs/nuttx_crazyflie_default.cmake

@@ -11,7 +11,7 @@ set(config_module_list
 	drivers/px4fmu
 	drivers/boards
 	drivers/mpu9250
-	drivers/lps25h
+	drivers/barometer/lps25h
 	drivers/gps
 	modules/sensors
 

cmake/configs/nuttx_mindpx-v2_default.cmake

@@ -7,6 +7,7 @@ set(config_module_list
 	#
 	# Board support modules
 	#
+	drivers/barometer
 	drivers/differential_pressure
 	drivers/distance_sensor
 
@@ -28,7 +29,6 @@ set(config_module_list
 	#drivers/mkblctrl
 	drivers/mpu6000
 	drivers/mpu9250
-	drivers/ms5611
 	#drivers/oreoled
 	drivers/pwm_input
 	drivers/pwm_out_sim

cmake/configs/nuttx_nxphlite-v3_default.cmake

@@ -7,6 +7,7 @@ set(config_module_list
 	#
 	# Board support modules
 	#
+	drivers/barometer
 	drivers/differential_pressure
 	drivers/distance_sensor
 	drivers/magnetometer
@@ -15,7 +16,6 @@ set(config_module_list
 	drivers/blinkm
 #NOT Supported	drivers/bma180
 #NOT Supported	drivers/bmi160
-	drivers/bmp280
 	drivers/boards
 	drivers/bst
 	drivers/camera_trigger
@@ -34,10 +34,9 @@ set(config_module_list
 	drivers/l3gd20
 	drivers/led
 	drivers/mkblctrl
-	drivers/mpl3115a2
+	drivers/barometer/mpl3115a2
 	drivers/mpu6000
 	drivers/mpu9250
-	drivers/ms5611
 	drivers/oreoled
 # NOT Portable YET drivers/pwm_input
 	drivers/pwm_out_sim

cmake/configs/nuttx_px4-same70xplained-v1_default.cmake

@@ -7,6 +7,7 @@ set(config_module_list
 	#
 	# Board support modules
 	#
+	drivers/barometer
 	drivers/differential_pressure
 	drivers/distance_sensor
 	drivers/magnetometer
@@ -23,7 +24,6 @@ set(config_module_list
 	drivers/mpu9250
 	drivers/lsm303d
 	drivers/l3gd20
-	drivers/ms5611
 	drivers/gps
 #WIP 	drivers/pwm_out_sim
 	drivers/hott

cmake/configs/nuttx_px4fmu-v2_default.cmake

@@ -6,12 +6,14 @@ set(config_module_list
 	#
 	# Board support modules
 	#
+	#drivers/barometer
 	drivers/differential_pressure
 	drivers/distance_sensor
 	#drivers/magnetometer
 
 	#drivers/adis16448
 	drivers/airspeed
+	drivers/barometer/ms5611
 	#drivers/blinkm
 	#drivers/bmi160
 	#drivers/bmp280
@@ -21,7 +23,6 @@ set(config_module_list
 	drivers/device
 	#drivers/frsky_telemetry
 	drivers/gps
-	drivers/magnetometer/hmc5883
 	#drivers/hott
 	#drivers/hott/hott_sensors
 	#drivers/hott/hott_telemetry
@@ -29,13 +30,13 @@ set(config_module_list
 	#drivers/irlock
 	drivers/l3gd20
 	drivers/led
-	drivers/magnetometer/lis3mdl
 	drivers/lsm303d
+	drivers/magnetometer/hmc5883
+	drivers/magnetometer/lis3mdl
 	#drivers/mb12xx
 	#drivers/mkblctrl
 	drivers/mpu6000
 	drivers/mpu9250
-	drivers/ms5611
 	#drivers/oreoled
 	#drivers/protocol_splitter
 	drivers/pwm_input

cmake/configs/nuttx_px4fmu-v2_test.cmake

@@ -19,7 +19,6 @@ set(config_module_list
 	drivers/lsm303d
 	drivers/l3gd20
 	drivers/hmc5883
-	drivers/ms5611
 	#drivers/mb12xx
 	#drivers/srf02
 	#drivers/sf0x
@@ -32,6 +31,7 @@ set(config_module_list
 	#drivers/hott/hott_sensors
 	drivers/blinkm
 	drivers/airspeed
+	drivers/barometer
 	drivers/differential_pressure
 	drivers/frsky_telemetry
 	modules/sensors

cmake/configs/nuttx_px4fmu-v3_default.cmake

@@ -13,6 +13,7 @@ set(config_module_list
 	#
 	# Board support modules
 	#
+	drivers/barometer
 	drivers/differential_pressure
 	drivers/distance_sensor
 	drivers/magnetometer
@@ -21,7 +22,6 @@ set(config_module_list
 	drivers/airspeed
 	drivers/blinkm
 	drivers/bmi160
-	drivers/bmp280
 	drivers/boards
 	drivers/bst
 	drivers/camera_trigger
@@ -38,7 +38,6 @@ set(config_module_list
 	drivers/mkblctrl
 	drivers/mpu6000
 	drivers/mpu9250
-	drivers/ms5611
 	drivers/oreoled
 	drivers/protocol_splitter
 	drivers/pwm_input

cmake/configs/nuttx_px4fmu-v4_default.cmake

@@ -7,6 +7,7 @@ set(config_module_list
 	#
 	# Board support modules
 	#
+	drivers/barometer
 	drivers/differential_pressure
 	drivers/distance_sensor
 	drivers/magnetometer
@@ -16,7 +17,6 @@ set(config_module_list
 	drivers/bma180
 	drivers/bmi055
 	drivers/bmi160
-	drivers/bmp280
 	drivers/boards
 	drivers/bst
 	drivers/camera_trigger
@@ -32,7 +32,6 @@ set(config_module_list
 	drivers/mkblctrl
 	drivers/mpu6000
 	drivers/mpu9250
-	drivers/ms5611
 	drivers/oreoled
 	drivers/pca9685
 	drivers/pwm_input

cmake/configs/nuttx_px4fmu-v4pro_default.cmake

@@ -8,6 +8,7 @@ set(config_module_list
 	# Board support modules
 	#
 	drivers/distance_sensor
+	drivers/barometer
 	drivers/differential_pressure
 	drivers/magnetometer
 
@@ -15,7 +16,6 @@ set(config_module_list
 	drivers/blinkm
 	drivers/bma180
 	drivers/bmi160
-	drivers/bmp280
 	drivers/boards
 	drivers/bst
 	drivers/camera_trigger
@@ -32,7 +32,6 @@ set(config_module_list
 	drivers/mkblctrl
 	drivers/mpu6000
 	drivers/mpu9250
-	drivers/ms5611
 	drivers/oreoled
 	drivers/pwm_input
 	drivers/pwm_out_sim

cmake/configs/nuttx_px4fmu-v5_default.cmake

@@ -7,6 +7,7 @@ set(config_module_list
 	#
 	# Board support modules
 	#
+	drivers/barometer
 	drivers/differential_pressure
 	drivers/distance_sensor
 	drivers/magnetometer
@@ -15,7 +16,6 @@ set(config_module_list
 	drivers/blinkm
 	drivers/bma180
 	drivers/bmi160
-	drivers/bmp280
 	drivers/boards
 	drivers/bst
 	drivers/camera_trigger
@@ -31,7 +31,6 @@ set(config_module_list
 	drivers/mkblctrl
 	drivers/mpu6000
 	drivers/mpu9250
-	drivers/ms5611
 	drivers/oreoled
 	drivers/pwm_input
 	drivers/pwm_out_sim

cmake/configs/nuttx_px4nucleoF767ZI-v1_default.cmake

@@ -7,6 +7,7 @@ set(config_module_list
 	#
 	# Board support modules
 	#
+	drivers/barometer
 	drivers/differential_pressure
 	drivers/distance_sensor
 	drivers/magnetometer
@@ -16,7 +17,6 @@ set(config_module_list
 	drivers/blinkm
 	drivers/bma180
 	drivers/bmi160
-	drivers/bmp280
 	drivers/boards
 	drivers/bst
 	drivers/camera_trigger
@@ -30,7 +30,6 @@ set(config_module_list
 	drivers/mkblctrl
 	drivers/mpu6000
 	drivers/mpu9250
-	drivers/ms5611
 	drivers/oreoled
 	drivers/pwm_input
 	drivers/pwm_out_sim

cmake/configs/nuttx_tap-v1_default.cmake

@@ -10,12 +10,12 @@ set(config_module_list
 	drivers/airspeed
 	drivers/boards
 	drivers/device
+	drivers/barometer
 	drivers/differential_pressure
 	drivers/gps
 	drivers/led
 	drivers/magnetometer/hmc5883
 	drivers/mpu6000
-	drivers/ms5611
 	drivers/px4fmu
 	drivers/rgbled_pwm
 	drivers/stm32

cmake/configs/posix_rpi_common.cmake

@@ -18,6 +18,7 @@ set(config_module_list
 	drivers/airspeed
 	drivers/device
 	drivers/distance_sensor
+	#drivers/barometer
 	drivers/differential_pressure
 
 	modules/sensors

cmake/configs/posix_sitl_default.cmake

@@ -2,6 +2,7 @@
 set(CMAKE_TOOLCHAIN_FILE ${PX4_SOURCE_DIR}/cmake/toolchains/Toolchain-native.cmake)
 
 set(config_module_list
+	#drivers/barometer
 	drivers/differential_pressure
 	drivers/distance_sensor
 

src/drivers/barometer/CMakeLists.txt

@@ -0,0 +1,37 @@
+############################################################################
+#
+#   Copyright (c) 2017 PX4 Development Team. All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in
+#    the documentation and/or other materials provided with the
+#    distribution.
+# 3. Neither the name PX4 nor the names of its contributors may be
+#    used to endorse or promote products derived from this software
+#    without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+#
+############################################################################
+
+add_subdirectory(bmp280)
+#add_subdirectory(lps25h) # not ready for general inclusion
+#add_subdirectory(mpl3115a2) # not ready for general inclusion
+add_subdirectory(ms5611)

src/drivers/barometer/bmp280/bmp280.cpp

@@ -59,7 +59,7 @@
 
 #include <arch/board/board.h>
 #include <board_config.h>
-#include <drivers/bmp280/bmp280.h>
+#include "bmp280.h"
 
 #include <drivers/device/device.h>
 #include <drivers/drv_baro.h>

src/drivers/barometer/bmp280/bmp280_i2c.cpp

@@ -39,7 +39,7 @@
 
 #include <px4_config.h>
 
-#include <drivers/bmp280/bmp280.h>
+#include "bmp280.h"
 #include <drivers/device/i2c.h>
 
 #include "board_config.h"

src/drivers/barometer/bmp280/bmp280_spi.cpp

@@ -39,7 +39,7 @@
 
 #include <px4_config.h>
 
-#include <drivers/bmp280/bmp280.h>
+#include "bmp280.h"
 #include <drivers/device/spi.h>
 
 #include "board_config.h"