From bbab66d974e5b32bdeb575ac242c3401cc723e8c Mon Sep 17 00:00:00 2001
From: Daniel Agar <daniel@agar.ca>
Date: Sat, 1 Dec 2018 13:58:15 -0500
Subject: [PATCH] move vmount to modules (it's not a driver)

---
 boards/aerotenna/ocpoc/ubuntu.cmake                | 2 +-
 boards/airmind/mindpx-v2/default.cmake             | 2 +-
 boards/atlflight/eagle/default.cmake               | 2 +-
 boards/atlflight/eagle/qurt-default.cmake          | 1 +
 boards/atlflight/excelsior/default.cmake           | 2 +-
 boards/atlflight/excelsior/qurt-default.cmake      | 1 +
 boards/atmel/same70xplained/default.cmake          | 5 +++--
 boards/auav/x21/default.cmake                      | 2 +-
 boards/av/x-v1/default.cmake                       | 2 +-
 boards/beaglebone/blue/cross.cmake                 | 2 +-
 boards/beaglebone/blue/native.cmake                | 2 +-
 boards/emlid/navio2/cross.cmake                    | 2 +-
 boards/emlid/navio2/native.cmake                   | 2 +-
 boards/nxp/fmuk66-v3/default.cmake                 | 2 +-
 boards/px4/fmu-v2/default.cmake                    | 2 +-
 boards/px4/fmu-v2/lpe.cmake                        | 1 -
 boards/px4/fmu-v2/test.cmake                       | 2 +-
 boards/px4/fmu-v3/default.cmake                    | 2 +-
 boards/px4/fmu-v3/rtps.cmake                       | 2 +-
 boards/px4/fmu-v3/stackcheck.cmake                 | 2 +-
 boards/px4/fmu-v4/default.cmake                    | 2 +-
 boards/px4/fmu-v4/rtps.cmake                       | 2 +-
 boards/px4/fmu-v4/stackcheck.cmake                 | 2 +-
 boards/px4/fmu-v4pro/default.cmake                 | 2 +-
 boards/px4/fmu-v4pro/rtps.cmake                    | 2 +-
 boards/px4/fmu-v5/default.cmake                    | 2 +-
 boards/px4/fmu-v5/rtps.cmake                       | 2 +-
 boards/px4/fmu-v5/stackcheck.cmake                 | 2 +-
 boards/px4/raspberrypi/cross.cmake                 | 2 +-
 boards/px4/raspberrypi/native.cmake                | 2 +-
 boards/px4/sitl/default.cmake                      | 2 +-
 boards/px4/sitl/rtps.cmake                         | 2 +-
 boards/px4/sitl/test.cmake                         | 2 +-
 boards/stm/nucleo-F767ZI/default.cmake             | 2 +-
 src/{drivers => modules}/vmount/CMakeLists.txt     | 0
 src/{drivers => modules}/vmount/common.h           | 0
 src/{drivers => modules}/vmount/input.cpp          | 0
 src/{drivers => modules}/vmount/input.h            | 0
 src/{drivers => modules}/vmount/input_mavlink.cpp  | 0
 src/{drivers => modules}/vmount/input_mavlink.h    | 0
 src/{drivers => modules}/vmount/input_rc.cpp       | 0
 src/{drivers => modules}/vmount/input_rc.h         | 0
 src/{drivers => modules}/vmount/input_test.cpp     | 0
 src/{drivers => modules}/vmount/input_test.h       | 0
 src/{drivers => modules}/vmount/output.cpp         | 0
 src/{drivers => modules}/vmount/output.h           | 0
 src/{drivers => modules}/vmount/output_mavlink.cpp | 0
 src/{drivers => modules}/vmount/output_mavlink.h   | 0
 src/{drivers => modules}/vmount/output_rc.cpp      | 0
 src/{drivers => modules}/vmount/output_rc.h        | 0
 src/{drivers => modules}/vmount/vmount.cpp         | 0
 src/{drivers => modules}/vmount/vmount_params.c    | 0
 52 files changed, 35 insertions(+), 33 deletions(-)
 rename src/{drivers => modules}/vmount/CMakeLists.txt (100%)
 rename src/{drivers => modules}/vmount/common.h (100%)
 rename src/{drivers => modules}/vmount/input.cpp (100%)
 rename src/{drivers => modules}/vmount/input.h (100%)
 rename src/{drivers => modules}/vmount/input_mavlink.cpp (100%)
 rename src/{drivers => modules}/vmount/input_mavlink.h (100%)
 rename src/{drivers => modules}/vmount/input_rc.cpp (100%)
 rename src/{drivers => modules}/vmount/input_rc.h (100%)
 rename src/{drivers => modules}/vmount/input_test.cpp (100%)
 rename src/{drivers => modules}/vmount/input_test.h (100%)
 rename src/{drivers => modules}/vmount/output.cpp (100%)
 rename src/{drivers => modules}/vmount/output.h (100%)
 rename src/{drivers => modules}/vmount/output_mavlink.cpp (100%)
 rename src/{drivers => modules}/vmount/output_mavlink.h (100%)
 rename src/{drivers => modules}/vmount/output_rc.cpp (100%)
 rename src/{drivers => modules}/vmount/output_rc.h (100%)
 rename src/{drivers => modules}/vmount/vmount.cpp (100%)
 rename src/{drivers => modules}/vmount/vmount_params.c (100%)

diff --git a/boards/aerotenna/ocpoc/ubuntu.cmake b/boards/aerotenna/ocpoc/ubuntu.cmake
index 58ac1c8236..184ef642ce 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 7655e43a6a..113cc8b8df 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 33ab3a58c9..31e47d48d8 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 8efdc34ee5..9487b6fe76 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 01bde7b3f0..14d53fa211 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 4e6c0beff3..461bfd109f 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 3c5d2dfd52..b877f50008 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 09e25df1da..32dd67b904 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 e7611ebab4..165f72076d 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 c3e8401e29..f8ea400fa7 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 fccf22e145..9a4d9da700 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 c822a1bcbb..e12445f6c2 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 98073f85a1..0d36980480 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 eb0e141fe1..3595893461 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 a47550e118..8ddbdc1d07 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 08f8961b24..0321172135 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 95096f1565..ea61214ca3 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 dee24922bc..5290f490e2 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 bafead3e48..97a24d0ff2 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 02c4a74803..b57ef1cfaa 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 09b5be6d67..23fd3375a6 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 1a53101872..e2d4617b65 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 4634d80a77..9d6fca3858 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 6648589536..c407732ab7 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 81946efe04..63426c46dd 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 c86ba88cd2..008f36f936 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 a466c76fd2..3a052907c7 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 77a95e3554..25e4a05891 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 87bf41c1ba..fe119e6f6d 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 578f7f8fc5..761718d4ba 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 ec27677890..1f4eebe4f7 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 fae8d89331..c072e18d99 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 3dcb200120..6821304ea5 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 5da09ab3b0..cf55c3e5fb 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
-- 
GitLab