From c20594cd0ea23b44ed77bb6d96571b6277f4592a Mon Sep 17 00:00:00 2001 From: Daniel Agar Date: Mon, 15 Jan 2018 15:16:01 -0500 Subject: [PATCH] move all barometers to the same folder --- cmake/configs/nuttx_aerocore2_default.cmake | 2 +- cmake/configs/nuttx_aerofc-v1_default.cmake | 1 - cmake/configs/nuttx_auav-x21_default.cmake | 2 +- cmake/configs/nuttx_crazyflie_default.cmake | 2 +- cmake/configs/nuttx_mindpx-v2_default.cmake | 2 +- cmake/configs/nuttx_nxphlite-v3_default.cmake | 5 +-- .../nuttx_px4-same70xplained-v1_default.cmake | 2 +- cmake/configs/nuttx_px4fmu-v2_default.cmake | 7 ++-- cmake/configs/nuttx_px4fmu-v2_test.cmake | 2 +- cmake/configs/nuttx_px4fmu-v3_default.cmake | 3 +- cmake/configs/nuttx_px4fmu-v4_default.cmake | 3 +- .../configs/nuttx_px4fmu-v4pro_default.cmake | 3 +- cmake/configs/nuttx_px4fmu-v5_default.cmake | 3 +- .../nuttx_px4nucleoF767ZI-v1_default.cmake | 3 +- cmake/configs/nuttx_tap-v1_default.cmake | 2 +- cmake/configs/posix_rpi_common.cmake | 1 + cmake/configs/posix_sitl_default.cmake | 1 + src/drivers/barometer/CMakeLists.txt | 37 +++++++++++++++++++ .../{ => barometer}/bmp280/CMakeLists.txt | 0 src/drivers/{ => barometer}/bmp280/bmp280.cpp | 2 +- src/drivers/{ => barometer}/bmp280/bmp280.h | 0 .../{ => barometer}/bmp280/bmp280_i2c.cpp | 2 +- .../{ => barometer}/bmp280/bmp280_spi.cpp | 2 +- .../{ => barometer}/lps25h/CMakeLists.txt | 0 src/drivers/{ => barometer}/lps25h/lps25h.cpp | 0 src/drivers/{ => barometer}/lps25h/lps25h.h | 0 .../{ => barometer}/lps25h/lps25h_i2c.cpp | 0 .../{ => barometer}/lps25h/lps25h_spi.cpp | 0 .../{ => barometer}/mpl3115a2/CMakeLists.txt | 0 .../{ => barometer}/mpl3115a2/mpl3115a2.cpp | 0 .../{ => barometer}/mpl3115a2/mpl3115a2.h | 0 .../mpl3115a2/mpl3115a2_i2c.cpp | 0 .../{ => barometer}/ms5611/CMakeLists.txt | 0 src/drivers/{ => barometer}/ms5611/ms5611.cpp | 0 src/drivers/{ => barometer}/ms5611/ms5611.h | 0 .../{ => barometer}/ms5611/ms5611_i2c.cpp | 0 .../{ => barometer}/ms5611/ms5611_spi.cpp | 0 37 files changed, 60 insertions(+), 27 deletions(-) create mode 100644 src/drivers/barometer/CMakeLists.txt rename src/drivers/{ => barometer}/bmp280/CMakeLists.txt (100%) rename src/drivers/{ => barometer}/bmp280/bmp280.cpp (99%) rename src/drivers/{ => barometer}/bmp280/bmp280.h (100%) rename src/drivers/{ => barometer}/bmp280/bmp280_i2c.cpp (99%) rename src/drivers/{ => barometer}/bmp280/bmp280_spi.cpp (99%) rename src/drivers/{ => barometer}/lps25h/CMakeLists.txt (100%) rename src/drivers/{ => barometer}/lps25h/lps25h.cpp (100%) rename src/drivers/{ => barometer}/lps25h/lps25h.h (100%) rename src/drivers/{ => barometer}/lps25h/lps25h_i2c.cpp (100%) rename src/drivers/{ => barometer}/lps25h/lps25h_spi.cpp (100%) rename src/drivers/{ => barometer}/mpl3115a2/CMakeLists.txt (100%) rename src/drivers/{ => barometer}/mpl3115a2/mpl3115a2.cpp (100%) rename src/drivers/{ => barometer}/mpl3115a2/mpl3115a2.h (100%) rename src/drivers/{ => barometer}/mpl3115a2/mpl3115a2_i2c.cpp (100%) rename src/drivers/{ => barometer}/ms5611/CMakeLists.txt (100%) rename src/drivers/{ => barometer}/ms5611/ms5611.cpp (100%) rename src/drivers/{ => barometer}/ms5611/ms5611.h (100%) rename src/drivers/{ => barometer}/ms5611/ms5611_i2c.cpp (100%) rename src/drivers/{ => barometer}/ms5611/ms5611_spi.cpp (100%) diff --git a/cmake/configs/nuttx_aerocore2_default.cmake b/cmake/configs/nuttx_aerocore2_default.cmake index 66cea65982..713b57e3fd 100644 --- a/cmake/configs/nuttx_aerocore2_default.cmake +++ b/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 diff --git a/cmake/configs/nuttx_aerofc-v1_default.cmake b/cmake/configs/nuttx_aerofc-v1_default.cmake index a85ce27432..70551ef3e7 100644 --- a/cmake/configs/nuttx_aerofc-v1_default.cmake +++ b/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 diff --git a/cmake/configs/nuttx_auav-x21_default.cmake b/cmake/configs/nuttx_auav-x21_default.cmake index 3eb03ebf6e..e0e63e2ccb 100644 --- a/cmake/configs/nuttx_auav-x21_default.cmake +++ b/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 diff --git a/cmake/configs/nuttx_crazyflie_default.cmake b/cmake/configs/nuttx_crazyflie_default.cmake index 33dbb2db74..e89dc07b26 100644 --- a/cmake/configs/nuttx_crazyflie_default.cmake +++ b/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 diff --git a/cmake/configs/nuttx_mindpx-v2_default.cmake b/cmake/configs/nuttx_mindpx-v2_default.cmake index cb92383cb8..a830353e02 100644 --- a/cmake/configs/nuttx_mindpx-v2_default.cmake +++ b/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 diff --git a/cmake/configs/nuttx_nxphlite-v3_default.cmake b/cmake/configs/nuttx_nxphlite-v3_default.cmake index c9e20f4a2e..ac6d8af2dc 100644 --- a/cmake/configs/nuttx_nxphlite-v3_default.cmake +++ b/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 diff --git a/cmake/configs/nuttx_px4-same70xplained-v1_default.cmake b/cmake/configs/nuttx_px4-same70xplained-v1_default.cmake index bac5be85bd..ff7e51e541 100644 --- a/cmake/configs/nuttx_px4-same70xplained-v1_default.cmake +++ b/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 diff --git a/cmake/configs/nuttx_px4fmu-v2_default.cmake b/cmake/configs/nuttx_px4fmu-v2_default.cmake index e05b47c015..73b3065963 100644 --- a/cmake/configs/nuttx_px4fmu-v2_default.cmake +++ b/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 diff --git a/cmake/configs/nuttx_px4fmu-v2_test.cmake b/cmake/configs/nuttx_px4fmu-v2_test.cmake index adfdaf370c..06c430bf04 100644 --- a/cmake/configs/nuttx_px4fmu-v2_test.cmake +++ b/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 diff --git a/cmake/configs/nuttx_px4fmu-v3_default.cmake b/cmake/configs/nuttx_px4fmu-v3_default.cmake index 901b89bc89..59030726e6 100644 --- a/cmake/configs/nuttx_px4fmu-v3_default.cmake +++ b/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 diff --git a/cmake/configs/nuttx_px4fmu-v4_default.cmake b/cmake/configs/nuttx_px4fmu-v4_default.cmake index d352f27a65..d7f8adbcee 100644 --- a/cmake/configs/nuttx_px4fmu-v4_default.cmake +++ b/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 diff --git a/cmake/configs/nuttx_px4fmu-v4pro_default.cmake b/cmake/configs/nuttx_px4fmu-v4pro_default.cmake index d02c18f27e..b70a7c6727 100644 --- a/cmake/configs/nuttx_px4fmu-v4pro_default.cmake +++ b/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 diff --git a/cmake/configs/nuttx_px4fmu-v5_default.cmake b/cmake/configs/nuttx_px4fmu-v5_default.cmake index ee1a63f77c..b3acc9ab92 100644 --- a/cmake/configs/nuttx_px4fmu-v5_default.cmake +++ b/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 diff --git a/cmake/configs/nuttx_px4nucleoF767ZI-v1_default.cmake b/cmake/configs/nuttx_px4nucleoF767ZI-v1_default.cmake index 7ac6b2fa70..811896c69b 100644 --- a/cmake/configs/nuttx_px4nucleoF767ZI-v1_default.cmake +++ b/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 diff --git a/cmake/configs/nuttx_tap-v1_default.cmake b/cmake/configs/nuttx_tap-v1_default.cmake index 0dfe11c3c8..48a0abfa4b 100644 --- a/cmake/configs/nuttx_tap-v1_default.cmake +++ b/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 diff --git a/cmake/configs/posix_rpi_common.cmake b/cmake/configs/posix_rpi_common.cmake index 9722029382..6b50b25a33 100644 --- a/cmake/configs/posix_rpi_common.cmake +++ b/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 diff --git a/cmake/configs/posix_sitl_default.cmake b/cmake/configs/posix_sitl_default.cmake index d9e00a5d21..b81fc1e9c4 100644 --- a/cmake/configs/posix_sitl_default.cmake +++ b/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 diff --git a/src/drivers/barometer/CMakeLists.txt b/src/drivers/barometer/CMakeLists.txt new file mode 100644 index 0000000000..0b07985816 --- /dev/null +++ b/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) diff --git a/src/drivers/bmp280/CMakeLists.txt b/src/drivers/barometer/bmp280/CMakeLists.txt similarity index 100% rename from src/drivers/bmp280/CMakeLists.txt rename to src/drivers/barometer/bmp280/CMakeLists.txt diff --git a/src/drivers/bmp280/bmp280.cpp b/src/drivers/barometer/bmp280/bmp280.cpp similarity index 99% rename from src/drivers/bmp280/bmp280.cpp rename to src/drivers/barometer/bmp280/bmp280.cpp index 3408e95469..c515026020 100644 --- a/src/drivers/bmp280/bmp280.cpp +++ b/src/drivers/barometer/bmp280/bmp280.cpp @@ -59,7 +59,7 @@ #include #include -#include +#include "bmp280.h" #include #include diff --git a/src/drivers/bmp280/bmp280.h b/src/drivers/barometer/bmp280/bmp280.h similarity index 100% rename from src/drivers/bmp280/bmp280.h rename to src/drivers/barometer/bmp280/bmp280.h diff --git a/src/drivers/bmp280/bmp280_i2c.cpp b/src/drivers/barometer/bmp280/bmp280_i2c.cpp similarity index 99% rename from src/drivers/bmp280/bmp280_i2c.cpp rename to src/drivers/barometer/bmp280/bmp280_i2c.cpp index 2473c6f207..3515d2f0b9 100644 --- a/src/drivers/bmp280/bmp280_i2c.cpp +++ b/src/drivers/barometer/bmp280/bmp280_i2c.cpp @@ -39,7 +39,7 @@ #include -#include +#include "bmp280.h" #include #include "board_config.h" diff --git a/src/drivers/bmp280/bmp280_spi.cpp b/src/drivers/barometer/bmp280/bmp280_spi.cpp similarity index 99% rename from src/drivers/bmp280/bmp280_spi.cpp rename to src/drivers/barometer/bmp280/bmp280_spi.cpp index fa0fb4839e..743113c61f 100644 --- a/src/drivers/bmp280/bmp280_spi.cpp +++ b/src/drivers/barometer/bmp280/bmp280_spi.cpp @@ -39,7 +39,7 @@ #include -#include +#include "bmp280.h" #include #include "board_config.h" diff --git a/src/drivers/lps25h/CMakeLists.txt b/src/drivers/barometer/lps25h/CMakeLists.txt similarity index 100% rename from src/drivers/lps25h/CMakeLists.txt rename to src/drivers/barometer/lps25h/CMakeLists.txt diff --git a/src/drivers/lps25h/lps25h.cpp b/src/drivers/barometer/lps25h/lps25h.cpp similarity index 100% rename from src/drivers/lps25h/lps25h.cpp rename to src/drivers/barometer/lps25h/lps25h.cpp diff --git a/src/drivers/lps25h/lps25h.h b/src/drivers/barometer/lps25h/lps25h.h similarity index 100% rename from src/drivers/lps25h/lps25h.h rename to src/drivers/barometer/lps25h/lps25h.h diff --git a/src/drivers/lps25h/lps25h_i2c.cpp b/src/drivers/barometer/lps25h/lps25h_i2c.cpp similarity index 100% rename from src/drivers/lps25h/lps25h_i2c.cpp rename to src/drivers/barometer/lps25h/lps25h_i2c.cpp diff --git a/src/drivers/lps25h/lps25h_spi.cpp b/src/drivers/barometer/lps25h/lps25h_spi.cpp similarity index 100% rename from src/drivers/lps25h/lps25h_spi.cpp rename to src/drivers/barometer/lps25h/lps25h_spi.cpp diff --git a/src/drivers/mpl3115a2/CMakeLists.txt b/src/drivers/barometer/mpl3115a2/CMakeLists.txt similarity index 100% rename from src/drivers/mpl3115a2/CMakeLists.txt rename to src/drivers/barometer/mpl3115a2/CMakeLists.txt diff --git a/src/drivers/mpl3115a2/mpl3115a2.cpp b/src/drivers/barometer/mpl3115a2/mpl3115a2.cpp similarity index 100% rename from src/drivers/mpl3115a2/mpl3115a2.cpp rename to src/drivers/barometer/mpl3115a2/mpl3115a2.cpp diff --git a/src/drivers/mpl3115a2/mpl3115a2.h b/src/drivers/barometer/mpl3115a2/mpl3115a2.h similarity index 100% rename from src/drivers/mpl3115a2/mpl3115a2.h rename to src/drivers/barometer/mpl3115a2/mpl3115a2.h diff --git a/src/drivers/mpl3115a2/mpl3115a2_i2c.cpp b/src/drivers/barometer/mpl3115a2/mpl3115a2_i2c.cpp similarity index 100% rename from src/drivers/mpl3115a2/mpl3115a2_i2c.cpp rename to src/drivers/barometer/mpl3115a2/mpl3115a2_i2c.cpp diff --git a/src/drivers/ms5611/CMakeLists.txt b/src/drivers/barometer/ms5611/CMakeLists.txt similarity index 100% rename from src/drivers/ms5611/CMakeLists.txt rename to src/drivers/barometer/ms5611/CMakeLists.txt diff --git a/src/drivers/ms5611/ms5611.cpp b/src/drivers/barometer/ms5611/ms5611.cpp similarity index 100% rename from src/drivers/ms5611/ms5611.cpp rename to src/drivers/barometer/ms5611/ms5611.cpp diff --git a/src/drivers/ms5611/ms5611.h b/src/drivers/barometer/ms5611/ms5611.h similarity index 100% rename from src/drivers/ms5611/ms5611.h rename to src/drivers/barometer/ms5611/ms5611.h diff --git a/src/drivers/ms5611/ms5611_i2c.cpp b/src/drivers/barometer/ms5611/ms5611_i2c.cpp similarity index 100% rename from src/drivers/ms5611/ms5611_i2c.cpp rename to src/drivers/barometer/ms5611/ms5611_i2c.cpp diff --git a/src/drivers/ms5611/ms5611_spi.cpp b/src/drivers/barometer/ms5611/ms5611_spi.cpp similarity index 100% rename from src/drivers/ms5611/ms5611_spi.cpp rename to src/drivers/barometer/ms5611/ms5611_spi.cpp