diff --git a/cmake/configs/nuttx_aerocore2_default.cmake b/cmake/configs/nuttx_aerocore2_default.cmake index 045d473a90..ee82fc0296 100644 --- a/cmake/configs/nuttx_aerocore2_default.cmake +++ b/cmake/configs/nuttx_aerocore2_default.cmake @@ -19,8 +19,8 @@ set(config_module_list drivers/led drivers/px4fmu drivers/boards - drivers/lsm303d - drivers/l3gd20 + drivers/imu/lsm303d + drivers/imu/l3gd20 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 bfbd26c8b0..8e3b5121be 100644 --- a/cmake/configs/nuttx_aerofc-v1_default.cmake +++ b/cmake/configs/nuttx_aerofc-v1_default.cmake @@ -16,7 +16,7 @@ set(config_module_list drivers/barometer/ms5611 drivers/magnetometer/hmc5883 drivers/magnetometer/ist8310 - drivers/mpu9250 + drivers/imu/mpu9250 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 ffbe166317..1839dca008 100644 --- a/cmake/configs/nuttx_auav-x21_default.cmake +++ b/cmake/configs/nuttx_auav-x21_default.cmake @@ -24,8 +24,8 @@ set(config_module_list drivers/hott drivers/led drivers/mkblctrl - drivers/mpu6000 - drivers/mpu9250 + drivers/imu/mpu6000 + drivers/imu/mpu9250 drivers/oreoled drivers/pwm_input drivers/pwm_out_sim diff --git a/cmake/configs/nuttx_crazyflie_default.cmake b/cmake/configs/nuttx_crazyflie_default.cmake index e151a6c9d8..84260d1ecb 100644 --- a/cmake/configs/nuttx_crazyflie_default.cmake +++ b/cmake/configs/nuttx_crazyflie_default.cmake @@ -10,7 +10,7 @@ set(config_module_list drivers/led drivers/px4fmu drivers/boards - drivers/mpu9250 + drivers/imu/mpu9250 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 4e7d8a8597..1fd527ec75 100644 --- a/cmake/configs/nuttx_mindpx-v2_default.cmake +++ b/cmake/configs/nuttx_mindpx-v2_default.cmake @@ -21,13 +21,13 @@ set(config_module_list drivers/frsky_telemetry drivers/gps #drivers/hott - drivers/l3gd20 + drivers/imu/l3gd20 drivers/led - drivers/lsm303d + drivers/imu/lsm303d drivers/magnetometer/hmc5883 #drivers/mkblctrl - drivers/mpu6000 - drivers/mpu9250 + drivers/imu/mpu6000 + drivers/imu/mpu9250 #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 9e72918b34..3b26e0c7ce 100644 --- a/cmake/configs/nuttx_nxphlite-v3_default.cmake +++ b/cmake/configs/nuttx_nxphlite-v3_default.cmake @@ -21,19 +21,19 @@ set(config_module_list drivers/camera_trigger drivers/device drivers/frsky_telemetry - drivers/fxas21002c - drivers/fxos8701cq + drivers/imu/fxas21002c + drivers/imu/fxos8701cq drivers/gps drivers/hott drivers/iridiumsbd drivers/kinetis drivers/kinetis/adc drivers/kinetis/tone_alarm - drivers/l3gd20 + drivers/imu/l3gd20 drivers/led drivers/mkblctrl - drivers/mpu6000 - drivers/mpu9250 + drivers/imu/mpu6000 + drivers/imu/mpu9250 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 0f941ff878..7d28aa2d13 100644 --- a/cmake/configs/nuttx_px4-same70xplained-v1_default.cmake +++ b/cmake/configs/nuttx_px4-same70xplained-v1_default.cmake @@ -20,10 +20,10 @@ set(config_module_list drivers/px4fmu drivers/boards drivers/rgbled - drivers/mpu6000 - drivers/mpu9250 - drivers/lsm303d - drivers/l3gd20 + drivers/imu/mpu6000 + drivers/imu/mpu9250 + drivers/imu/lsm303d + drivers/imu/l3gd20 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 820936c22f..46a1839601 100644 --- a/cmake/configs/nuttx_px4fmu-v2_default.cmake +++ b/cmake/configs/nuttx_px4fmu-v2_default.cmake @@ -10,12 +10,12 @@ set(config_module_list drivers/differential_pressure #drivers/magnetometer - #drivers/adis16448 + #drivers/imu/adis16448 drivers/airspeed drivers/barometer/ms5611 #drivers/blinkm - #drivers/bmi160 - #drivers/bmp280 + #drivers/imu/bmi160 + #drivers/barometer/bmp280 drivers/boards #drivers/bst drivers/camera_trigger @@ -25,15 +25,15 @@ set(config_module_list #drivers/hott #drivers/iridiumsbd #drivers/irlock - drivers/l3gd20 + drivers/imu/l3gd20 drivers/led - drivers/lsm303d + drivers/imu/lsm303d drivers/magnetometer/hmc5883 drivers/magnetometer/lis3mdl #drivers/mb12xx #drivers/mkblctrl - drivers/mpu6000 - drivers/mpu9250 + drivers/imu/mpu6000 + drivers/imu/mpu9250 #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 754af83bc3..4329a78476 100644 --- a/cmake/configs/nuttx_px4fmu-v2_test.cmake +++ b/cmake/configs/nuttx_px4fmu-v2_test.cmake @@ -14,10 +14,10 @@ set(config_module_list drivers/px4io drivers/boards drivers/rgbled - drivers/mpu6000 -#TO FIT drivers/mpu9250 - drivers/lsm303d - drivers/l3gd20 + drivers/imu/mpu6000 +#TO FIT drivers/imu/mpu9250 + drivers/imu/lsm303d + drivers/imu/l3gd20 drivers/hmc5883 #drivers/mb12xx #drivers/srf02 diff --git a/cmake/configs/nuttx_px4fmu-v3_default.cmake b/cmake/configs/nuttx_px4fmu-v3_default.cmake index ee21eea8fe..155bb614eb 100644 --- a/cmake/configs/nuttx_px4fmu-v3_default.cmake +++ b/cmake/configs/nuttx_px4fmu-v3_default.cmake @@ -18,11 +18,11 @@ set(config_module_list drivers/distance_sensor drivers/magnetometer - drivers/adis16448 + drivers/imu/adis16448 drivers/airspeed drivers/batt_smbus drivers/blinkm - drivers/bmi160 + drivers/imu/bmi160 drivers/boards drivers/bst drivers/camera_trigger @@ -32,11 +32,11 @@ set(config_module_list drivers/hott drivers/iridiumsbd drivers/irlock - drivers/l3gd20 + drivers/imu/l3gd20 drivers/led drivers/mkblctrl - drivers/mpu6000 - drivers/mpu9250 + drivers/imu/mpu6000 + drivers/imu/mpu9250 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 ba248959b1..b8609d6552 100644 --- a/cmake/configs/nuttx_px4fmu-v4_default.cmake +++ b/cmake/configs/nuttx_px4fmu-v4_default.cmake @@ -15,9 +15,9 @@ set(config_module_list drivers/airspeed drivers/batt_smbus drivers/blinkm - drivers/bma180 - drivers/bmi055 - drivers/bmi160 + drivers/imu/bma180 + drivers/imu/bmi055 + drivers/imu/bmi160 drivers/boards drivers/bst drivers/camera_trigger @@ -29,8 +29,8 @@ set(config_module_list drivers/irlock drivers/led drivers/mkblctrl - drivers/mpu6000 - drivers/mpu9250 + drivers/imu/mpu6000 + drivers/imu/mpu9250 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 4a62ebd80a..acbbb0c6f7 100644 --- a/cmake/configs/nuttx_px4fmu-v4pro_default.cmake +++ b/cmake/configs/nuttx_px4fmu-v4pro_default.cmake @@ -15,8 +15,8 @@ set(config_module_list drivers/airspeed drivers/batt_smbus drivers/blinkm - drivers/bma180 - drivers/bmi160 + drivers/imu/bma180 + drivers/imu/bmi160 drivers/boards drivers/bst drivers/camera_trigger @@ -26,11 +26,11 @@ set(config_module_list drivers/hott drivers/iridiumsbd drivers/irlock - drivers/l3gd20 + drivers/imu/l3gd20 drivers/led drivers/mkblctrl - drivers/mpu6000 - drivers/mpu9250 + drivers/imu/mpu6000 + drivers/imu/mpu9250 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 c281885938..3c9c29cc9b 100644 --- a/cmake/configs/nuttx_px4fmu-v5_default.cmake +++ b/cmake/configs/nuttx_px4fmu-v5_default.cmake @@ -15,9 +15,9 @@ set(config_module_list drivers/airspeed drivers/batt_smbus drivers/blinkm - drivers/bma180 - drivers/bmi055 - drivers/bmi160 + drivers/imu/bma180 + drivers/imu/bmi055 + drivers/imu/bmi160 drivers/boards drivers/bst drivers/camera_trigger @@ -29,8 +29,8 @@ set(config_module_list drivers/irlock drivers/led drivers/mkblctrl - drivers/mpu6000 - drivers/mpu9250 + drivers/imu/mpu6000 + drivers/imu/mpu9250 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 0c650b28ee..311698a75a 100644 --- a/cmake/configs/nuttx_px4nucleoF767ZI-v1_default.cmake +++ b/cmake/configs/nuttx_px4nucleoF767ZI-v1_default.cmake @@ -12,11 +12,11 @@ set(config_module_list drivers/distance_sensor drivers/magnetometer - drivers/adis16448 + drivers/imu/adis16448 drivers/airspeed drivers/blinkm - drivers/bma180 - drivers/bmi160 + drivers/imu/bma180 + drivers/imu/bmi160 drivers/boards drivers/bst drivers/camera_trigger @@ -26,8 +26,8 @@ set(config_module_list drivers/hott drivers/led drivers/mkblctrl - drivers/mpu6000 - drivers/mpu9250 + drivers/imu/mpu6000 + drivers/imu/mpu9250 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 4710f8ab50..5a3f44d1db 100644 --- a/cmake/configs/nuttx_tap-v1_default.cmake +++ b/cmake/configs/nuttx_tap-v1_default.cmake @@ -15,7 +15,7 @@ set(config_module_list drivers/gps drivers/led drivers/magnetometer/hmc5883 - drivers/mpu6000 + drivers/imu/mpu6000 drivers/px4fmu drivers/rgbled_pwm drivers/stm32 diff --git a/src/drivers/adis16448/CMakeLists.txt b/src/drivers/imu/adis16448/CMakeLists.txt similarity index 100% rename from src/drivers/adis16448/CMakeLists.txt rename to src/drivers/imu/adis16448/CMakeLists.txt diff --git a/src/drivers/adis16448/adis16448.cpp b/src/drivers/imu/adis16448/adis16448.cpp similarity index 100% rename from src/drivers/adis16448/adis16448.cpp rename to src/drivers/imu/adis16448/adis16448.cpp diff --git a/src/drivers/bma180/CMakeLists.txt b/src/drivers/imu/bma180/CMakeLists.txt similarity index 100% rename from src/drivers/bma180/CMakeLists.txt rename to src/drivers/imu/bma180/CMakeLists.txt diff --git a/src/drivers/bma180/bma180.cpp b/src/drivers/imu/bma180/bma180.cpp similarity index 100% rename from src/drivers/bma180/bma180.cpp rename to src/drivers/imu/bma180/bma180.cpp diff --git a/src/drivers/bmi055/CMakeLists.txt b/src/drivers/imu/bmi055/CMakeLists.txt similarity index 100% rename from src/drivers/bmi055/CMakeLists.txt rename to src/drivers/imu/bmi055/CMakeLists.txt diff --git a/src/drivers/bmi055/bmi055.hpp b/src/drivers/imu/bmi055/bmi055.hpp similarity index 100% rename from src/drivers/bmi055/bmi055.hpp rename to src/drivers/imu/bmi055/bmi055.hpp diff --git a/src/drivers/bmi055/bmi055_accel.cpp b/src/drivers/imu/bmi055/bmi055_accel.cpp similarity index 100% rename from src/drivers/bmi055/bmi055_accel.cpp rename to src/drivers/imu/bmi055/bmi055_accel.cpp diff --git a/src/drivers/bmi055/bmi055_gyro.cpp b/src/drivers/imu/bmi055/bmi055_gyro.cpp similarity index 100% rename from src/drivers/bmi055/bmi055_gyro.cpp rename to src/drivers/imu/bmi055/bmi055_gyro.cpp diff --git a/src/drivers/bmi055/bmi055_main.cpp b/src/drivers/imu/bmi055/bmi055_main.cpp similarity index 100% rename from src/drivers/bmi055/bmi055_main.cpp rename to src/drivers/imu/bmi055/bmi055_main.cpp diff --git a/src/drivers/bmi160/CMakeLists.txt b/src/drivers/imu/bmi160/CMakeLists.txt similarity index 100% rename from src/drivers/bmi160/CMakeLists.txt rename to src/drivers/imu/bmi160/CMakeLists.txt diff --git a/src/drivers/bmi160/bmi160.cpp b/src/drivers/imu/bmi160/bmi160.cpp similarity index 100% rename from src/drivers/bmi160/bmi160.cpp rename to src/drivers/imu/bmi160/bmi160.cpp diff --git a/src/drivers/bmi160/bmi160.hpp b/src/drivers/imu/bmi160/bmi160.hpp similarity index 100% rename from src/drivers/bmi160/bmi160.hpp rename to src/drivers/imu/bmi160/bmi160.hpp diff --git a/src/drivers/bmi160/bmi160_gyro.cpp b/src/drivers/imu/bmi160/bmi160_gyro.cpp similarity index 100% rename from src/drivers/bmi160/bmi160_gyro.cpp rename to src/drivers/imu/bmi160/bmi160_gyro.cpp diff --git a/src/drivers/bmi160/bmi160_gyro.hpp b/src/drivers/imu/bmi160/bmi160_gyro.hpp similarity index 100% rename from src/drivers/bmi160/bmi160_gyro.hpp rename to src/drivers/imu/bmi160/bmi160_gyro.hpp diff --git a/src/drivers/bmi160/bmi160_main.cpp b/src/drivers/imu/bmi160/bmi160_main.cpp similarity index 100% rename from src/drivers/bmi160/bmi160_main.cpp rename to src/drivers/imu/bmi160/bmi160_main.cpp diff --git a/src/drivers/fxas21002c/CMakeLists.txt b/src/drivers/imu/fxas21002c/CMakeLists.txt similarity index 100% rename from src/drivers/fxas21002c/CMakeLists.txt rename to src/drivers/imu/fxas21002c/CMakeLists.txt diff --git a/src/drivers/fxas21002c/fxas21002c.cpp b/src/drivers/imu/fxas21002c/fxas21002c.cpp similarity index 100% rename from src/drivers/fxas21002c/fxas21002c.cpp rename to src/drivers/imu/fxas21002c/fxas21002c.cpp diff --git a/src/drivers/fxos8701cq/CMakeLists.txt b/src/drivers/imu/fxos8701cq/CMakeLists.txt similarity index 100% rename from src/drivers/fxos8701cq/CMakeLists.txt rename to src/drivers/imu/fxos8701cq/CMakeLists.txt diff --git a/src/drivers/fxos8701cq/fxos8701cq.cpp b/src/drivers/imu/fxos8701cq/fxos8701cq.cpp similarity index 100% rename from src/drivers/fxos8701cq/fxos8701cq.cpp rename to src/drivers/imu/fxos8701cq/fxos8701cq.cpp diff --git a/src/drivers/l3gd20/CMakeLists.txt b/src/drivers/imu/l3gd20/CMakeLists.txt similarity index 100% rename from src/drivers/l3gd20/CMakeLists.txt rename to src/drivers/imu/l3gd20/CMakeLists.txt diff --git a/src/drivers/l3gd20/l3gd20.cpp b/src/drivers/imu/l3gd20/l3gd20.cpp similarity index 100% rename from src/drivers/l3gd20/l3gd20.cpp rename to src/drivers/imu/l3gd20/l3gd20.cpp diff --git a/src/drivers/lsm303d/CMakeLists.txt b/src/drivers/imu/lsm303d/CMakeLists.txt similarity index 100% rename from src/drivers/lsm303d/CMakeLists.txt rename to src/drivers/imu/lsm303d/CMakeLists.txt diff --git a/src/drivers/lsm303d/lsm303d.cpp b/src/drivers/imu/lsm303d/lsm303d.cpp similarity index 100% rename from src/drivers/lsm303d/lsm303d.cpp rename to src/drivers/imu/lsm303d/lsm303d.cpp diff --git a/src/drivers/mpu6000/CMakeLists.txt b/src/drivers/imu/mpu6000/CMakeLists.txt similarity index 100% rename from src/drivers/mpu6000/CMakeLists.txt rename to src/drivers/imu/mpu6000/CMakeLists.txt diff --git a/src/drivers/mpu6000/mpu6000.cpp b/src/drivers/imu/mpu6000/mpu6000.cpp similarity index 100% rename from src/drivers/mpu6000/mpu6000.cpp rename to src/drivers/imu/mpu6000/mpu6000.cpp diff --git a/src/drivers/mpu6000/mpu6000.h b/src/drivers/imu/mpu6000/mpu6000.h similarity index 100% rename from src/drivers/mpu6000/mpu6000.h rename to src/drivers/imu/mpu6000/mpu6000.h diff --git a/src/drivers/mpu6000/mpu6000_i2c.cpp b/src/drivers/imu/mpu6000/mpu6000_i2c.cpp similarity index 100% rename from src/drivers/mpu6000/mpu6000_i2c.cpp rename to src/drivers/imu/mpu6000/mpu6000_i2c.cpp diff --git a/src/drivers/mpu6000/mpu6000_spi.cpp b/src/drivers/imu/mpu6000/mpu6000_spi.cpp similarity index 100% rename from src/drivers/mpu6000/mpu6000_spi.cpp rename to src/drivers/imu/mpu6000/mpu6000_spi.cpp diff --git a/src/drivers/mpu9250/CMakeLists.txt b/src/drivers/imu/mpu9250/CMakeLists.txt similarity index 100% rename from src/drivers/mpu9250/CMakeLists.txt rename to src/drivers/imu/mpu9250/CMakeLists.txt diff --git a/src/drivers/mpu9250/gyro.cpp b/src/drivers/imu/mpu9250/gyro.cpp similarity index 100% rename from src/drivers/mpu9250/gyro.cpp rename to src/drivers/imu/mpu9250/gyro.cpp diff --git a/src/drivers/mpu9250/gyro.h b/src/drivers/imu/mpu9250/gyro.h similarity index 100% rename from src/drivers/mpu9250/gyro.h rename to src/drivers/imu/mpu9250/gyro.h diff --git a/src/drivers/mpu9250/mag.cpp b/src/drivers/imu/mpu9250/mag.cpp similarity index 100% rename from src/drivers/mpu9250/mag.cpp rename to src/drivers/imu/mpu9250/mag.cpp diff --git a/src/drivers/mpu9250/mag.h b/src/drivers/imu/mpu9250/mag.h similarity index 100% rename from src/drivers/mpu9250/mag.h rename to src/drivers/imu/mpu9250/mag.h diff --git a/src/drivers/mpu9250/mag_i2c.cpp b/src/drivers/imu/mpu9250/mag_i2c.cpp similarity index 100% rename from src/drivers/mpu9250/mag_i2c.cpp rename to src/drivers/imu/mpu9250/mag_i2c.cpp diff --git a/src/drivers/mpu9250/main.cpp b/src/drivers/imu/mpu9250/main.cpp similarity index 100% rename from src/drivers/mpu9250/main.cpp rename to src/drivers/imu/mpu9250/main.cpp diff --git a/src/drivers/mpu9250/mpu9250.cpp b/src/drivers/imu/mpu9250/mpu9250.cpp similarity index 100% rename from src/drivers/mpu9250/mpu9250.cpp rename to src/drivers/imu/mpu9250/mpu9250.cpp diff --git a/src/drivers/mpu9250/mpu9250.h b/src/drivers/imu/mpu9250/mpu9250.h similarity index 100% rename from src/drivers/mpu9250/mpu9250.h rename to src/drivers/imu/mpu9250/mpu9250.h diff --git a/src/drivers/mpu9250/mpu9250_i2c.cpp b/src/drivers/imu/mpu9250/mpu9250_i2c.cpp similarity index 100% rename from src/drivers/mpu9250/mpu9250_i2c.cpp rename to src/drivers/imu/mpu9250/mpu9250_i2c.cpp diff --git a/src/drivers/mpu9250/mpu9250_spi.cpp b/src/drivers/imu/mpu9250/mpu9250_spi.cpp similarity index 100% rename from src/drivers/mpu9250/mpu9250_spi.cpp rename to src/drivers/imu/mpu9250/mpu9250_spi.cpp