diff --git a/cmake/configs/nuttx_aerocore2_default.cmake b/cmake/configs/nuttx_aerocore2_default.cmake index e8de0b546efdbb5e2c7254a412e7506fd6078fc8..c595c6e92bcfe855551b9555469d0db7cbba601d 100644 --- a/cmake/configs/nuttx_aerocore2_default.cmake +++ b/cmake/configs/nuttx_aerocore2_default.cmake @@ -21,10 +21,7 @@ set(config_module_list drivers/gps drivers/pwm_out_sim drivers/airspeed - drivers/ets_airspeed - drivers/ms4525_airspeed - drivers/ms5525_airspeed - drivers/sdp3x_airspeed + drivers/differential_pressure #drivers/frsky_telemetry modules/sensors #drivers/pwm_input diff --git a/cmake/configs/nuttx_auav-x21_default.cmake b/cmake/configs/nuttx_auav-x21_default.cmake index 66db077dabc367d1eb95369807313129fe5f7373..82157a71cd80dfea554be6090e6a685485353fe9 100644 --- a/cmake/configs/nuttx_auav-x21_default.cmake +++ b/cmake/configs/nuttx_auav-x21_default.cmake @@ -33,10 +33,7 @@ set(config_module_list drivers/hott/hott_sensors drivers/blinkm drivers/airspeed - drivers/ets_airspeed - drivers/ms4525_airspeed - drivers/ms5525_airspeed - drivers/sdp3x_airspeed + drivers/differential_pressure drivers/frsky_telemetry modules/sensors drivers/mkblctrl diff --git a/cmake/configs/nuttx_mindpx-v2_default.cmake b/cmake/configs/nuttx_mindpx-v2_default.cmake index 71d96ef92db6adf9c6d5e713ffb62661ea8bde13..6bfc6195ae005e0f08d3372851ac0f1bba313003 100644 --- a/cmake/configs/nuttx_mindpx-v2_default.cmake +++ b/cmake/configs/nuttx_mindpx-v2_default.cmake @@ -37,10 +37,7 @@ set(config_module_list #drivers/hott/hott_sensors drivers/blinkm drivers/airspeed - drivers/ets_airspeed - drivers/ms4525_airspeed - drivers/ms5525_airspeed - drivers/sdp3x_airspeed + drivers/differential_pressure drivers/frsky_telemetry modules/sensors #drivers/mkblctrl diff --git a/cmake/configs/nuttx_nxphlite-v3_default.cmake b/cmake/configs/nuttx_nxphlite-v3_default.cmake index 7c6ddcef73266ddb1bed81535732497f834a86ef..047f02856ef2b7775d2e55b4b4416982f7ad50f8 100644 --- a/cmake/configs/nuttx_nxphlite-v3_default.cmake +++ b/cmake/configs/nuttx_nxphlite-v3_default.cmake @@ -16,7 +16,7 @@ set(config_module_list drivers/bst drivers/camera_trigger drivers/device - drivers/ets_airspeed + drivers/differential_pressure drivers/frsky_telemetry drivers/fxos8701cq drivers/fxas21002c @@ -39,8 +39,6 @@ set(config_module_list drivers/mpl3115a2 drivers/mpu6000 drivers/mpu9250 - drivers/ms4525_airspeed - drivers/ms5525_airspeed drivers/ms5611 drivers/oreoled # NOT Portable YET drivers/pwm_input @@ -49,7 +47,6 @@ set(config_module_list drivers/px4fmu drivers/rgbled drivers/rgbled_pwm - drivers/sdp3x_airspeed drivers/sf0x drivers/sf1xx drivers/srf02 diff --git a/cmake/configs/nuttx_px4-same70xplained-v1_default.cmake b/cmake/configs/nuttx_px4-same70xplained-v1_default.cmake index 8689378686cede83e9a7d48ad0593b245cf72aba..578085a66f611a9f5c236f6e72a4c799707434e6 100644 --- a/cmake/configs/nuttx_px4-same70xplained-v1_default.cmake +++ b/cmake/configs/nuttx_px4-same70xplained-v1_default.cmake @@ -17,8 +17,7 @@ set(config_module_list drivers/rgbled drivers/mpu6000 drivers/mpu9250 - drivers/ms4525_airspeed - drivers/ms5525_airspeed + drivers/differential_pressure drivers/lsm303d drivers/l3gd20 drivers/hmc5883 @@ -35,7 +34,6 @@ set(config_module_list drivers/hott/hott_sensors drivers/blinkm drivers/airspeed - drivers/ets_airspeed drivers/frsky_telemetry modules/sensors #drivers/mkblctrl diff --git a/cmake/configs/nuttx_px4fmu-v2_default.cmake b/cmake/configs/nuttx_px4fmu-v2_default.cmake index fdc1d1a036bf20ccc00ff0c67f531a957b755f29..8e6182ebdfd6f7c37f094825135cc72f54691fe3 100644 --- a/cmake/configs/nuttx_px4fmu-v2_default.cmake +++ b/cmake/configs/nuttx_px4fmu-v2_default.cmake @@ -15,7 +15,7 @@ set(config_module_list #drivers/bst drivers/camera_trigger drivers/device - #drivers/ets_airspeed + drivers/differential_pressure drivers/frsky_telemetry drivers/gps drivers/hmc5883 @@ -34,8 +34,6 @@ set(config_module_list #drivers/mkblctrl drivers/mpu6000 drivers/mpu9250 - drivers/ms4525_airspeed - drivers/ms5525_airspeed drivers/ms5611 #drivers/oreoled #drivers/protocol_splitter @@ -45,7 +43,6 @@ set(config_module_list drivers/px4fmu drivers/px4io drivers/rgbled - drivers/sdp3x_airspeed drivers/sf0x drivers/sf1xx #drivers/srf02 diff --git a/cmake/configs/nuttx_px4fmu-v2_test.cmake b/cmake/configs/nuttx_px4fmu-v2_test.cmake index a3438cecd7672a2660a074c908b85f3988744d26..1a95f8afd9c9bf6bb3adec6f5bd4fe7ad7b91c60 100644 --- a/cmake/configs/nuttx_px4fmu-v2_test.cmake +++ b/cmake/configs/nuttx_px4fmu-v2_test.cmake @@ -32,10 +32,7 @@ set(config_module_list #drivers/hott/hott_sensors drivers/blinkm drivers/airspeed - drivers/ets_airspeed - drivers/ms4525_airspeed - drivers/ms5525_airspeed - drivers/sdp3x_airspeed + drivers/differential_pressure drivers/frsky_telemetry modules/sensors #drivers/mkblctrl diff --git a/cmake/configs/nuttx_px4fmu-v3_default.cmake b/cmake/configs/nuttx_px4fmu-v3_default.cmake index 95853a48271f272d0b05ce395c82af11d8334bba..c8285ea140c01355db881c94bc74919683d0c5ed 100644 --- a/cmake/configs/nuttx_px4fmu-v3_default.cmake +++ b/cmake/configs/nuttx_px4fmu-v3_default.cmake @@ -22,7 +22,7 @@ set(config_module_list drivers/bst drivers/camera_trigger drivers/device - drivers/ets_airspeed + drivers/differential_pressure drivers/frsky_telemetry drivers/gps drivers/hmc5883 @@ -40,8 +40,6 @@ set(config_module_list drivers/mkblctrl drivers/mpu6000 drivers/mpu9250 - drivers/ms4525_airspeed - drivers/ms5525_airspeed drivers/ms5611 drivers/oreoled drivers/protocol_splitter @@ -51,7 +49,6 @@ set(config_module_list drivers/px4fmu drivers/px4io drivers/rgbled - drivers/sdp3x_airspeed drivers/sf0x drivers/sf1xx drivers/srf02 diff --git a/cmake/configs/nuttx_px4fmu-v4_default.cmake b/cmake/configs/nuttx_px4fmu-v4_default.cmake index 76593fb5eb4eda4b615223c3c8abdff23b839dc7..47e223b92995b2714b43d108ebeedeadce748180 100644 --- a/cmake/configs/nuttx_px4fmu-v4_default.cmake +++ b/cmake/configs/nuttx_px4fmu-v4_default.cmake @@ -18,7 +18,7 @@ set(config_module_list drivers/bst drivers/camera_trigger drivers/device - drivers/ets_airspeed + drivers/differential_pressure drivers/frsky_telemetry drivers/gps drivers/hmc5883 @@ -34,8 +34,6 @@ set(config_module_list drivers/mkblctrl drivers/mpu6000 drivers/mpu9250 - drivers/ms4525_airspeed - drivers/ms5525_airspeed drivers/ms5611 drivers/oreoled drivers/pca9685 @@ -44,7 +42,6 @@ set(config_module_list drivers/px4flow drivers/px4fmu drivers/rgbled - drivers/sdp3x_airspeed drivers/sf0x drivers/sf1xx drivers/srf02 diff --git a/cmake/configs/nuttx_px4fmu-v4pro_default.cmake b/cmake/configs/nuttx_px4fmu-v4pro_default.cmake index 3907d57ab929e661386983bf066b575471ccc1b1..fc347b10bbd1cac9965f2d1a04a4ef1472adaec1 100644 --- a/cmake/configs/nuttx_px4fmu-v4pro_default.cmake +++ b/cmake/configs/nuttx_px4fmu-v4pro_default.cmake @@ -16,7 +16,6 @@ set(config_module_list drivers/bst drivers/camera_trigger drivers/device - drivers/ets_airspeed drivers/frsky_telemetry drivers/gps drivers/hmc5883 @@ -34,8 +33,7 @@ set(config_module_list drivers/mkblctrl drivers/mpu6000 drivers/mpu9250 - drivers/ms4525_airspeed - drivers/ms5525_airspeed + drivers/differential_pressure drivers/ms5611 drivers/oreoled drivers/pwm_input @@ -44,7 +42,6 @@ set(config_module_list drivers/px4fmu drivers/px4io drivers/rgbled - drivers/sdp3x_airspeed drivers/sf0x drivers/sf1xx drivers/srf02 diff --git a/cmake/configs/nuttx_px4fmu-v5_default.cmake b/cmake/configs/nuttx_px4fmu-v5_default.cmake index 38f0d4f1c87f1c1a0d678f8817e4d9493c196829..4e72317be4ed6cc68fa1a7103e9d7820d02102a4 100644 --- a/cmake/configs/nuttx_px4fmu-v5_default.cmake +++ b/cmake/configs/nuttx_px4fmu-v5_default.cmake @@ -17,7 +17,6 @@ set(config_module_list drivers/bst drivers/camera_trigger drivers/device - drivers/ets_airspeed drivers/frsky_telemetry drivers/gps drivers/hmc5883 @@ -34,8 +33,7 @@ set(config_module_list drivers/mkblctrl drivers/mpu6000 drivers/mpu9250 - drivers/ms4525_airspeed - drivers/ms5525_airspeed + drivers/differential_pressure drivers/ms5611 drivers/oreoled drivers/pwm_input @@ -44,7 +42,6 @@ set(config_module_list drivers/px4fmu drivers/rgbled drivers/rgbled_pwm - drivers/sdp3x_airspeed drivers/sf0x drivers/sf1xx drivers/srf02 diff --git a/cmake/configs/nuttx_px4nucleoF767ZI-v1_default.cmake b/cmake/configs/nuttx_px4nucleoF767ZI-v1_default.cmake index 13d2285317f4cd6d0d6371c127532e8615bcf1c9..ff3aeb358ca3c2f9cb11cce38f729dcbef3fc72e 100644 --- a/cmake/configs/nuttx_px4nucleoF767ZI-v1_default.cmake +++ b/cmake/configs/nuttx_px4nucleoF767ZI-v1_default.cmake @@ -16,7 +16,6 @@ set(config_module_list drivers/bst drivers/camera_trigger drivers/device - drivers/ets_airspeed drivers/frsky_telemetry drivers/gps drivers/hmc5883 @@ -30,8 +29,7 @@ set(config_module_list drivers/mkblctrl drivers/mpu6000 drivers/mpu9250 - drivers/ms4525_airspeed - drivers/ms5525_airspeed + drivers/differential_pressure drivers/ms5611 drivers/oreoled drivers/pwm_input @@ -39,7 +37,6 @@ set(config_module_list drivers/px4flow drivers/px4fmu drivers/rgbled - drivers/sdp3x_airspeed drivers/sf0x drivers/srf02 drivers/stm32 diff --git a/cmake/configs/nuttx_tap-v1_default.cmake b/cmake/configs/nuttx_tap-v1_default.cmake index 9154646c315b550d27c9168f6fc477cd766157aa..706210a0a5920174480b96aacb7aa5b5d720ffd3 100644 --- a/cmake/configs/nuttx_tap-v1_default.cmake +++ b/cmake/configs/nuttx_tap-v1_default.cmake @@ -21,8 +21,7 @@ set(config_module_list drivers/hmc5883 drivers/gps drivers/airspeed - drivers/ms4525_airspeed - drivers/ms5525_airspeed + drivers/differential_pressure modules/sensors drivers/vmount diff --git a/cmake/configs/posix_rpi_common.cmake b/cmake/configs/posix_rpi_common.cmake index b9f7b336e6428df078aa3e05f2c088e2cd0cae5c..28c07ae6a5e6580da1a67d492d6c006bc7f13d27 100644 --- a/cmake/configs/posix_rpi_common.cmake +++ b/cmake/configs/posix_rpi_common.cmake @@ -17,11 +17,8 @@ set(config_module_list # drivers/airspeed drivers/device - drivers/ets_airspeed drivers/ll40ls - drivers/ms4525_airspeed - drivers/ms5525_airspeed - drivers/sdp3x_airspeed + drivers/differential_pressure modules/sensors platforms/posix/drivers/df_mpu9250_wrapper diff --git a/cmake/configs/posix_sitl_default.cmake b/cmake/configs/posix_sitl_default.cmake index 6134a3345261ed9453aaf8170fa541536aef93ea..88885dc791b4bace69355d87f11df827fe5f2893 100644 --- a/cmake/configs/posix_sitl_default.cmake +++ b/cmake/configs/posix_sitl_default.cmake @@ -6,14 +6,11 @@ set(config_module_list drivers/boards drivers/camera_trigger drivers/device - drivers/ets_airspeed drivers/gps drivers/linux_gpio drivers/ll40ls - drivers/ms4525_airspeed - drivers/ms5525_airspeed + drivers/differential_pressure drivers/pwm_out_sim - drivers/sdp3x_airspeed drivers/vmount modules/sensors diff --git a/src/drivers/differential_pressure/CMakeLists.txt b/src/drivers/differential_pressure/CMakeLists.txt new file mode 100644 index 0000000000000000000000000000000000000000..ab6865d6b36f1fd77c1163a07adf573f497590d3 --- /dev/null +++ b/src/drivers/differential_pressure/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(ets) +add_subdirectory(ms4525) +add_subdirectory(ms5525) +add_subdirectory(sdp3x) \ No newline at end of file diff --git a/src/drivers/ets_airspeed/CMakeLists.txt b/src/drivers/differential_pressure/ets/CMakeLists.txt similarity index 100% rename from src/drivers/ets_airspeed/CMakeLists.txt rename to src/drivers/differential_pressure/ets/CMakeLists.txt diff --git a/src/drivers/ets_airspeed/ets_airspeed.cpp b/src/drivers/differential_pressure/ets/ets_airspeed.cpp similarity index 100% rename from src/drivers/ets_airspeed/ets_airspeed.cpp rename to src/drivers/differential_pressure/ets/ets_airspeed.cpp diff --git a/src/drivers/ms4525_airspeed/CMakeLists.txt b/src/drivers/differential_pressure/ms4525/CMakeLists.txt similarity index 100% rename from src/drivers/ms4525_airspeed/CMakeLists.txt rename to src/drivers/differential_pressure/ms4525/CMakeLists.txt diff --git a/src/drivers/ms4525_airspeed/ms4525_airspeed.cpp b/src/drivers/differential_pressure/ms4525/ms4525_airspeed.cpp similarity index 100% rename from src/drivers/ms4525_airspeed/ms4525_airspeed.cpp rename to src/drivers/differential_pressure/ms4525/ms4525_airspeed.cpp diff --git a/src/drivers/ms5525_airspeed/CMakeLists.txt b/src/drivers/differential_pressure/ms5525/CMakeLists.txt similarity index 100% rename from src/drivers/ms5525_airspeed/CMakeLists.txt rename to src/drivers/differential_pressure/ms5525/CMakeLists.txt diff --git a/src/drivers/ms5525_airspeed/MS5525.cpp b/src/drivers/differential_pressure/ms5525/MS5525.cpp similarity index 100% rename from src/drivers/ms5525_airspeed/MS5525.cpp rename to src/drivers/differential_pressure/ms5525/MS5525.cpp diff --git a/src/drivers/ms5525_airspeed/MS5525.hpp b/src/drivers/differential_pressure/ms5525/MS5525.hpp similarity index 100% rename from src/drivers/ms5525_airspeed/MS5525.hpp rename to src/drivers/differential_pressure/ms5525/MS5525.hpp diff --git a/src/drivers/ms5525_airspeed/MS5525_main.cpp b/src/drivers/differential_pressure/ms5525/MS5525_main.cpp similarity index 100% rename from src/drivers/ms5525_airspeed/MS5525_main.cpp rename to src/drivers/differential_pressure/ms5525/MS5525_main.cpp diff --git a/src/drivers/sdp3x_airspeed/CMakeLists.txt b/src/drivers/differential_pressure/sdp3x/CMakeLists.txt similarity index 100% rename from src/drivers/sdp3x_airspeed/CMakeLists.txt rename to src/drivers/differential_pressure/sdp3x/CMakeLists.txt diff --git a/src/drivers/sdp3x_airspeed/SDP3X.cpp b/src/drivers/differential_pressure/sdp3x/SDP3X.cpp similarity index 100% rename from src/drivers/sdp3x_airspeed/SDP3X.cpp rename to src/drivers/differential_pressure/sdp3x/SDP3X.cpp diff --git a/src/drivers/sdp3x_airspeed/SDP3X.hpp b/src/drivers/differential_pressure/sdp3x/SDP3X.hpp similarity index 100% rename from src/drivers/sdp3x_airspeed/SDP3X.hpp rename to src/drivers/differential_pressure/sdp3x/SDP3X.hpp diff --git a/src/drivers/sdp3x_airspeed/SDP3X_main.cpp b/src/drivers/differential_pressure/sdp3x/SDP3X_main.cpp similarity index 100% rename from src/drivers/sdp3x_airspeed/SDP3X_main.cpp rename to src/drivers/differential_pressure/sdp3x/SDP3X_main.cpp