From 89642a920380606f5508b5d3ecb596ca47d357e6 Mon Sep 17 00:00:00 2001 From: Julien Lecoeur Date: Thu, 12 Oct 2017 15:13:06 +0200 Subject: [PATCH] Move src/module/systemlib/mixer to src/lib/mixer --- cmake/configs/nuttx_aerocore2_default.cmake | 14 +++++++------- cmake/configs/nuttx_aerofc-v1_default.cmake | 14 +++++++------- cmake/configs/nuttx_auav-x21_default.cmake | 12 ++++++------ cmake/configs/nuttx_crazyflie_default.cmake | 14 +++++++------- cmake/configs/nuttx_mindpx-v2_default.cmake | 14 +++++++------- cmake/configs/nuttx_nxphlite-v3_default.cmake | 12 ++++++------ .../nuttx_px4-same70xplained-v1_default.cmake | 18 +++++++++--------- .../nuttx_px4-stm32f4discovery_default.cmake | 10 +++++----- cmake/configs/nuttx_px4fmu-v2_default.cmake | 12 ++++++------ cmake/configs/nuttx_px4fmu-v2_test.cmake | 12 ++++++------ cmake/configs/nuttx_px4fmu-v3_default.cmake | 2 +- cmake/configs/nuttx_px4fmu-v4_default.cmake | 14 +++++++------- cmake/configs/nuttx_px4fmu-v4pro_default.cmake | 2 +- cmake/configs/nuttx_px4fmu-v5_default.cmake | 2 +- cmake/configs/nuttx_px4io-v1_default.cmake | 2 +- cmake/configs/nuttx_px4io-v2_default.cmake | 3 +-- .../nuttx_px4nucleoF767ZI-v1_default.cmake | 14 +++++++------- cmake/configs/nuttx_tap-v1_default.cmake | 10 +++++----- cmake/configs/posix_bebop_default.cmake | 14 +++++++------- cmake/configs/posix_ocpoc_cross.cmake | 18 +++++++++--------- cmake/configs/posix_ocpoc_ubuntu.cmake | 18 +++++++++--------- cmake/configs/posix_rpi_common.cmake | 14 +++++++------- cmake/configs/posix_sdflight_default.cmake | 10 +++++----- cmake/configs/posix_sdflight_legacy.cmake | 10 +++++----- cmake/configs/posix_sitl_default.cmake | 2 +- cmake/configs/qurt_eagle_hil.cmake | 14 +++++++------- cmake/configs/qurt_eagle_test.cmake | 6 +++--- cmake/configs/qurt_eagle_travis.cmake | 14 +++++++------- cmake/configs/qurt_sdflight_default.cmake | 16 ++++++++-------- cmake/configs/qurt_sdflight_legacy.cmake | 16 ++++++++-------- src/drivers/linux_pwm_out/linux_pwm_out.cpp | 4 ++-- src/drivers/mkblctrl/mkblctrl.cpp | 2 +- src/drivers/pwm_out_rc_in/pwm_out_rc_in.cpp | 4 ++-- src/drivers/pwm_out_sim/pwm_out_sim.cpp | 2 +- src/drivers/px4fmu/fmu.cpp | 2 +- src/drivers/px4io/px4io.cpp | 2 +- .../snapdragon_pwm_out/snapdragon_pwm_out.cpp | 6 +++--- src/drivers/tap_esc/tap_esc.cpp | 2 +- .../systemlib => lib}/mixer/CMakeLists.txt | 2 +- .../mixer/geoms/dodeca_bottom_cox.toml | 0 .../mixer/geoms/dodeca_top_cox.toml | 0 .../systemlib => lib}/mixer/geoms/hex_cox.toml | 0 .../mixer/geoms/hex_plus.toml | 0 .../systemlib => lib}/mixer/geoms/hex_t.toml | 0 .../systemlib => lib}/mixer/geoms/hex_x.toml | 0 .../mixer/geoms/octa_cox.toml | 0 .../mixer/geoms/octa_cox_wide.toml | 0 .../mixer/geoms/octa_plus.toml | 0 .../systemlib => lib}/mixer/geoms/octa_x.toml | 0 .../mixer/geoms/quad_deadcat.toml | 0 .../systemlib => lib}/mixer/geoms/quad_h.toml | 0 .../mixer/geoms/quad_plus.toml | 0 .../mixer/geoms/quad_vtail.toml | 0 .../mixer/geoms/quad_wide.toml | 0 .../systemlib => lib}/mixer/geoms/quad_x.toml | 2 +- .../mixer/geoms/quad_x_pusher.toml | 0 .../systemlib => lib}/mixer/geoms/quad_y.toml | 0 .../mixer/geoms/tools/px_generate_mixers.py | 0 .../systemlib => lib}/mixer/geoms/tri_y.toml | 0 .../mixer/geoms/twin_engine.toml | 0 src/{modules/systemlib => lib}/mixer/mixer.cpp | 0 src/{modules/systemlib => lib}/mixer/mixer.h | 0 .../systemlib => lib}/mixer/mixer_group.cpp | 0 .../mixer/mixer_helicopter.cpp | 1 - .../systemlib => lib}/mixer/mixer_load.c | 1 - .../systemlib => lib}/mixer/mixer_load.h | 0 .../mixer/mixer_multirotor.cpp | 0 .../systemlib => lib}/mixer/mixer_simple.cpp | 0 .../systemlib => lib}/mixer/multi_tables.py | 0 .../mc_att_control/mc_att_control_main.cpp | 2 +- src/modules/px4iofirmware/mixer.cpp | 2 +- src/modules/uavcan/uavcan_main.cpp | 2 +- src/modules/uavcan/uavcan_servers.cpp | 2 +- src/modules/uavcanesc/uavcanesc_main.cpp | 2 +- src/modules/uavcannode/uavcannode_main.cpp | 2 +- .../df_bebop_bus_wrapper.cpp | 2 +- .../qurt/fc_addon/uart_esc/uart_esc_main.cpp | 4 ++-- src/systemcmds/mixer/mixer.cpp | 2 +- src/systemcmds/tests/test_autodeclination.cpp | 2 +- src/systemcmds/tests/test_mixer.cpp | 2 +- 80 files changed, 192 insertions(+), 195 deletions(-) rename src/{modules/systemlib => lib}/mixer/CMakeLists.txt (99%) rename src/{modules/systemlib => lib}/mixer/geoms/dodeca_bottom_cox.toml (100%) rename src/{modules/systemlib => lib}/mixer/geoms/dodeca_top_cox.toml (100%) rename src/{modules/systemlib => lib}/mixer/geoms/hex_cox.toml (100%) rename src/{modules/systemlib => lib}/mixer/geoms/hex_plus.toml (100%) rename src/{modules/systemlib => lib}/mixer/geoms/hex_t.toml (100%) rename src/{modules/systemlib => lib}/mixer/geoms/hex_x.toml (100%) rename src/{modules/systemlib => lib}/mixer/geoms/octa_cox.toml (100%) rename src/{modules/systemlib => lib}/mixer/geoms/octa_cox_wide.toml (100%) rename src/{modules/systemlib => lib}/mixer/geoms/octa_plus.toml (100%) rename src/{modules/systemlib => lib}/mixer/geoms/octa_x.toml (100%) rename src/{modules/systemlib => lib}/mixer/geoms/quad_deadcat.toml (100%) rename src/{modules/systemlib => lib}/mixer/geoms/quad_h.toml (100%) rename src/{modules/systemlib => lib}/mixer/geoms/quad_plus.toml (100%) rename src/{modules/systemlib => lib}/mixer/geoms/quad_vtail.toml (100%) rename src/{modules/systemlib => lib}/mixer/geoms/quad_wide.toml (100%) rename src/{modules/systemlib => lib}/mixer/geoms/quad_x.toml (92%) rename src/{modules/systemlib => lib}/mixer/geoms/quad_x_pusher.toml (100%) rename src/{modules/systemlib => lib}/mixer/geoms/quad_y.toml (100%) rename src/{modules/systemlib => lib}/mixer/geoms/tools/px_generate_mixers.py (100%) rename src/{modules/systemlib => lib}/mixer/geoms/tri_y.toml (100%) rename src/{modules/systemlib => lib}/mixer/geoms/twin_engine.toml (100%) rename src/{modules/systemlib => lib}/mixer/mixer.cpp (100%) rename src/{modules/systemlib => lib}/mixer/mixer.h (100%) rename src/{modules/systemlib => lib}/mixer/mixer_group.cpp (100%) rename src/{modules/systemlib => lib}/mixer/mixer_helicopter.cpp (99%) rename src/{modules/systemlib => lib}/mixer/mixer_load.c (99%) rename src/{modules/systemlib => lib}/mixer/mixer_load.h (100%) rename src/{modules/systemlib => lib}/mixer/mixer_multirotor.cpp (100%) rename src/{modules/systemlib => lib}/mixer/mixer_simple.cpp (100%) rename src/{modules/systemlib => lib}/mixer/multi_tables.py (100%) diff --git a/cmake/configs/nuttx_aerocore2_default.cmake b/cmake/configs/nuttx_aerocore2_default.cmake index 8e082bfe26..65a74556d0 100644 --- a/cmake/configs/nuttx_aerocore2_default.cmake +++ b/cmake/configs/nuttx_aerocore2_default.cmake @@ -105,7 +105,6 @@ set(config_module_list # modules/systemlib/param modules/systemlib - modules/systemlib/mixer modules/uORB modules/dataman @@ -113,20 +112,21 @@ set(config_module_list # Libraries # lib/controllib - lib/mathlib - lib/mathlib/math/filter - lib/rc + lib/conversion + lib/DriverFramework/framework lib/ecl lib/geo lib/geo_lookup - lib/conversion lib/launchdetection lib/led - lib/terrain_estimation + lib/mathlib + lib/mathlib/math/filter + lib/mixer + lib/rc lib/runway_takeoff lib/tailsitter_recovery + lib/terrain_estimation lib/version - lib/DriverFramework/framework platforms/nuttx # had to add for cmake, not sure why wasn't in original config diff --git a/cmake/configs/nuttx_aerofc-v1_default.cmake b/cmake/configs/nuttx_aerofc-v1_default.cmake index b7cd86b228..a9e3559a3b 100644 --- a/cmake/configs/nuttx_aerofc-v1_default.cmake +++ b/cmake/configs/nuttx_aerofc-v1_default.cmake @@ -70,7 +70,6 @@ set(config_module_list # modules/systemlib/param modules/systemlib - modules/systemlib/mixer modules/uORB modules/dataman @@ -78,17 +77,18 @@ set(config_module_list # Libraries # lib/controllib - lib/mathlib - lib/mathlib/math/filter + lib/conversion + lib/DriverFramework/framework lib/ecl lib/geo lib/geo_lookup - lib/conversion + lib/mathlib + lib/mathlib/math/filter + lib/mixer + lib/rc lib/tailsitter_recovery lib/version - lib/DriverFramework/framework - lib/rc - platforms/nuttx platforms/common + platforms/nuttx platforms/nuttx/px4_layer ) diff --git a/cmake/configs/nuttx_auav-x21_default.cmake b/cmake/configs/nuttx_auav-x21_default.cmake index 55b60b5c80..4b614310d2 100644 --- a/cmake/configs/nuttx_auav-x21_default.cmake +++ b/cmake/configs/nuttx_auav-x21_default.cmake @@ -126,7 +126,6 @@ set(config_module_list # modules/systemlib/param modules/systemlib - modules/systemlib/mixer modules/uORB modules/dataman @@ -134,19 +133,20 @@ set(config_module_list # Libraries # lib/controllib - lib/mathlib - lib/mathlib/math/filter + lib/conversion + lib/DriverFramework/framework lib/ecl lib/geo lib/geo_lookup - lib/conversion lib/launchdetection lib/led - lib/terrain_estimation + lib/mathlib + lib/mathlib/math/filter + lib/mixer lib/runway_takeoff lib/tailsitter_recovery + lib/terrain_estimation lib/version - lib/DriverFramework/framework platforms/nuttx # had to add for cmake, not sure why wasn't in original config diff --git a/cmake/configs/nuttx_crazyflie_default.cmake b/cmake/configs/nuttx_crazyflie_default.cmake index 73981d47cd..77d5a2dc7d 100644 --- a/cmake/configs/nuttx_crazyflie_default.cmake +++ b/cmake/configs/nuttx_crazyflie_default.cmake @@ -73,7 +73,6 @@ set(config_module_list # modules/systemlib/param modules/systemlib - modules/systemlib/mixer modules/uORB modules/dataman @@ -81,19 +80,20 @@ set(config_module_list # Libraries # lib/controllib - lib/mathlib - lib/mathlib/math/filter - lib/rc + lib/conversion + lib/DriverFramework/framework lib/ecl lib/geo lib/geo_lookup - lib/conversion lib/launchdetection - lib/terrain_estimation + lib/mathlib + lib/mathlib/math/filter + lib/mixer + lib/rc lib/runway_takeoff lib/tailsitter_recovery + lib/terrain_estimation lib/version - lib/DriverFramework/framework platforms/nuttx # had to add for cmake, not sure why wasn't in original config diff --git a/cmake/configs/nuttx_mindpx-v2_default.cmake b/cmake/configs/nuttx_mindpx-v2_default.cmake index e5ef80cb63..246efab752 100644 --- a/cmake/configs/nuttx_mindpx-v2_default.cmake +++ b/cmake/configs/nuttx_mindpx-v2_default.cmake @@ -130,7 +130,6 @@ set(config_module_list # modules/systemlib/param modules/systemlib - modules/systemlib/mixer modules/uORB modules/dataman @@ -138,20 +137,21 @@ set(config_module_list # Libraries # lib/controllib - lib/mathlib - lib/mathlib/math/filter - lib/rc + lib/conversion + lib/DriverFramework/framework lib/ecl lib/geo lib/geo_lookup - lib/conversion lib/launchdetection lib/led - lib/terrain_estimation + lib/mathlib + lib/mathlib/math/filter + lib/mixer + lib/rc lib/runway_takeoff lib/tailsitter_recovery + lib/terrain_estimation lib/version - lib/DriverFramework/framework platforms/nuttx # had to add for cmake, not sure why wasn't in original config diff --git a/cmake/configs/nuttx_nxphlite-v3_default.cmake b/cmake/configs/nuttx_nxphlite-v3_default.cmake index bd6179c09a..b40fc35ff6 100644 --- a/cmake/configs/nuttx_nxphlite-v3_default.cmake +++ b/cmake/configs/nuttx_nxphlite-v3_default.cmake @@ -134,12 +134,11 @@ set(config_module_list modules/logger modules/sdlog2 -# + # # Library modules # modules/systemlib/param modules/systemlib - modules/systemlib/mixer modules/uORB modules/dataman @@ -147,18 +146,19 @@ set(config_module_list # Libraries # lib/controllib - lib/mathlib - lib/mathlib/math/filter - lib/rc lib/ecl lib/geo lib/geo_lookup lib/conversion lib/launchdetection lib/led - lib/terrain_estimation + lib/mathlib + lib/mathlib/math/filter + lib/mixer + lib/rc lib/runway_takeoff lib/tailsitter_recovery + lib/terrain_estimation lib/version lib/DriverFramework/framework diff --git a/cmake/configs/nuttx_px4-same70xplained-v1_default.cmake b/cmake/configs/nuttx_px4-same70xplained-v1_default.cmake index 05890ebe33..3b027beed9 100644 --- a/cmake/configs/nuttx_px4-same70xplained-v1_default.cmake +++ b/cmake/configs/nuttx_px4-same70xplained-v1_default.cmake @@ -107,7 +107,6 @@ set(config_module_list # modules/systemlib/param modules/systemlib - modules/systemlib/mixer modules/uORB modules/dataman @@ -115,20 +114,21 @@ set(config_module_list # Libraries # lib/controllib - lib/mathlib - lib/mathlib/math/filter - lib/rc + lib/conversion + lib/DriverFramework/framework lib/ecl lib/geo lib/geo_lookup - lib/conversion - lib/led - lib/DriverFramework/framework lib/launchdetection - lib/version - lib/terrain_estimation + lib/led + lib/mathlib + lib/mathlib/math/filter + lib/mixer + lib/rc lib/runway_takeoff lib/tailsitter_recovery + lib/terrain_estimation + lib/version platforms/nuttx # had to add for cmake, not sure why wasn't in original config diff --git a/cmake/configs/nuttx_px4-stm32f4discovery_default.cmake b/cmake/configs/nuttx_px4-stm32f4discovery_default.cmake index 735d1f2d50..bc4dfa8315 100644 --- a/cmake/configs/nuttx_px4-stm32f4discovery_default.cmake +++ b/cmake/configs/nuttx_px4-stm32f4discovery_default.cmake @@ -29,7 +29,6 @@ set(config_module_list # modules/systemlib/param modules/systemlib - modules/systemlib/mixer modules/uORB # @@ -37,13 +36,14 @@ set(config_module_list # #lib/mathlib/CMSIS lib/controllib - lib/mathlib - lib/mathlib/math/filter + lib/conversion + lib/DriverFramework/framework lib/ecl lib/geo - lib/conversion + lib/mathlib + lib/mathlib/math/filter + lib/mixer lib/version - lib/DriverFramework/framework platforms/nuttx # had to add for cmake, not sure why wasn't in original config diff --git a/cmake/configs/nuttx_px4fmu-v2_default.cmake b/cmake/configs/nuttx_px4fmu-v2_default.cmake index e88b5d5caa..d7bafe40cd 100644 --- a/cmake/configs/nuttx_px4fmu-v2_default.cmake +++ b/cmake/configs/nuttx_px4fmu-v2_default.cmake @@ -127,7 +127,6 @@ set(config_module_list # modules/systemlib/param modules/systemlib - modules/systemlib/mixer modules/uORB modules/dataman @@ -135,19 +134,20 @@ set(config_module_list # Libraries # lib/controllib - lib/mathlib - lib/mathlib/math/filter + lib/conversion + lib/DriverFramework/framework lib/ecl lib/geo lib/geo_lookup - lib/conversion lib/launchdetection lib/led - lib/terrain_estimation + lib/mathlib + lib/mathlib/math/filter + lib/mixer lib/runway_takeoff lib/tailsitter_recovery + lib/terrain_estimation lib/version - lib/DriverFramework/framework platforms/nuttx # had to add for cmake, not sure why wasn't in original config diff --git a/cmake/configs/nuttx_px4fmu-v2_test.cmake b/cmake/configs/nuttx_px4fmu-v2_test.cmake index 19c1442027..74eeea90e7 100644 --- a/cmake/configs/nuttx_px4fmu-v2_test.cmake +++ b/cmake/configs/nuttx_px4fmu-v2_test.cmake @@ -122,7 +122,6 @@ set(config_module_list # modules/systemlib/param modules/systemlib - modules/systemlib/mixer modules/uORB modules/dataman @@ -130,19 +129,20 @@ set(config_module_list # Libraries # lib/controllib - lib/mathlib - lib/mathlib/math/filter + lib/conversion + lib/DriverFramework/framework lib/ecl lib/geo lib/geo_lookup - lib/conversion lib/launchdetection lib/led - lib/terrain_estimation + lib/mathlib + lib/mathlib/math/filter + lib/mixer lib/runway_takeoff lib/tailsitter_recovery + lib/terrain_estimation lib/version - lib/DriverFramework/framework platforms/nuttx # had to add for cmake, not sure why wasn't in original config diff --git a/cmake/configs/nuttx_px4fmu-v3_default.cmake b/cmake/configs/nuttx_px4fmu-v3_default.cmake index a035b619b0..da641b297c 100644 --- a/cmake/configs/nuttx_px4fmu-v3_default.cmake +++ b/cmake/configs/nuttx_px4fmu-v3_default.cmake @@ -135,7 +135,6 @@ set(config_module_list modules/dataman modules/systemlib/param modules/systemlib - modules/systemlib/mixer modules/uORB # @@ -151,6 +150,7 @@ set(config_module_list lib/led lib/mathlib lib/mathlib/math/filter + lib/mixer lib/runway_takeoff lib/tailsitter_recovery lib/terrain_estimation diff --git a/cmake/configs/nuttx_px4fmu-v4_default.cmake b/cmake/configs/nuttx_px4fmu-v4_default.cmake index 6aa06e4fc1..5b098a8c7e 100644 --- a/cmake/configs/nuttx_px4fmu-v4_default.cmake +++ b/cmake/configs/nuttx_px4fmu-v4_default.cmake @@ -135,7 +135,6 @@ set(config_module_list # modules/systemlib/param modules/systemlib - modules/systemlib/mixer modules/uORB modules/dataman @@ -143,20 +142,21 @@ set(config_module_list # Libraries # lib/controllib - lib/mathlib - lib/mathlib/math/filter - lib/rc + lib/conversion + lib/DriverFramework/framework lib/ecl lib/geo lib/geo_lookup - lib/conversion lib/launchdetection lib/led - lib/terrain_estimation + lib/mathlib + lib/mathlib/math/filter + lib/mixer + lib/rc lib/runway_takeoff lib/tailsitter_recovery + lib/terrain_estimation lib/version - lib/DriverFramework/framework # # Platform diff --git a/cmake/configs/nuttx_px4fmu-v4pro_default.cmake b/cmake/configs/nuttx_px4fmu-v4pro_default.cmake index e10b6a4da8..7425609426 100644 --- a/cmake/configs/nuttx_px4fmu-v4pro_default.cmake +++ b/cmake/configs/nuttx_px4fmu-v4pro_default.cmake @@ -136,7 +136,6 @@ set(config_module_list modules/dataman modules/systemlib/param modules/systemlib - modules/systemlib/mixer modules/uORB # @@ -152,6 +151,7 @@ set(config_module_list lib/led lib/mathlib lib/mathlib/math/filter + lib/mixer lib/runway_takeoff lib/tailsitter_recovery lib/terrain_estimation diff --git a/cmake/configs/nuttx_px4fmu-v5_default.cmake b/cmake/configs/nuttx_px4fmu-v5_default.cmake index 29a7d9c65d..43e18cf58c 100644 --- a/cmake/configs/nuttx_px4fmu-v5_default.cmake +++ b/cmake/configs/nuttx_px4fmu-v5_default.cmake @@ -136,7 +136,6 @@ set(config_module_list modules/dataman modules/systemlib/param modules/systemlib - modules/systemlib/mixer modules/uORB # @@ -152,6 +151,7 @@ set(config_module_list lib/led lib/mathlib lib/mathlib/math/filter + lib/mixer lib/rc lib/runway_takeoff lib/tailsitter_recovery diff --git a/cmake/configs/nuttx_px4io-v1_default.cmake b/cmake/configs/nuttx_px4io-v1_default.cmake index 8fef069d9e..f99eac5270 100644 --- a/cmake/configs/nuttx_px4io-v1_default.cmake +++ b/cmake/configs/nuttx_px4io-v1_default.cmake @@ -5,8 +5,8 @@ px4_nuttx_configure(HWCLASS m3 CONFIG nsh) set(config_module_list drivers/boards drivers/stm32 + lib/mixer lib/rc modules/px4iofirmware - modules/systemlib/mixer platforms/common ) diff --git a/cmake/configs/nuttx_px4io-v2_default.cmake b/cmake/configs/nuttx_px4io-v2_default.cmake index 40ee747ef2..27593f720a 100644 --- a/cmake/configs/nuttx_px4io-v2_default.cmake +++ b/cmake/configs/nuttx_px4io-v2_default.cmake @@ -5,9 +5,8 @@ px4_nuttx_configure(HWCLASS m3 CONFIG nsh) set(config_module_list drivers/boards/px4io-v2 drivers/stm32 + lib/mixer lib/rc modules/px4iofirmware - modules/systemlib/mixer platforms/common - ) diff --git a/cmake/configs/nuttx_px4nucleoF767ZI-v1_default.cmake b/cmake/configs/nuttx_px4nucleoF767ZI-v1_default.cmake index 9acaf95ac9..4a1b021257 100644 --- a/cmake/configs/nuttx_px4nucleoF767ZI-v1_default.cmake +++ b/cmake/configs/nuttx_px4nucleoF767ZI-v1_default.cmake @@ -113,7 +113,6 @@ set(config_module_list # modules/systemlib/param modules/systemlib - modules/systemlib/mixer modules/uORB modules/dataman @@ -121,20 +120,21 @@ set(config_module_list # Libraries # lib/controllib - lib/mathlib - lib/mathlib/math/filter - lib/rc + lib/conversion + lib/DriverFramework/framework lib/ecl lib/geo lib/geo_lookup - lib/conversion lib/launchdetection lib/led - lib/terrain_estimation + lib/mathlib + lib/mathlib/math/filter + lib/mixer + lib/rc lib/runway_takeoff lib/tailsitter_recovery + lib/terrain_estimation lib/version - lib/DriverFramework/framework platforms/nuttx # had to add for cmake, not sure why wasn't in original config diff --git a/cmake/configs/nuttx_tap-v1_default.cmake b/cmake/configs/nuttx_tap-v1_default.cmake index 932097bdee..ae8dab0a91 100644 --- a/cmake/configs/nuttx_tap-v1_default.cmake +++ b/cmake/configs/nuttx_tap-v1_default.cmake @@ -80,7 +80,6 @@ set(config_module_list # modules/systemlib/param modules/systemlib - modules/systemlib/mixer modules/uORB modules/dataman @@ -88,20 +87,21 @@ set(config_module_list # Libraries # lib/controllib - lib/mathlib - lib/mathlib/math/filter + lib/conversion + lib/DriverFramework/framework lib/ecl lib/geo lib/geo_lookup - lib/conversion lib/launchdetection lib/led + lib/mathlib + lib/mathlib/math/filter + lib/mixer lib/rc lib/runway_takeoff lib/tailsitter_recovery lib/terrain_estimation lib/version - lib/DriverFramework/framework platforms/nuttx # had to add for cmake, not sure why wasn't in original config diff --git a/cmake/configs/posix_bebop_default.cmake b/cmake/configs/posix_bebop_default.cmake index 38899b0e0b..98837cd8bf 100644 --- a/cmake/configs/posix_bebop_default.cmake +++ b/cmake/configs/posix_bebop_default.cmake @@ -58,7 +58,6 @@ set(config_module_list modules/commander modules/systemlib/param modules/systemlib - modules/systemlib/mixer modules/uORB modules/dataman modules/land_detector @@ -74,18 +73,19 @@ set(config_module_list # Libraries # lib/controllib - lib/mathlib - lib/mathlib/math/filter - lib/geo + lib/conversion + lib/DriverFramework/framework lib/ecl + lib/geo lib/geo_lookup lib/launchdetection - lib/conversion - lib/terrain_estimation + lib/mathlib + lib/mathlib/math/filter + lib/mixer lib/runway_takeoff lib/tailsitter_recovery + lib/terrain_estimation lib/version - lib/DriverFramework/framework # # POSIX diff --git a/cmake/configs/posix_ocpoc_cross.cmake b/cmake/configs/posix_ocpoc_cross.cmake index b07d2b5e91..ee82f80af6 100644 --- a/cmake/configs/posix_ocpoc_cross.cmake +++ b/cmake/configs/posix_ocpoc_cross.cmake @@ -61,7 +61,6 @@ set(config_module_list modules/commander modules/systemlib/param modules/systemlib - modules/systemlib/mixer modules/uORB modules/dataman modules/land_detector @@ -82,20 +81,21 @@ set(config_module_list # Libraries # lib/controllib - lib/mathlib - lib/mathlib/math/filter - lib/geo + lib/conversion + lib/DriverFramework/framework lib/ecl + lib/geo lib/geo_lookup lib/launchdetection - lib/conversion - lib/terrain_estimation + lib/led + lib/mathlib + lib/mathlib/math/filter + lib/mixer + lib/rc lib/runway_takeoff lib/tailsitter_recovery + lib/terrain_estimation lib/version - lib/DriverFramework/framework - lib/rc - lib/led # # POSIX diff --git a/cmake/configs/posix_ocpoc_ubuntu.cmake b/cmake/configs/posix_ocpoc_ubuntu.cmake index a3da5e3b87..0678b60bfe 100644 --- a/cmake/configs/posix_ocpoc_ubuntu.cmake +++ b/cmake/configs/posix_ocpoc_ubuntu.cmake @@ -60,7 +60,6 @@ set(config_module_list modules/commander modules/systemlib/param modules/systemlib - modules/systemlib/mixer modules/uORB modules/dataman modules/land_detector @@ -81,20 +80,21 @@ set(config_module_list # Libraries # lib/controllib - lib/mathlib - lib/mathlib/math/filter - lib/geo + lib/conversion + lib/DriverFramework/framework lib/ecl + lib/geo lib/geo_lookup lib/launchdetection - lib/conversion - lib/terrain_estimation + lib/led + lib/mathlib + lib/mathlib/math/filter + lib/mixer + lib/rc lib/runway_takeoff lib/tailsitter_recovery + lib/terrain_estimation lib/version - lib/DriverFramework/framework - lib/rc - lib/led # # POSIX diff --git a/cmake/configs/posix_rpi_common.cmake b/cmake/configs/posix_rpi_common.cmake index b0adeabfa4..248f0f35aa 100644 --- a/cmake/configs/posix_rpi_common.cmake +++ b/cmake/configs/posix_rpi_common.cmake @@ -70,7 +70,6 @@ set(config_module_list modules/commander modules/systemlib/param modules/systemlib - modules/systemlib/mixer modules/uORB modules/dataman modules/land_detector @@ -94,19 +93,20 @@ set(config_module_list # Libraries # lib/controllib - lib/mathlib - lib/mathlib/math/filter - lib/geo + lib/conversion + lib/DriverFramework/framework lib/ecl + lib/geo lib/geo_lookup lib/launchdetection lib/led - lib/conversion - lib/terrain_estimation + lib/mathlib + lib/mathlib/math/filter + lib/mixer lib/runway_takeoff lib/tailsitter_recovery + lib/terrain_estimation lib/version - lib/DriverFramework/framework # # POSIX diff --git a/cmake/configs/posix_sdflight_default.cmake b/cmake/configs/posix_sdflight_default.cmake index 3389938414..dd08e2f932 100644 --- a/cmake/configs/posix_sdflight_default.cmake +++ b/cmake/configs/posix_sdflight_default.cmake @@ -55,7 +55,6 @@ set(config_module_list modules/systemlib/param modules/systemlib - modules/systemlib/mixer modules/uORB modules/muorb/krait modules/sensors @@ -67,18 +66,19 @@ set(config_module_list modules/navigator lib/controllib - lib/mathlib - lib/mathlib/math/filter lib/conversion + lib/DriverFramework/framework lib/ecl lib/geo lib/geo_lookup lib/led - lib/terrain_estimation + lib/mathlib + lib/mathlib/math/filter + lib/mixer lib/runway_takeoff lib/tailsitter_recovery + lib/terrain_estimation lib/version - lib/DriverFramework/framework platforms/common platforms/posix/px4_layer diff --git a/cmake/configs/posix_sdflight_legacy.cmake b/cmake/configs/posix_sdflight_legacy.cmake index f13018c5dc..2a70def784 100644 --- a/cmake/configs/posix_sdflight_legacy.cmake +++ b/cmake/configs/posix_sdflight_legacy.cmake @@ -47,7 +47,6 @@ set(config_module_list modules/systemlib/param modules/systemlib - modules/systemlib/mixer modules/uORB modules/muorb/krait modules/sensors @@ -59,18 +58,19 @@ set(config_module_list modules/navigator lib/controllib - lib/mathlib - lib/mathlib/math/filter lib/conversion + lib/DriverFramework/framework lib/ecl lib/geo lib/geo_lookup lib/led - lib/terrain_estimation + lib/mathlib + lib/mathlib/math/filter + lib/mixer lib/runway_takeoff lib/tailsitter_recovery + lib/terrain_estimation lib/version - lib/DriverFramework/framework platforms/common platforms/posix/px4_layer diff --git a/cmake/configs/posix_sitl_default.cmake b/cmake/configs/posix_sitl_default.cmake index ee1b6710c3..96460b5ee8 100644 --- a/cmake/configs/posix_sitl_default.cmake +++ b/cmake/configs/posix_sitl_default.cmake @@ -111,7 +111,6 @@ set(config_module_list modules/dataman modules/systemlib/param modules/systemlib - modules/systemlib/mixer modules/uORB # @@ -125,6 +124,7 @@ set(config_module_list lib/geo_lookup lib/launchdetection lib/led + lib/mixer lib/mathlib lib/mathlib/math/filter lib/rc diff --git a/cmake/configs/qurt_eagle_hil.cmake b/cmake/configs/qurt_eagle_hil.cmake index 7cbf3a2411..e538475fcf 100644 --- a/cmake/configs/qurt_eagle_hil.cmake +++ b/cmake/configs/qurt_eagle_hil.cmake @@ -54,25 +54,25 @@ set(config_module_list # modules/systemlib/param modules/systemlib - modules/systemlib/mixer modules/uORB modules/commander # # Libraries # - lib/mathlib - lib/mathlib/math/filter + lib/controllib + lib/conversion + lib/DriverFramework/framework lib/geo lib/geo_lookup - lib/conversion lib/led - lib/terrain_estimation + lib/mathlib + lib/mathlib/math/filter + lib/mixer lib/runway_takeoff lib/tailsitter_recovery - lib/controllib + lib/terrain_estimation lib/version - lib/DriverFramework/framework # # QuRT port diff --git a/cmake/configs/qurt_eagle_test.cmake b/cmake/configs/qurt_eagle_test.cmake index c046420a6e..d8a8c2b142 100644 --- a/cmake/configs/qurt_eagle_test.cmake +++ b/cmake/configs/qurt_eagle_test.cmake @@ -33,16 +33,16 @@ set(config_module_list # modules/systemlib/param modules/systemlib - modules/systemlib/mixer modules/uORB # # Libraries # - lib/mathlib - lib/mathlib/math/filter lib/conversion lib/DriverFramework/framework + lib/mathlib + lib/mathlib/math/filter + lib/mixer # # QuRT port diff --git a/cmake/configs/qurt_eagle_travis.cmake b/cmake/configs/qurt_eagle_travis.cmake index 5d50971bd9..a1cd3724d9 100644 --- a/cmake/configs/qurt_eagle_travis.cmake +++ b/cmake/configs/qurt_eagle_travis.cmake @@ -59,7 +59,6 @@ set(config_module_list # modules/systemlib/param modules/systemlib - modules/systemlib/mixer modules/uORB modules/commander @@ -67,18 +66,19 @@ set(config_module_list # Libraries # lib/controllib - lib/mathlib - lib/mathlib/math/filter + lib/conversion + lib/DriverFramework/framework + lib/ecl lib/geo lib/geo_lookup - lib/conversion - lib/ecl lib/led - lib/terrain_estimation + lib/mathlib + lib/mathlib/math/filter + lib/mixer lib/runway_takeoff lib/tailsitter_recovery + lib/terrain_estimation lib/version - lib/DriverFramework/framework # # QuRT port diff --git a/cmake/configs/qurt_sdflight_default.cmake b/cmake/configs/qurt_sdflight_default.cmake index 2fbd8c2946..5556ec3909 100644 --- a/cmake/configs/qurt_sdflight_default.cmake +++ b/cmake/configs/qurt_sdflight_default.cmake @@ -64,7 +64,6 @@ set(config_module_list # modules/systemlib/param modules/systemlib - modules/systemlib/mixer modules/uORB modules/commander modules/land_detector @@ -82,18 +81,19 @@ set(config_module_list # Libraries # lib/controllib + lib/conversion + lib/DriverFramework/framework + lib/ecl + lib/geo + lib/geo_lookup lib/mathlib lib/mathlib/math/filter - lib/geo - lib/ecl - lib/geo_lookup - lib/conversion - lib/terrain_estimation + lib/mixer + lib/rc lib/runway_takeoff lib/tailsitter_recovery - lib/rc + lib/terrain_estimation lib/version - lib/DriverFramework/framework # # QuRT port diff --git a/cmake/configs/qurt_sdflight_legacy.cmake b/cmake/configs/qurt_sdflight_legacy.cmake index f4ffa3b026..431c907b62 100644 --- a/cmake/configs/qurt_sdflight_legacy.cmake +++ b/cmake/configs/qurt_sdflight_legacy.cmake @@ -60,7 +60,6 @@ set(config_module_list # modules/systemlib/param modules/systemlib - modules/systemlib/mixer modules/uORB modules/commander modules/land_detector @@ -82,18 +81,19 @@ set(config_module_list # Libraries # lib/controllib + lib/conversion + lib/DriverFramework/framework + lib/ecl + lib/geo + lib/geo_lookup lib/mathlib lib/mathlib/math/filter - lib/geo - lib/ecl - lib/geo_lookup - lib/conversion - lib/terrain_estimation + lib/mixer + lib/rc lib/runway_takeoff lib/tailsitter_recovery - lib/rc + lib/terrain_estimation lib/version - lib/DriverFramework/framework # # QuRT port diff --git a/src/drivers/linux_pwm_out/linux_pwm_out.cpp b/src/drivers/linux_pwm_out/linux_pwm_out.cpp index ea1976b5ad..7dc8129319 100644 --- a/src/drivers/linux_pwm_out/linux_pwm_out.cpp +++ b/src/drivers/linux_pwm_out/linux_pwm_out.cpp @@ -47,8 +47,8 @@ #include #include -#include -#include +#include +#include #include #include diff --git a/src/drivers/mkblctrl/mkblctrl.cpp b/src/drivers/mkblctrl/mkblctrl.cpp index d95166d020..275bd1f13f 100644 --- a/src/drivers/mkblctrl/mkblctrl.cpp +++ b/src/drivers/mkblctrl/mkblctrl.cpp @@ -73,7 +73,7 @@ #include #include -#include +#include #include #include diff --git a/src/drivers/pwm_out_rc_in/pwm_out_rc_in.cpp b/src/drivers/pwm_out_rc_in/pwm_out_rc_in.cpp index 8b843f459c..7f25d9bad6 100644 --- a/src/drivers/pwm_out_rc_in/pwm_out_rc_in.cpp +++ b/src/drivers/pwm_out_rc_in/pwm_out_rc_in.cpp @@ -46,8 +46,8 @@ #include #include -#include -#include +#include +#include #include #include #include diff --git a/src/drivers/pwm_out_sim/pwm_out_sim.cpp b/src/drivers/pwm_out_sim/pwm_out_sim.cpp index e93ee8c849..4f08c8541a 100644 --- a/src/drivers/pwm_out_sim/pwm_out_sim.cpp +++ b/src/drivers/pwm_out_sim/pwm_out_sim.cpp @@ -74,7 +74,7 @@ #include #include -#include +#include #include #include diff --git a/src/drivers/px4fmu/fmu.cpp b/src/drivers/px4fmu/fmu.cpp index 43f80912d8..07a640fb7f 100644 --- a/src/drivers/px4fmu/fmu.cpp +++ b/src/drivers/px4fmu/fmu.cpp @@ -58,7 +58,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/drivers/px4io/px4io.cpp b/src/drivers/px4io/px4io.cpp index 64b1793cbb..f505f271fb 100644 --- a/src/drivers/px4io/px4io.cpp +++ b/src/drivers/px4io/px4io.cpp @@ -67,7 +67,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/drivers/snapdragon_pwm_out/snapdragon_pwm_out.cpp b/src/drivers/snapdragon_pwm_out/snapdragon_pwm_out.cpp index 8f8af58f58..196c39744c 100644 --- a/src/drivers/snapdragon_pwm_out/snapdragon_pwm_out.cpp +++ b/src/drivers/snapdragon_pwm_out/snapdragon_pwm_out.cpp @@ -47,9 +47,9 @@ #include #include -#include -#include -#include +#include +#include +#include #include #include #include diff --git a/src/drivers/tap_esc/tap_esc.cpp b/src/drivers/tap_esc/tap_esc.cpp index 2d4b7e6e66..b670981f61 100644 --- a/src/drivers/tap_esc/tap_esc.cpp +++ b/src/drivers/tap_esc/tap_esc.cpp @@ -54,7 +54,7 @@ #include #include -#include +#include #include #include diff --git a/src/modules/systemlib/mixer/CMakeLists.txt b/src/lib/mixer/CMakeLists.txt similarity index 99% rename from src/modules/systemlib/mixer/CMakeLists.txt rename to src/lib/mixer/CMakeLists.txt index 2dffcef857..8cbb8d250d 100644 --- a/src/modules/systemlib/mixer/CMakeLists.txt +++ b/src/lib/mixer/CMakeLists.txt @@ -93,7 +93,7 @@ add_custom_target(mixer_gen_legacy DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/mixer_multirotor_legacy.generated.h) px4_add_module( - MODULE modules__systemlib__mixer + MODULE lib__mixer SRCS mixer.cpp mixer_group.cpp diff --git a/src/modules/systemlib/mixer/geoms/dodeca_bottom_cox.toml b/src/lib/mixer/geoms/dodeca_bottom_cox.toml similarity index 100% rename from src/modules/systemlib/mixer/geoms/dodeca_bottom_cox.toml rename to src/lib/mixer/geoms/dodeca_bottom_cox.toml diff --git a/src/modules/systemlib/mixer/geoms/dodeca_top_cox.toml b/src/lib/mixer/geoms/dodeca_top_cox.toml similarity index 100% rename from src/modules/systemlib/mixer/geoms/dodeca_top_cox.toml rename to src/lib/mixer/geoms/dodeca_top_cox.toml diff --git a/src/modules/systemlib/mixer/geoms/hex_cox.toml b/src/lib/mixer/geoms/hex_cox.toml similarity index 100% rename from src/modules/systemlib/mixer/geoms/hex_cox.toml rename to src/lib/mixer/geoms/hex_cox.toml diff --git a/src/modules/systemlib/mixer/geoms/hex_plus.toml b/src/lib/mixer/geoms/hex_plus.toml similarity index 100% rename from src/modules/systemlib/mixer/geoms/hex_plus.toml rename to src/lib/mixer/geoms/hex_plus.toml diff --git a/src/modules/systemlib/mixer/geoms/hex_t.toml b/src/lib/mixer/geoms/hex_t.toml similarity index 100% rename from src/modules/systemlib/mixer/geoms/hex_t.toml rename to src/lib/mixer/geoms/hex_t.toml diff --git a/src/modules/systemlib/mixer/geoms/hex_x.toml b/src/lib/mixer/geoms/hex_x.toml similarity index 100% rename from src/modules/systemlib/mixer/geoms/hex_x.toml rename to src/lib/mixer/geoms/hex_x.toml diff --git a/src/modules/systemlib/mixer/geoms/octa_cox.toml b/src/lib/mixer/geoms/octa_cox.toml similarity index 100% rename from src/modules/systemlib/mixer/geoms/octa_cox.toml rename to src/lib/mixer/geoms/octa_cox.toml diff --git a/src/modules/systemlib/mixer/geoms/octa_cox_wide.toml b/src/lib/mixer/geoms/octa_cox_wide.toml similarity index 100% rename from src/modules/systemlib/mixer/geoms/octa_cox_wide.toml rename to src/lib/mixer/geoms/octa_cox_wide.toml diff --git a/src/modules/systemlib/mixer/geoms/octa_plus.toml b/src/lib/mixer/geoms/octa_plus.toml similarity index 100% rename from src/modules/systemlib/mixer/geoms/octa_plus.toml rename to src/lib/mixer/geoms/octa_plus.toml diff --git a/src/modules/systemlib/mixer/geoms/octa_x.toml b/src/lib/mixer/geoms/octa_x.toml similarity index 100% rename from src/modules/systemlib/mixer/geoms/octa_x.toml rename to src/lib/mixer/geoms/octa_x.toml diff --git a/src/modules/systemlib/mixer/geoms/quad_deadcat.toml b/src/lib/mixer/geoms/quad_deadcat.toml similarity index 100% rename from src/modules/systemlib/mixer/geoms/quad_deadcat.toml rename to src/lib/mixer/geoms/quad_deadcat.toml diff --git a/src/modules/systemlib/mixer/geoms/quad_h.toml b/src/lib/mixer/geoms/quad_h.toml similarity index 100% rename from src/modules/systemlib/mixer/geoms/quad_h.toml rename to src/lib/mixer/geoms/quad_h.toml diff --git a/src/modules/systemlib/mixer/geoms/quad_plus.toml b/src/lib/mixer/geoms/quad_plus.toml similarity index 100% rename from src/modules/systemlib/mixer/geoms/quad_plus.toml rename to src/lib/mixer/geoms/quad_plus.toml diff --git a/src/modules/systemlib/mixer/geoms/quad_vtail.toml b/src/lib/mixer/geoms/quad_vtail.toml similarity index 100% rename from src/modules/systemlib/mixer/geoms/quad_vtail.toml rename to src/lib/mixer/geoms/quad_vtail.toml diff --git a/src/modules/systemlib/mixer/geoms/quad_wide.toml b/src/lib/mixer/geoms/quad_wide.toml similarity index 100% rename from src/modules/systemlib/mixer/geoms/quad_wide.toml rename to src/lib/mixer/geoms/quad_wide.toml diff --git a/src/modules/systemlib/mixer/geoms/quad_x.toml b/src/lib/mixer/geoms/quad_x.toml similarity index 92% rename from src/modules/systemlib/mixer/geoms/quad_x.toml rename to src/lib/mixer/geoms/quad_x.toml index bb76f8bc9b..8e7fc4be91 100644 --- a/src/modules/systemlib/mixer/geoms/quad_x.toml +++ b/src/lib/mixer/geoms/quad_x.toml @@ -13,7 +13,7 @@ Cm = 0.05 [[rotors]] name = "front_right" -position = [0.707107, 0.707107]#, 0.0] +position = [0.707107, 0.707107, 0.0] direction = "CCW" [[rotors]] diff --git a/src/modules/systemlib/mixer/geoms/quad_x_pusher.toml b/src/lib/mixer/geoms/quad_x_pusher.toml similarity index 100% rename from src/modules/systemlib/mixer/geoms/quad_x_pusher.toml rename to src/lib/mixer/geoms/quad_x_pusher.toml diff --git a/src/modules/systemlib/mixer/geoms/quad_y.toml b/src/lib/mixer/geoms/quad_y.toml similarity index 100% rename from src/modules/systemlib/mixer/geoms/quad_y.toml rename to src/lib/mixer/geoms/quad_y.toml diff --git a/src/modules/systemlib/mixer/geoms/tools/px_generate_mixers.py b/src/lib/mixer/geoms/tools/px_generate_mixers.py similarity index 100% rename from src/modules/systemlib/mixer/geoms/tools/px_generate_mixers.py rename to src/lib/mixer/geoms/tools/px_generate_mixers.py diff --git a/src/modules/systemlib/mixer/geoms/tri_y.toml b/src/lib/mixer/geoms/tri_y.toml similarity index 100% rename from src/modules/systemlib/mixer/geoms/tri_y.toml rename to src/lib/mixer/geoms/tri_y.toml diff --git a/src/modules/systemlib/mixer/geoms/twin_engine.toml b/src/lib/mixer/geoms/twin_engine.toml similarity index 100% rename from src/modules/systemlib/mixer/geoms/twin_engine.toml rename to src/lib/mixer/geoms/twin_engine.toml diff --git a/src/modules/systemlib/mixer/mixer.cpp b/src/lib/mixer/mixer.cpp similarity index 100% rename from src/modules/systemlib/mixer/mixer.cpp rename to src/lib/mixer/mixer.cpp diff --git a/src/modules/systemlib/mixer/mixer.h b/src/lib/mixer/mixer.h similarity index 100% rename from src/modules/systemlib/mixer/mixer.h rename to src/lib/mixer/mixer.h diff --git a/src/modules/systemlib/mixer/mixer_group.cpp b/src/lib/mixer/mixer_group.cpp similarity index 100% rename from src/modules/systemlib/mixer/mixer_group.cpp rename to src/lib/mixer/mixer_group.cpp diff --git a/src/modules/systemlib/mixer/mixer_helicopter.cpp b/src/lib/mixer/mixer_helicopter.cpp similarity index 99% rename from src/modules/systemlib/mixer/mixer_helicopter.cpp rename to src/lib/mixer/mixer_helicopter.cpp index aacada87ab..d3bae2c65c 100644 --- a/src/modules/systemlib/mixer/mixer_helicopter.cpp +++ b/src/lib/mixer/mixer_helicopter.cpp @@ -282,4 +282,3 @@ HelicopterMixer::groups_required(uint32_t &groups) /* XXX for now, hardcoded to indexes 0-3 in control group zero */ groups |= (1 << 0); } - diff --git a/src/modules/systemlib/mixer/mixer_load.c b/src/lib/mixer/mixer_load.c similarity index 99% rename from src/modules/systemlib/mixer/mixer_load.c rename to src/lib/mixer/mixer_load.c index cee01c83bd..8ca4b79875 100644 --- a/src/modules/systemlib/mixer/mixer_load.c +++ b/src/lib/mixer/mixer_load.c @@ -112,4 +112,3 @@ int load_mixer_file(const char *fname, char *buf, unsigned maxlen) fclose(fp); return 0; } - diff --git a/src/modules/systemlib/mixer/mixer_load.h b/src/lib/mixer/mixer_load.h similarity index 100% rename from src/modules/systemlib/mixer/mixer_load.h rename to src/lib/mixer/mixer_load.h diff --git a/src/modules/systemlib/mixer/mixer_multirotor.cpp b/src/lib/mixer/mixer_multirotor.cpp similarity index 100% rename from src/modules/systemlib/mixer/mixer_multirotor.cpp rename to src/lib/mixer/mixer_multirotor.cpp diff --git a/src/modules/systemlib/mixer/mixer_simple.cpp b/src/lib/mixer/mixer_simple.cpp similarity index 100% rename from src/modules/systemlib/mixer/mixer_simple.cpp rename to src/lib/mixer/mixer_simple.cpp diff --git a/src/modules/systemlib/mixer/multi_tables.py b/src/lib/mixer/multi_tables.py similarity index 100% rename from src/modules/systemlib/mixer/multi_tables.py rename to src/lib/mixer/multi_tables.py diff --git a/src/modules/mc_att_control/mc_att_control_main.cpp b/src/modules/mc_att_control/mc_att_control_main.cpp index a0b2801cb0..f649b94a19 100644 --- a/src/modules/mc_att_control/mc_att_control_main.cpp +++ b/src/modules/mc_att_control/mc_att_control_main.cpp @@ -64,7 +64,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/modules/px4iofirmware/mixer.cpp b/src/modules/px4iofirmware/mixer.cpp index 014df97141..f35caf3faa 100644 --- a/src/modules/px4iofirmware/mixer.cpp +++ b/src/modules/px4iofirmware/mixer.cpp @@ -52,7 +52,7 @@ #include #include -#include +#include #include #include "mixer.h" diff --git a/src/modules/uavcan/uavcan_main.cpp b/src/modules/uavcan/uavcan_main.cpp index d79ae79fa2..286f3b9ed0 100644 --- a/src/modules/uavcan/uavcan_main.cpp +++ b/src/modules/uavcan/uavcan_main.cpp @@ -51,7 +51,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/modules/uavcan/uavcan_servers.cpp b/src/modules/uavcan/uavcan_servers.cpp index 6197346e85..198c600fad 100644 --- a/src/modules/uavcan/uavcan_servers.cpp +++ b/src/modules/uavcan/uavcan_servers.cpp @@ -44,7 +44,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/modules/uavcanesc/uavcanesc_main.cpp b/src/modules/uavcanesc/uavcanesc_main.cpp index 13ee480b0e..9a0eeb4e88 100644 --- a/src/modules/uavcanesc/uavcanesc_main.cpp +++ b/src/modules/uavcanesc/uavcanesc_main.cpp @@ -44,7 +44,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/modules/uavcannode/uavcannode_main.cpp b/src/modules/uavcannode/uavcannode_main.cpp index 9d36f898fe..e85febdf99 100644 --- a/src/modules/uavcannode/uavcannode_main.cpp +++ b/src/modules/uavcannode/uavcannode_main.cpp @@ -47,7 +47,7 @@ #include #include #include -#include +#include #include #include __BEGIN_DECLS diff --git a/src/platforms/posix/drivers/df_bebop_bus_wrapper/df_bebop_bus_wrapper.cpp b/src/platforms/posix/drivers/df_bebop_bus_wrapper/df_bebop_bus_wrapper.cpp index c9867b06d7..29d639546d 100644 --- a/src/platforms/posix/drivers/df_bebop_bus_wrapper/df_bebop_bus_wrapper.cpp +++ b/src/platforms/posix/drivers/df_bebop_bus_wrapper/df_bebop_bus_wrapper.cpp @@ -53,7 +53,7 @@ #include #include -#include +#include #include #include diff --git a/src/platforms/qurt/fc_addon/uart_esc/uart_esc_main.cpp b/src/platforms/qurt/fc_addon/uart_esc/uart_esc_main.cpp index 0262468aa1..a2284e45a6 100644 --- a/src/platforms/qurt/fc_addon/uart_esc/uart_esc_main.cpp +++ b/src/platforms/qurt/fc_addon/uart_esc/uart_esc_main.cpp @@ -46,8 +46,8 @@ #include #include -#include -#include +#include +#include #include #ifdef __cplusplus diff --git a/src/systemcmds/mixer/mixer.cpp b/src/systemcmds/mixer/mixer.cpp index 5519634505..133a378b9f 100644 --- a/src/systemcmds/mixer/mixer.cpp +++ b/src/systemcmds/mixer/mixer.cpp @@ -48,7 +48,7 @@ #include #include -#include +#include #include /** diff --git a/src/systemcmds/tests/test_autodeclination.cpp b/src/systemcmds/tests/test_autodeclination.cpp index b39471954b..663014edb6 100644 --- a/src/systemcmds/tests/test_autodeclination.cpp +++ b/src/systemcmds/tests/test_autodeclination.cpp @@ -4,7 +4,7 @@ #include #include #include -#include +#include #include #include diff --git a/src/systemcmds/tests/test_mixer.cpp b/src/systemcmds/tests/test_mixer.cpp index 6f8342ca3e..d3037e3276 100644 --- a/src/systemcmds/tests/test_mixer.cpp +++ b/src/systemcmds/tests/test_mixer.cpp @@ -53,7 +53,7 @@ #include #include -#include +#include #include #include #include