diff --git a/boards/aerotenna/ocpoc/ubuntu.cmake b/boards/aerotenna/ocpoc/ubuntu.cmake index 58ac1c8236eb0f1ae6ef2a8ddef7593d6b870d82..184ef642ce98f571a9f7b64bd979ecdb7e46e607 100644 --- a/boards/aerotenna/ocpoc/ubuntu.cmake +++ b/boards/aerotenna/ocpoc/ubuntu.cmake @@ -22,7 +22,6 @@ px4_add_board( #magnetometer # all available magnetometer drivers pwm_out_sim #telemetry # all available telemetry drivers - vmount DF_DRIVERS # NOTE: DriverFramework is migrating to intree PX4 drivers mpu9250 @@ -53,6 +52,7 @@ px4_add_board( sensors #simulator #uavcan + vmount vtol_att_control wind_estimator diff --git a/boards/airmind/mindpx-v2/default.cmake b/boards/airmind/mindpx-v2/default.cmake index 7655e43a6a0e69d2c1a20ff1db59e8dc41738828..113cc8b8dffbdbbaffe76fc2bfe4aeb702066387 100644 --- a/boards/airmind/mindpx-v2/default.cmake +++ b/boards/airmind/mindpx-v2/default.cmake @@ -45,7 +45,6 @@ px4_add_board( tap_esc telemetry # all available telemetry drivers test_ppm - vmount MODULES attitude_estimator_q @@ -70,6 +69,7 @@ px4_add_board( position_estimator_inav sensors uavcan + vmount vtol_att_control wind_estimator diff --git a/boards/atlflight/eagle/default.cmake b/boards/atlflight/eagle/default.cmake index 33ab3a58c93d74c32cb6fb2617d3d65c05eea0d7..31e47d48d8f09aa37718b768a2bc31132e8d6bd2 100644 --- a/boards/atlflight/eagle/default.cmake +++ b/boards/atlflight/eagle/default.cmake @@ -59,7 +59,6 @@ px4_add_board( pwm_out_sim qshell/posix #telemetry # all available telemetry drivers - vmount MODULES muorb/krait @@ -88,6 +87,7 @@ px4_add_board( sensors simulator #uavcan + vmount vtol_att_control wind_estimator diff --git a/boards/atlflight/eagle/qurt-default.cmake b/boards/atlflight/eagle/qurt-default.cmake index 8efdc34ee51744f00a05929193306e8f9b151355..9487b6fe76effb34301f0fb69680ead381657aba 100644 --- a/boards/atlflight/eagle/qurt-default.cmake +++ b/boards/atlflight/eagle/qurt-default.cmake @@ -75,6 +75,7 @@ px4_add_board( mc_pos_control position_estimator_inav sensors + vmount vtol_att_control wind_estimator diff --git a/boards/atlflight/excelsior/default.cmake b/boards/atlflight/excelsior/default.cmake index 01bde7b3f068526814fae1eff7b80b9e426e3592..14d53fa211e96f8620132d8298bc530d6862d505 100644 --- a/boards/atlflight/excelsior/default.cmake +++ b/boards/atlflight/excelsior/default.cmake @@ -59,7 +59,6 @@ px4_add_board( pwm_out_sim qshell/posix #telemetry # all available telemetry drivers - vmount MODULES muorb/krait @@ -88,6 +87,7 @@ px4_add_board( sensors simulator #uavcan + vmount vtol_att_control wind_estimator diff --git a/boards/atlflight/excelsior/qurt-default.cmake b/boards/atlflight/excelsior/qurt-default.cmake index 4e6c0beff352e42607ea1eaa35965cb5abcdb8f4..461bfd109fb23d986bbcd759b60ee0755cbf7e37 100644 --- a/boards/atlflight/excelsior/qurt-default.cmake +++ b/boards/atlflight/excelsior/qurt-default.cmake @@ -75,6 +75,7 @@ px4_add_board( mc_pos_control position_estimator_inav sensors + vmount vtol_att_control wind_estimator diff --git a/boards/atmel/same70xplained/default.cmake b/boards/atmel/same70xplained/default.cmake index 3c5d2dfd52adc3fe28cf11cda4671a78388366ab..b877f500081de1c85dd14a61db7ef699fdabc036 100644 --- a/boards/atmel/same70xplained/default.cmake +++ b/boards/atmel/same70xplained/default.cmake @@ -40,12 +40,12 @@ px4_add_board( px4fmu #rc_input samv7 + #samv7/adc # WIP samv7/tone_alarm tap_esc telemetry # all available telemetry drivers #test_ppm - vmount - #WIP samv7/adc + #uavcan MODULES attitude_estimator_q @@ -70,6 +70,7 @@ px4_add_board( position_estimator_inav sensors #WIP uavcan + vmount vtol_att_control wind_estimator diff --git a/boards/auav/x21/default.cmake b/boards/auav/x21/default.cmake index 09e25df1da79faee7ce85fd7e7800620c1dcccec..32dd67b904845a3de493e1a50c710d4299b28cec 100644 --- a/boards/auav/x21/default.cmake +++ b/boards/auav/x21/default.cmake @@ -50,7 +50,6 @@ px4_add_board( tap_esc telemetry # all available telemetry drivers test_ppm - vmount MODULES attitude_estimator_q @@ -75,6 +74,7 @@ px4_add_board( position_estimator_inav sensors uavcan + vmount vtol_att_control wind_estimator diff --git a/boards/av/x-v1/default.cmake b/boards/av/x-v1/default.cmake index e7611ebab480af4f83a71c6ea301b602cd619962..165f72076db6745a9fac0556db06ee0cc345ec7d 100644 --- a/boards/av/x-v1/default.cmake +++ b/boards/av/x-v1/default.cmake @@ -50,7 +50,6 @@ px4_add_board( tap_esc telemetry # all available telemetry drivers test_ppm - vmount MODULES attitude_estimator_q @@ -75,6 +74,7 @@ px4_add_board( position_estimator_inav sensors uavcan + vmount vtol_att_control wind_estimator diff --git a/boards/beaglebone/blue/cross.cmake b/boards/beaglebone/blue/cross.cmake index c3e8401e29f32d4f38786f71915ea908fa735843..f8ea400fa788c4fef7da43e2fd10d5a91dfbc570 100644 --- a/boards/beaglebone/blue/cross.cmake +++ b/boards/beaglebone/blue/cross.cmake @@ -19,7 +19,6 @@ px4_add_board( #magnetometer # all available magnetometer drivers pwm_out_sim #telemetry # all available telemetry drivers - vmount linux_pwm_out linux_sbus @@ -51,6 +50,7 @@ px4_add_board( position_estimator_inav sensors #uavcan + vmount vtol_att_control wind_estimator diff --git a/boards/beaglebone/blue/native.cmake b/boards/beaglebone/blue/native.cmake index fccf22e145ca0e3041eaa3fb16fef0d753b7d865..9a4d9da7007aca3ed89209177948f31c5739c76a 100644 --- a/boards/beaglebone/blue/native.cmake +++ b/boards/beaglebone/blue/native.cmake @@ -17,7 +17,6 @@ px4_add_board( #magnetometer # all available magnetometer drivers pwm_out_sim #telemetry # all available telemetry drivers - vmount linux_pwm_out linux_sbus @@ -49,6 +48,7 @@ px4_add_board( position_estimator_inav sensors #uavcan + vmount vtol_att_control wind_estimator diff --git a/boards/emlid/navio2/cross.cmake b/boards/emlid/navio2/cross.cmake index c822a1bcbb042a3143ceaf188e20bc28422bbc36..e12445f6c29f93d6502a970f3327ca75f88d0606 100644 --- a/boards/emlid/navio2/cross.cmake +++ b/boards/emlid/navio2/cross.cmake @@ -19,7 +19,6 @@ px4_add_board( #magnetometer # all available magnetometer drivers pwm_out_sim #telemetry # all available telemetry drivers - vmount linux_pwm_out linux_sbus @@ -56,6 +55,7 @@ px4_add_board( sensors #simulator #uavcan + vmount vtol_att_control wind_estimator diff --git a/boards/emlid/navio2/native.cmake b/boards/emlid/navio2/native.cmake index 98073f85a1a243808967c8960f0ffc8dbc188e1d..0d3698048018454f4780c1da48d082f3cb8cdb26 100644 --- a/boards/emlid/navio2/native.cmake +++ b/boards/emlid/navio2/native.cmake @@ -17,7 +17,6 @@ px4_add_board( #magnetometer # all available magnetometer drivers pwm_out_sim #telemetry # all available telemetry drivers - vmount linux_pwm_out linux_sbus @@ -54,6 +53,7 @@ px4_add_board( sensors #simulator #uavcan + vmount vtol_att_control wind_estimator diff --git a/boards/nxp/fmuk66-v3/default.cmake b/boards/nxp/fmuk66-v3/default.cmake index eb0e141fe10c13e010730e24ff2239ed313e5563..3595893461f2dfe843a44cd34438cafbc1ab5e41 100644 --- a/boards/nxp/fmuk66-v3/default.cmake +++ b/boards/nxp/fmuk66-v3/default.cmake @@ -47,7 +47,6 @@ px4_add_board( tap_esc telemetry # all available telemetry drivers #test_ppm # NOT Portable YET - vmount MODULES attitude_estimator_q @@ -72,6 +71,7 @@ px4_add_board( position_estimator_inav sensors uavcan + vmount vtol_att_control wind_estimator diff --git a/boards/px4/fmu-v2/default.cmake b/boards/px4/fmu-v2/default.cmake index a47550e118b114ff338bb86c5097752c9be6f56d..8ddbdc1d078589b728c884e90c16ebc68208d601 100644 --- a/boards/px4/fmu-v2/default.cmake +++ b/boards/px4/fmu-v2/default.cmake @@ -57,7 +57,6 @@ px4_add_board( #tap_esc #telemetry # all available telemetry drivers #test_ppm - vmount MODULES #attitude_estimator_q @@ -82,6 +81,7 @@ px4_add_board( #position_estimator_inav sensors #uavcan + vmount vtol_att_control #wind_estimator diff --git a/boards/px4/fmu-v2/lpe.cmake b/boards/px4/fmu-v2/lpe.cmake index 08f8961b249832bfd3d48504894a88e28ac2b58f..0321172135418f8032aafe021c4217526468f8d0 100644 --- a/boards/px4/fmu-v2/lpe.cmake +++ b/boards/px4/fmu-v2/lpe.cmake @@ -55,7 +55,6 @@ px4_add_board( #tap_esc #telemetry # all available telemetry drivers #test_ppm - vmount MODULES attitude_estimator_q diff --git a/boards/px4/fmu-v2/test.cmake b/boards/px4/fmu-v2/test.cmake index 95096f15654cc3035626c577560b3289ef81ee12..ea61214ca34c70cf45ce4e9066947f9c77d1e35a 100644 --- a/boards/px4/fmu-v2/test.cmake +++ b/boards/px4/fmu-v2/test.cmake @@ -56,7 +56,6 @@ px4_add_board( #tap_esc #telemetry # all available telemetry drivers #test_ppm - vmount MODULES #attitude_estimator_q @@ -81,6 +80,7 @@ px4_add_board( #position_estimator_inav sensors #uavcan + vmount vtol_att_control #wind_estimator diff --git a/boards/px4/fmu-v3/default.cmake b/boards/px4/fmu-v3/default.cmake index dee24922bcdf29fb628b151cffbd585f7bdc86bc..5290f490e21e65062d086d234ff512ec0813dc94 100644 --- a/boards/px4/fmu-v3/default.cmake +++ b/boards/px4/fmu-v3/default.cmake @@ -58,7 +58,6 @@ px4_add_board( tap_esc telemetry # all available telemetry drivers test_ppm - vmount MODULES attitude_estimator_q @@ -83,6 +82,7 @@ px4_add_board( position_estimator_inav sensors uavcan + vmount vtol_att_control wind_estimator diff --git a/boards/px4/fmu-v3/rtps.cmake b/boards/px4/fmu-v3/rtps.cmake index bafead3e480b924e85333be815b2f0baa81dee35..97a24d0ff288f6b3aeb3d26218631eac0b7503f3 100644 --- a/boards/px4/fmu-v3/rtps.cmake +++ b/boards/px4/fmu-v3/rtps.cmake @@ -58,7 +58,6 @@ px4_add_board( tap_esc telemetry # all available telemetry drivers test_ppm - vmount MODULES attitude_estimator_q @@ -84,6 +83,7 @@ px4_add_board( position_estimator_inav sensors uavcan + vmount vtol_att_control wind_estimator diff --git a/boards/px4/fmu-v3/stackcheck.cmake b/boards/px4/fmu-v3/stackcheck.cmake index 02c4a748034239e75b4a3fc47709b28038011a41..b57ef1cfaa942362be3529e1729e2b4dda5abb3c 100644 --- a/boards/px4/fmu-v3/stackcheck.cmake +++ b/boards/px4/fmu-v3/stackcheck.cmake @@ -58,7 +58,6 @@ px4_add_board( tap_esc telemetry # all available telemetry drivers test_ppm - vmount MODULES attitude_estimator_q @@ -83,6 +82,7 @@ px4_add_board( position_estimator_inav sensors #uavcan + vmount vtol_att_control wind_estimator diff --git a/boards/px4/fmu-v4/default.cmake b/boards/px4/fmu-v4/default.cmake index 09b5be6d67ea95418850b1b6f8000542464f576b..23fd3375a61c5b6705eade55e74691db10529431 100644 --- a/boards/px4/fmu-v4/default.cmake +++ b/boards/px4/fmu-v4/default.cmake @@ -43,7 +43,6 @@ px4_add_board( tap_esc telemetry # all available telemetry drivers test_ppm - vmount MODULES attitude_estimator_q @@ -68,6 +67,7 @@ px4_add_board( position_estimator_inav sensors uavcan + vmount vtol_att_control wind_estimator diff --git a/boards/px4/fmu-v4/rtps.cmake b/boards/px4/fmu-v4/rtps.cmake index 1a53101872b6623750ba09954971be8c1c570a87..e2d4617b6551224a6fafd0c532a3794ca249646c 100644 --- a/boards/px4/fmu-v4/rtps.cmake +++ b/boards/px4/fmu-v4/rtps.cmake @@ -44,7 +44,6 @@ px4_add_board( tap_esc telemetry # all available telemetry drivers test_ppm - vmount MODULES attitude_estimator_q @@ -70,6 +69,7 @@ px4_add_board( position_estimator_inav sensors uavcan + vmount vtol_att_control wind_estimator diff --git a/boards/px4/fmu-v4/stackcheck.cmake b/boards/px4/fmu-v4/stackcheck.cmake index 4634d80a77f96b05c7e43235956e16ef40f1da41..9d6fca3858c2bde515805ce90892444988bd0652 100644 --- a/boards/px4/fmu-v4/stackcheck.cmake +++ b/boards/px4/fmu-v4/stackcheck.cmake @@ -43,7 +43,6 @@ px4_add_board( tap_esc telemetry # all available telemetry drivers test_ppm - vmount MODULES attitude_estimator_q @@ -68,6 +67,7 @@ px4_add_board( position_estimator_inav sensors #uavcan + vmount vtol_att_control wind_estimator diff --git a/boards/px4/fmu-v4pro/default.cmake b/boards/px4/fmu-v4pro/default.cmake index 664858953688f229563762c4c66b29ee17d67522..c407732ab7129bb520ae4dd6720e934a3a3449b4 100644 --- a/boards/px4/fmu-v4pro/default.cmake +++ b/boards/px4/fmu-v4pro/default.cmake @@ -57,7 +57,6 @@ px4_add_board( tap_esc telemetry # all available telemetry drivers test_ppm - vmount MODULES attitude_estimator_q @@ -82,6 +81,7 @@ px4_add_board( position_estimator_inav sensors uavcan + vmount vtol_att_control wind_estimator diff --git a/boards/px4/fmu-v4pro/rtps.cmake b/boards/px4/fmu-v4pro/rtps.cmake index 81946efe0454ecaac7ae21248ff3d6e8b70afce3..63426c46dd61e0031370e835ad6eab92a22578f0 100644 --- a/boards/px4/fmu-v4pro/rtps.cmake +++ b/boards/px4/fmu-v4pro/rtps.cmake @@ -57,7 +57,6 @@ px4_add_board( tap_esc telemetry # all available telemetry drivers test_ppm - vmount MODULES attitude_estimator_q @@ -83,6 +82,7 @@ px4_add_board( position_estimator_inav sensors uavcan + vmount vtol_att_control wind_estimator diff --git a/boards/px4/fmu-v5/default.cmake b/boards/px4/fmu-v5/default.cmake index c86ba88cd2b0f194df123b86c327ebddcb132e21..008f36f9369f1bc118504b640d5d86cd24c8cafb 100644 --- a/boards/px4/fmu-v5/default.cmake +++ b/boards/px4/fmu-v5/default.cmake @@ -57,7 +57,6 @@ px4_add_board( tap_esc telemetry # all available telemetry drivers test_ppm - vmount MODULES attitude_estimator_q @@ -82,6 +81,7 @@ px4_add_board( position_estimator_inav sensors uavcan + vmount vtol_att_control wind_estimator diff --git a/boards/px4/fmu-v5/rtps.cmake b/boards/px4/fmu-v5/rtps.cmake index a466c76fd2884db56ee51b94976cc661e3761ec3..3a052907c7d4140c6de76bfe08b07c74850dc395 100644 --- a/boards/px4/fmu-v5/rtps.cmake +++ b/boards/px4/fmu-v5/rtps.cmake @@ -58,7 +58,6 @@ px4_add_board( tap_esc telemetry # all available telemetry drivers test_ppm - vmount MODULES attitude_estimator_q @@ -84,6 +83,7 @@ px4_add_board( position_estimator_inav sensors uavcan + vmount vtol_att_control wind_estimator diff --git a/boards/px4/fmu-v5/stackcheck.cmake b/boards/px4/fmu-v5/stackcheck.cmake index 77a95e355449abe0aae9044bc6d7c89dd4a2fb43..25e4a05891008206db1225a6e6c1851533d8ca07 100644 --- a/boards/px4/fmu-v5/stackcheck.cmake +++ b/boards/px4/fmu-v5/stackcheck.cmake @@ -58,7 +58,6 @@ px4_add_board( tap_esc telemetry # all available telemetry drivers test_ppm - vmount MODULES attitude_estimator_q @@ -83,6 +82,7 @@ px4_add_board( position_estimator_inav sensors #uavcan + vmount vtol_att_control wind_estimator diff --git a/boards/px4/raspberrypi/cross.cmake b/boards/px4/raspberrypi/cross.cmake index 87bf41c1ba1a64a32768d7283a7c4af3987a504d..fe119e6f6da4429f4c4b01d124c2c0399322e7c2 100644 --- a/boards/px4/raspberrypi/cross.cmake +++ b/boards/px4/raspberrypi/cross.cmake @@ -19,7 +19,6 @@ px4_add_board( #magnetometer # all available magnetometer drivers pwm_out_sim #telemetry # all available telemetry drivers - vmount linux_pwm_out linux_sbus @@ -48,6 +47,7 @@ px4_add_board( position_estimator_inav sensors #uavcan + vmount vtol_att_control wind_estimator diff --git a/boards/px4/raspberrypi/native.cmake b/boards/px4/raspberrypi/native.cmake index 578f7f8fc53ecd928944f1e0997e2d34ae40ff58..761718d4ba23e63366633f8d5073685f4e04d117 100644 --- a/boards/px4/raspberrypi/native.cmake +++ b/boards/px4/raspberrypi/native.cmake @@ -17,7 +17,6 @@ px4_add_board( #magnetometer # all available magnetometer drivers pwm_out_sim #telemetry # all available telemetry drivers - vmount linux_pwm_out linux_sbus @@ -47,6 +46,7 @@ px4_add_board( sensors #simulator #uavcan + vmount vtol_att_control wind_estimator diff --git a/boards/px4/sitl/default.cmake b/boards/px4/sitl/default.cmake index ec27677890bae65b0b30bbf371cf2d99a1118dbc..1f4eebe4f7d6dae1d0341150ec8c951875ea8bb8 100644 --- a/boards/px4/sitl/default.cmake +++ b/boards/px4/sitl/default.cmake @@ -18,7 +18,6 @@ px4_add_board( pwm_out_sim #telemetry # all available telemetry drivers tone_alarm_sim - vmount MODULES attitude_estimator_q @@ -45,6 +44,7 @@ px4_add_board( sensors simulator #uavcan + vmount vtol_att_control wind_estimator diff --git a/boards/px4/sitl/rtps.cmake b/boards/px4/sitl/rtps.cmake index fae8d89331218d614342d9654bdae5f327b10b35..c072e18d996edc002429b4a23bab12026871aec9 100644 --- a/boards/px4/sitl/rtps.cmake +++ b/boards/px4/sitl/rtps.cmake @@ -18,7 +18,6 @@ px4_add_board( #protocol_splitter pwm_out_sim #telemetry # all available telemetry drivers - vmount MODULES attitude_estimator_q @@ -46,6 +45,7 @@ px4_add_board( sensors simulator #uavcan + vmount vtol_att_control wind_estimator diff --git a/boards/px4/sitl/test.cmake b/boards/px4/sitl/test.cmake index 3dcb200120edd2efe78a9fcb123576e0f37d3d33..6821304ea50311baded853dd346db0aa50e0a7ad 100644 --- a/boards/px4/sitl/test.cmake +++ b/boards/px4/sitl/test.cmake @@ -17,7 +17,6 @@ px4_add_board( #magnetometer # all available magnetometer drivers pwm_out_sim #telemetry # all available telemetry drivers - vmount MODULES attitude_estimator_q @@ -44,6 +43,7 @@ px4_add_board( sensors simulator #uavcan + vmount vtol_att_control wind_estimator diff --git a/boards/stm/nucleo-F767ZI/default.cmake b/boards/stm/nucleo-F767ZI/default.cmake index 5da09ab3b06ae94dbb934ba4cbdd19dacfda877c..cf55c3e5fbb5a386c5a2ef37e8cf80aa20b89bc1 100644 --- a/boards/stm/nucleo-F767ZI/default.cmake +++ b/boards/stm/nucleo-F767ZI/default.cmake @@ -44,7 +44,6 @@ px4_add_board( tap_esc telemetry # all available telemetry drivers test_ppm - vmount MODULES attitude_estimator_q @@ -69,6 +68,7 @@ px4_add_board( position_estimator_inav sensors #uavcan + vmount vtol_att_control wind_estimator diff --git a/src/drivers/vmount/CMakeLists.txt b/src/modules/vmount/CMakeLists.txt similarity index 100% rename from src/drivers/vmount/CMakeLists.txt rename to src/modules/vmount/CMakeLists.txt diff --git a/src/drivers/vmount/common.h b/src/modules/vmount/common.h similarity index 100% rename from src/drivers/vmount/common.h rename to src/modules/vmount/common.h diff --git a/src/drivers/vmount/input.cpp b/src/modules/vmount/input.cpp similarity index 100% rename from src/drivers/vmount/input.cpp rename to src/modules/vmount/input.cpp diff --git a/src/drivers/vmount/input.h b/src/modules/vmount/input.h similarity index 100% rename from src/drivers/vmount/input.h rename to src/modules/vmount/input.h diff --git a/src/drivers/vmount/input_mavlink.cpp b/src/modules/vmount/input_mavlink.cpp similarity index 100% rename from src/drivers/vmount/input_mavlink.cpp rename to src/modules/vmount/input_mavlink.cpp diff --git a/src/drivers/vmount/input_mavlink.h b/src/modules/vmount/input_mavlink.h similarity index 100% rename from src/drivers/vmount/input_mavlink.h rename to src/modules/vmount/input_mavlink.h diff --git a/src/drivers/vmount/input_rc.cpp b/src/modules/vmount/input_rc.cpp similarity index 100% rename from src/drivers/vmount/input_rc.cpp rename to src/modules/vmount/input_rc.cpp diff --git a/src/drivers/vmount/input_rc.h b/src/modules/vmount/input_rc.h similarity index 100% rename from src/drivers/vmount/input_rc.h rename to src/modules/vmount/input_rc.h diff --git a/src/drivers/vmount/input_test.cpp b/src/modules/vmount/input_test.cpp similarity index 100% rename from src/drivers/vmount/input_test.cpp rename to src/modules/vmount/input_test.cpp diff --git a/src/drivers/vmount/input_test.h b/src/modules/vmount/input_test.h similarity index 100% rename from src/drivers/vmount/input_test.h rename to src/modules/vmount/input_test.h diff --git a/src/drivers/vmount/output.cpp b/src/modules/vmount/output.cpp similarity index 100% rename from src/drivers/vmount/output.cpp rename to src/modules/vmount/output.cpp diff --git a/src/drivers/vmount/output.h b/src/modules/vmount/output.h similarity index 100% rename from src/drivers/vmount/output.h rename to src/modules/vmount/output.h diff --git a/src/drivers/vmount/output_mavlink.cpp b/src/modules/vmount/output_mavlink.cpp similarity index 100% rename from src/drivers/vmount/output_mavlink.cpp rename to src/modules/vmount/output_mavlink.cpp diff --git a/src/drivers/vmount/output_mavlink.h b/src/modules/vmount/output_mavlink.h similarity index 100% rename from src/drivers/vmount/output_mavlink.h rename to src/modules/vmount/output_mavlink.h diff --git a/src/drivers/vmount/output_rc.cpp b/src/modules/vmount/output_rc.cpp similarity index 100% rename from src/drivers/vmount/output_rc.cpp rename to src/modules/vmount/output_rc.cpp diff --git a/src/drivers/vmount/output_rc.h b/src/modules/vmount/output_rc.h similarity index 100% rename from src/drivers/vmount/output_rc.h rename to src/modules/vmount/output_rc.h diff --git a/src/drivers/vmount/vmount.cpp b/src/modules/vmount/vmount.cpp similarity index 100% rename from src/drivers/vmount/vmount.cpp rename to src/modules/vmount/vmount.cpp diff --git a/src/drivers/vmount/vmount_params.c b/src/modules/vmount/vmount_params.c similarity index 100% rename from src/drivers/vmount/vmount_params.c rename to src/modules/vmount/vmount_params.c