From 739a02022bf41898a19b1c65cd0fa1b740df913d Mon Sep 17 00:00:00 2001
From: Daniel Agar <daniel@agar.ca>
Date: Sat, 12 Jan 2019 15:08:55 -0500
Subject: [PATCH] position_estimator_inav: move to examples (start deprecation)

---
 boards/aerotenna/ocpoc/ubuntu.cmake                           | 2 +-
 boards/airmind/mindpx-v2/default.cmake                        | 2 +-
 boards/atlflight/eagle/default.cmake                          | 1 -
 boards/atlflight/eagle/qurt-default.cmake                     | 1 -
 boards/atlflight/excelsior/default.cmake                      | 2 +-
 boards/atlflight/excelsior/qurt-default.cmake                 | 1 -
 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/bitcraze/crazyflie/default.cmake                       | 1 -
 boards/emlid/navio2/cross.cmake                               | 2 +-
 boards/emlid/navio2/native.cmake                              | 2 +-
 boards/intel/aerofc-v1/default.cmake                          | 1 -
 boards/intel/aerofc-v1/rtps.cmake                             | 1 -
 boards/nxp/fmuk66-v3/default.cmake                            | 2 +-
 boards/omnibus/f4sd/default.cmake                             | 1 -
 boards/parrot/bebop/default.cmake                             | 1 -
 boards/px4/fmu-v2/default.cmake                               | 4 +++-
 boards/px4/fmu-v2/lpe.cmake                                   | 1 -
 boards/px4/fmu-v2/test.cmake                                  | 1 -
 boards/px4/fmu-v3/default.cmake                               | 2 +-
 boards/px4/fmu-v3/rtps.cmake                                  | 2 +-
 boards/px4/fmu-v3/stackcheck.cmake                            | 1 -
 boards/px4/fmu-v4/default.cmake                               | 2 +-
 boards/px4/fmu-v4/rtps.cmake                                  | 2 +-
 boards/px4/fmu-v4/stackcheck.cmake                            | 1 -
 boards/px4/fmu-v4pro/default.cmake                            | 2 +-
 boards/px4/fmu-v4pro/rtps.cmake                               | 2 +-
 boards/px4/fmu-v5/default.cmake                               | 4 ++--
 boards/px4/fmu-v5/rtps.cmake                                  | 3 +--
 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 +-
 platforms/qurt/src/px4_layer/commands_hil.c                   | 3 +--
 posix-configs/eagle/hil/px4.config                            | 3 +--
 posix-configs/rpi/px4_no_shield.config                        | 3 +--
 .../position_estimator_inav/CMakeLists.txt                    | 0
 .../position_estimator_inav/inertial_filter.cpp               | 0
 .../position_estimator_inav/inertial_filter.h                 | 0
 src/{modules => examples}/position_estimator_inav/params.c    | 0
 .../position_estimator_inav/position_estimator_inav_main.cpp  | 0
 .../position_estimator_inav/position_estimator_inav_params.h  | 0
 46 files changed, 30 insertions(+), 46 deletions(-)
 rename src/{modules => examples}/position_estimator_inav/CMakeLists.txt (100%)
 rename src/{modules => examples}/position_estimator_inav/inertial_filter.cpp (100%)
 rename src/{modules => examples}/position_estimator_inav/inertial_filter.h (100%)
 rename src/{modules => examples}/position_estimator_inav/params.c (100%)
 rename src/{modules => examples}/position_estimator_inav/position_estimator_inav_main.cpp (100%)
 rename src/{modules => examples}/position_estimator_inav/position_estimator_inav_params.h (100%)

diff --git a/boards/aerotenna/ocpoc/ubuntu.cmake b/boards/aerotenna/ocpoc/ubuntu.cmake
index 66d39ece2c..236c3a9905 100644
--- a/boards/aerotenna/ocpoc/ubuntu.cmake
+++ b/boards/aerotenna/ocpoc/ubuntu.cmake
@@ -48,7 +48,6 @@ px4_add_board(
 		mc_att_control
 		mc_pos_control
 		navigator
-		position_estimator_inav
 		sensors
 		#simulator
 		vmount
@@ -77,6 +76,7 @@ px4_add_board(
 		fixedwing_control # Tutorial code from https://px4.io/dev/example_fixedwing_control
 		hello
 		#hwtest # Hardware test
+		position_estimator_inav
 		px4_mavlink_debug # Tutorial code from https://px4.io/dev/debug_values
 		px4_simple_app # Tutorial code from https://px4.io/dev/px4_simple_app
 		rover_steering_control # Rover example app
diff --git a/boards/airmind/mindpx-v2/default.cmake b/boards/airmind/mindpx-v2/default.cmake
index 28c056cbb4..852df4b6e3 100644
--- a/boards/airmind/mindpx-v2/default.cmake
+++ b/boards/airmind/mindpx-v2/default.cmake
@@ -67,7 +67,6 @@ px4_add_board(
 		mc_att_control
 		mc_pos_control
 		navigator
-		position_estimator_inav
 		sensors
 		vmount
 		vtol_att_control
@@ -105,6 +104,7 @@ px4_add_board(
 		hello
 		hwtest # Hardware test
 		#matlab_csv_serial
+		position_estimator_inav
 		px4_mavlink_debug # Tutorial code from https://px4.io/dev/debug_values
 		px4_simple_app # Tutorial code from https://px4.io/dev/px4_simple_app
 		rover_steering_control # Rover example app
diff --git a/boards/atlflight/eagle/default.cmake b/boards/atlflight/eagle/default.cmake
index 3fff2b1602..0577ba0200 100644
--- a/boards/atlflight/eagle/default.cmake
+++ b/boards/atlflight/eagle/default.cmake
@@ -83,7 +83,6 @@ px4_add_board(
 		mc_att_control
 		mc_pos_control
 		navigator
-		position_estimator_inav
 		sensors
 		simulator
 		vmount
diff --git a/boards/atlflight/eagle/qurt-default.cmake b/boards/atlflight/eagle/qurt-default.cmake
index 9487b6fe76..3a04541198 100644
--- a/boards/atlflight/eagle/qurt-default.cmake
+++ b/boards/atlflight/eagle/qurt-default.cmake
@@ -73,7 +73,6 @@ px4_add_board(
 		local_position_estimator
 		mc_att_control
 		mc_pos_control
-		position_estimator_inav
 		sensors
 		vmount
 		vtol_att_control
diff --git a/boards/atlflight/excelsior/default.cmake b/boards/atlflight/excelsior/default.cmake
index 5304fd6d5d..59a9199758 100644
--- a/boards/atlflight/excelsior/default.cmake
+++ b/boards/atlflight/excelsior/default.cmake
@@ -83,7 +83,6 @@ px4_add_board(
 		mc_att_control
 		mc_pos_control
 		navigator
-		position_estimator_inav
 		sensors
 		simulator
 		vmount
@@ -118,6 +117,7 @@ px4_add_board(
 		fixedwing_control # Tutorial code from https://px4.io/dev/example_fixedwing_control
 		hello
 		#hwtest # Hardware test
+		position_estimator_inav
 		px4_mavlink_debug # Tutorial code from https://px4.io/dev/debug_values
 		px4_simple_app # Tutorial code from https://px4.io/dev/px4_simple_app
 		rover_steering_control # Rover example app
diff --git a/boards/atlflight/excelsior/qurt-default.cmake b/boards/atlflight/excelsior/qurt-default.cmake
index 461bfd109f..18c7e35701 100644
--- a/boards/atlflight/excelsior/qurt-default.cmake
+++ b/boards/atlflight/excelsior/qurt-default.cmake
@@ -73,7 +73,6 @@ px4_add_board(
 		local_position_estimator
 		mc_att_control
 		mc_pos_control
-		position_estimator_inav
 		sensors
 		vmount
 		vtol_att_control
diff --git a/boards/auav/x21/default.cmake b/boards/auav/x21/default.cmake
index 7521127784..cbcdc5e109 100644
--- a/boards/auav/x21/default.cmake
+++ b/boards/auav/x21/default.cmake
@@ -72,7 +72,6 @@ px4_add_board(
 		mc_att_control
 		mc_pos_control
 		navigator
-		position_estimator_inav
 		sensors
 		vmount
 		vtol_att_control
@@ -110,6 +109,7 @@ px4_add_board(
 		hello
 		hwtest # Hardware test
 		#matlab_csv_serial
+		position_estimator_inav
 		px4_mavlink_debug # Tutorial code from https://px4.io/dev/debug_values
 		px4_simple_app # Tutorial code from https://px4.io/dev/px4_simple_app
 		rover_steering_control # Rover example app
diff --git a/boards/av/x-v1/default.cmake b/boards/av/x-v1/default.cmake
index 087278b0b6..91011240be 100644
--- a/boards/av/x-v1/default.cmake
+++ b/boards/av/x-v1/default.cmake
@@ -72,7 +72,6 @@ px4_add_board(
 		mc_att_control
 		mc_pos_control
 		navigator
-		position_estimator_inav
 		sensors
 		vmount
 		vtol_att_control
@@ -109,6 +108,7 @@ px4_add_board(
 		hello
 		hwtest # Hardware test
 		#matlab_csv_serial
+		position_estimator_inav
 		px4_mavlink_debug # Tutorial code from https://px4.io/dev/debug_values
 		px4_simple_app # Tutorial code from https://px4.io/dev/px4_simple_app
 		rover_steering_control # Rover example app
diff --git a/boards/beaglebone/blue/cross.cmake b/boards/beaglebone/blue/cross.cmake
index b4d6c4f1c9..dc90d12389 100644
--- a/boards/beaglebone/blue/cross.cmake
+++ b/boards/beaglebone/blue/cross.cmake
@@ -47,7 +47,6 @@ px4_add_board(
 		mc_att_control
 		mc_pos_control
 		navigator
-		position_estimator_inav
 		sensors
 		vmount
 		vtol_att_control
@@ -74,6 +73,7 @@ px4_add_board(
 		fixedwing_control # Tutorial code from https://px4.io/dev/example_fixedwing_control
 		hello
 		#hwtest # Hardware test
+		position_estimator_inav
 		px4_mavlink_debug # Tutorial code from https://px4.io/dev/debug_values
 		px4_simple_app # Tutorial code from https://px4.io/dev/px4_simple_app
 		rover_steering_control # Rover example app
diff --git a/boards/beaglebone/blue/native.cmake b/boards/beaglebone/blue/native.cmake
index 41bc1e92c2..60fd5f0ea7 100644
--- a/boards/beaglebone/blue/native.cmake
+++ b/boards/beaglebone/blue/native.cmake
@@ -45,7 +45,6 @@ px4_add_board(
 		mc_att_control
 		mc_pos_control
 		navigator
-		position_estimator_inav
 		sensors
 		vmount
 		vtol_att_control
@@ -72,6 +71,7 @@ px4_add_board(
 		fixedwing_control # Tutorial code from https://px4.io/dev/example_fixedwing_control
 		hello
 		#hwtest # Hardware test
+		position_estimator_inav
 		px4_mavlink_debug # Tutorial code from https://px4.io/dev/debug_values
 		px4_simple_app # Tutorial code from https://px4.io/dev/px4_simple_app
 		rover_steering_control # Rover example app
diff --git a/boards/bitcraze/crazyflie/default.cmake b/boards/bitcraze/crazyflie/default.cmake
index e9cebfcf8e..3cf7b87cd1 100644
--- a/boards/bitcraze/crazyflie/default.cmake
+++ b/boards/bitcraze/crazyflie/default.cmake
@@ -36,7 +36,6 @@ px4_add_board(
 		mc_att_control
 		mc_pos_control
 		navigator
-		position_estimator_inav
 		sensors
 		#vtol_att_control
 		wind_estimator
diff --git a/boards/emlid/navio2/cross.cmake b/boards/emlid/navio2/cross.cmake
index f3a5044acb..101443b7e8 100644
--- a/boards/emlid/navio2/cross.cmake
+++ b/boards/emlid/navio2/cross.cmake
@@ -51,7 +51,6 @@ px4_add_board(
 		mc_att_control
 		mc_pos_control
 		navigator
-		position_estimator_inav
 		sensors
 		#simulator
 		vmount
@@ -82,6 +81,7 @@ px4_add_board(
 		fixedwing_control # Tutorial code from https://px4.io/dev/example_fixedwing_control
 		hello
 		#hwtest # Hardware test
+		position_estimator_inav
 		px4_mavlink_debug # Tutorial code from https://px4.io/dev/debug_values
 		px4_simple_app # Tutorial code from https://px4.io/dev/px4_simple_app
 		rover_steering_control # Rover example app
diff --git a/boards/emlid/navio2/native.cmake b/boards/emlid/navio2/native.cmake
index b5a4a7034b..5165ecddcf 100644
--- a/boards/emlid/navio2/native.cmake
+++ b/boards/emlid/navio2/native.cmake
@@ -49,7 +49,6 @@ px4_add_board(
 		mc_att_control
 		mc_pos_control
 		navigator
-		position_estimator_inav
 		sensors
 		#simulator
 		vmount
@@ -80,6 +79,7 @@ px4_add_board(
 		fixedwing_control # Tutorial code from https://px4.io/dev/example_fixedwing_control
 		hello
 		#hwtest # Hardware test
+		position_estimator_inav
 		px4_mavlink_debug # Tutorial code from https://px4.io/dev/debug_values
 		px4_simple_app # Tutorial code from https://px4.io/dev/px4_simple_app
 		rover_steering_control # Rover example app
diff --git a/boards/intel/aerofc-v1/default.cmake b/boards/intel/aerofc-v1/default.cmake
index 6501a365bd..b8cf95c7ef 100644
--- a/boards/intel/aerofc-v1/default.cmake
+++ b/boards/intel/aerofc-v1/default.cmake
@@ -52,7 +52,6 @@ px4_add_board(
 		mc_att_control
 		mc_pos_control
 		navigator
-		#position_estimator_inav
 		sensors
 		vmount
 		#vtol_att_control
diff --git a/boards/intel/aerofc-v1/rtps.cmake b/boards/intel/aerofc-v1/rtps.cmake
index a2654160fc..565871b8dc 100644
--- a/boards/intel/aerofc-v1/rtps.cmake
+++ b/boards/intel/aerofc-v1/rtps.cmake
@@ -55,7 +55,6 @@ px4_add_board(
 		mc_pos_control
 		micrortps_bridge
 		navigator
-		#position_estimator_inav
 		sensors
 		vmount
 		#vtol_att_control
diff --git a/boards/nxp/fmuk66-v3/default.cmake b/boards/nxp/fmuk66-v3/default.cmake
index 1691e0606d..32a55823f7 100644
--- a/boards/nxp/fmuk66-v3/default.cmake
+++ b/boards/nxp/fmuk66-v3/default.cmake
@@ -68,7 +68,6 @@ px4_add_board(
 		mc_att_control
 		mc_pos_control
 		navigator
-		position_estimator_inav
 		sensors
 		vmount
 		vtol_att_control
@@ -106,6 +105,7 @@ px4_add_board(
 		hello
 		hwtest # Hardware test
 		#matlab_csv_serial
+		position_estimator_inav
 		px4_mavlink_debug # Tutorial code from https://px4.io/dev/debug_values
 		px4_simple_app # Tutorial code from https://px4.io/dev/px4_simple_app
 		rover_steering_control # Rover example app
diff --git a/boards/omnibus/f4sd/default.cmake b/boards/omnibus/f4sd/default.cmake
index 612f52b859..9ffd322965 100644
--- a/boards/omnibus/f4sd/default.cmake
+++ b/boards/omnibus/f4sd/default.cmake
@@ -63,7 +63,6 @@ px4_add_board(
 		mc_att_control
 		mc_pos_control
 		navigator
-		#position_estimator_inav
 		sensors
 		#vmount
 		#vtol_att_control
diff --git a/boards/parrot/bebop/default.cmake b/boards/parrot/bebop/default.cmake
index 5d6174a0f4..5f38f34443 100644
--- a/boards/parrot/bebop/default.cmake
+++ b/boards/parrot/bebop/default.cmake
@@ -39,7 +39,6 @@ px4_add_board(
 		mc_att_control
 		mc_pos_control
 		navigator
-		position_estimator_inav
 		sensors
 		#vtol_att_control
 		wind_estimator
diff --git a/boards/px4/fmu-v2/default.cmake b/boards/px4/fmu-v2/default.cmake
index c83e2ae975..f0caa15da5 100644
--- a/boards/px4/fmu-v2/default.cmake
+++ b/boards/px4/fmu-v2/default.cmake
@@ -80,7 +80,6 @@ px4_add_board(
 		mc_att_control
 		mc_pos_control
 		navigator
-		#position_estimator_inav
 		sensors
 		vmount
 		vtol_att_control
@@ -114,10 +113,13 @@ px4_add_board(
 		#fixedwing_control # Tutorial code from https://px4.io/dev/example_fixedwing_control
 		#hello
 		#hwtest # Hardware test
+		#matlab_csv_serial
+		#position_estimator_inav
 		#px4_mavlink_debug # Tutorial code from https://px4.io/dev/debug_values
 		#px4_simple_app # Tutorial code from https://px4.io/dev/px4_simple_app
 		#rover_steering_control # Rover example app
 		#segway
+		#uuv_example_app
 	)
 
 # remove optional flight task features from fmu-v2 to save flash memory
diff --git a/boards/px4/fmu-v2/lpe.cmake b/boards/px4/fmu-v2/lpe.cmake
index b73a9e1c21..a22d130b4c 100644
--- a/boards/px4/fmu-v2/lpe.cmake
+++ b/boards/px4/fmu-v2/lpe.cmake
@@ -77,7 +77,6 @@ px4_add_board(
 		mc_att_control
 		mc_pos_control
 		navigator
-		#position_estimator_inav
 		sensors
 		vmount
 		#vtol_att_control
diff --git a/boards/px4/fmu-v2/test.cmake b/boards/px4/fmu-v2/test.cmake
index 0a33abc9bd..05005cd86e 100644
--- a/boards/px4/fmu-v2/test.cmake
+++ b/boards/px4/fmu-v2/test.cmake
@@ -78,7 +78,6 @@ px4_add_board(
 		mc_att_control
 		mc_pos_control
 		navigator
-		#position_estimator_inav
 		sensors
 		vmount
 		vtol_att_control
diff --git a/boards/px4/fmu-v3/default.cmake b/boards/px4/fmu-v3/default.cmake
index 505edbefb4..4c6dfdea02 100644
--- a/boards/px4/fmu-v3/default.cmake
+++ b/boards/px4/fmu-v3/default.cmake
@@ -80,7 +80,6 @@ px4_add_board(
 		mc_att_control
 		mc_pos_control
 		navigator
-		position_estimator_inav
 		sensors
 		vmount
 		vtol_att_control
@@ -118,6 +117,7 @@ px4_add_board(
 		hello
 		hwtest # Hardware test
 		#matlab_csv_serial
+		position_estimator_inav
 		px4_mavlink_debug # Tutorial code from https://px4.io/dev/debug_values
 		px4_simple_app # Tutorial code from https://px4.io/dev/px4_simple_app
 		rover_steering_control # Rover example app
diff --git a/boards/px4/fmu-v3/rtps.cmake b/boards/px4/fmu-v3/rtps.cmake
index 532767854d..f6750853a8 100644
--- a/boards/px4/fmu-v3/rtps.cmake
+++ b/boards/px4/fmu-v3/rtps.cmake
@@ -81,7 +81,6 @@ px4_add_board(
 		mc_pos_control
 		micrortps_bridge
 		navigator
-		position_estimator_inav
 		sensors
 		vmount
 		vtol_att_control
@@ -119,6 +118,7 @@ px4_add_board(
 		hello
 		hwtest # Hardware test
 		#matlab_csv_serial
+		position_estimator_inav
 		px4_mavlink_debug # Tutorial code from https://px4.io/dev/debug_values
 		px4_simple_app # Tutorial code from https://px4.io/dev/px4_simple_app
 		rover_steering_control # Rover example app
diff --git a/boards/px4/fmu-v3/stackcheck.cmake b/boards/px4/fmu-v3/stackcheck.cmake
index 3393ba784a..ea97d34d21 100644
--- a/boards/px4/fmu-v3/stackcheck.cmake
+++ b/boards/px4/fmu-v3/stackcheck.cmake
@@ -80,7 +80,6 @@ px4_add_board(
 		mc_att_control
 		mc_pos_control
 		navigator
-		position_estimator_inav
 		sensors
 		vmount
 		vtol_att_control
diff --git a/boards/px4/fmu-v4/default.cmake b/boards/px4/fmu-v4/default.cmake
index d5551363bb..eae8984084 100644
--- a/boards/px4/fmu-v4/default.cmake
+++ b/boards/px4/fmu-v4/default.cmake
@@ -65,7 +65,6 @@ px4_add_board(
 		mc_att_control
 		mc_pos_control
 		navigator
-		position_estimator_inav
 		sensors
 		vmount
 		vtol_att_control
@@ -103,6 +102,7 @@ px4_add_board(
 		hello
 		hwtest # Hardware test
 		#matlab_csv_serial
+		position_estimator_inav
 		px4_mavlink_debug # Tutorial code from https://px4.io/dev/debug_values
 		px4_simple_app # Tutorial code from https://px4.io/dev/px4_simple_app
 		rover_steering_control # Rover example app
diff --git a/boards/px4/fmu-v4/rtps.cmake b/boards/px4/fmu-v4/rtps.cmake
index 50500658e4..10295c62bc 100644
--- a/boards/px4/fmu-v4/rtps.cmake
+++ b/boards/px4/fmu-v4/rtps.cmake
@@ -67,7 +67,6 @@ px4_add_board(
 		mc_pos_control
 		micrortps_bridge
 		navigator
-		position_estimator_inav
 		sensors
 		vmount
 		vtol_att_control
@@ -105,6 +104,7 @@ px4_add_board(
 		hello
 		hwtest # Hardware test
 		#matlab_csv_serial
+		position_estimator_inav
 		px4_mavlink_debug # Tutorial code from https://px4.io/dev/debug_values
 		px4_simple_app # Tutorial code from https://px4.io/dev/px4_simple_app
 		rover_steering_control # Rover example app
diff --git a/boards/px4/fmu-v4/stackcheck.cmake b/boards/px4/fmu-v4/stackcheck.cmake
index 9ea14e5c40..f0b8f438e5 100644
--- a/boards/px4/fmu-v4/stackcheck.cmake
+++ b/boards/px4/fmu-v4/stackcheck.cmake
@@ -65,7 +65,6 @@ px4_add_board(
 		mc_att_control
 		mc_pos_control
 		navigator
-		position_estimator_inav
 		sensors
 		vmount
 		vtol_att_control
diff --git a/boards/px4/fmu-v4pro/default.cmake b/boards/px4/fmu-v4pro/default.cmake
index d74323832c..6a7f18ab08 100644
--- a/boards/px4/fmu-v4pro/default.cmake
+++ b/boards/px4/fmu-v4pro/default.cmake
@@ -79,7 +79,6 @@ px4_add_board(
 		mc_att_control
 		mc_pos_control
 		navigator
-		position_estimator_inav
 		sensors
 		vmount
 		vtol_att_control
@@ -117,6 +116,7 @@ px4_add_board(
 		hello
 		hwtest # Hardware test
 		#matlab_csv_serial
+		position_estimator_inav
 		px4_mavlink_debug # Tutorial code from https://px4.io/dev/debug_values
 		px4_simple_app # Tutorial code from https://px4.io/dev/px4_simple_app
 		rover_steering_control # Rover example app
diff --git a/boards/px4/fmu-v4pro/rtps.cmake b/boards/px4/fmu-v4pro/rtps.cmake
index 6e64151e5c..b59b88f76a 100644
--- a/boards/px4/fmu-v4pro/rtps.cmake
+++ b/boards/px4/fmu-v4pro/rtps.cmake
@@ -80,7 +80,6 @@ px4_add_board(
 		mc_pos_control
 		micrortps_bridge
 		navigator
-		position_estimator_inav
 		sensors
 		vmount
 		vtol_att_control
@@ -118,6 +117,7 @@ px4_add_board(
 		hello
 		hwtest # Hardware test
 		#matlab_csv_serial
+		position_estimator_inav
 		px4_mavlink_debug # Tutorial code from https://px4.io/dev/debug_values
 		px4_simple_app # Tutorial code from https://px4.io/dev/px4_simple_app
 		rover_steering_control # Rover example app
diff --git a/boards/px4/fmu-v5/default.cmake b/boards/px4/fmu-v5/default.cmake
index 06257d1db4..a7ce965eac 100644
--- a/boards/px4/fmu-v5/default.cmake
+++ b/boards/px4/fmu-v5/default.cmake
@@ -3,6 +3,7 @@ px4_add_board(
 	PLATFORM nuttx
 	VENDOR px4
 	MODEL fmu-v5
+	LABEL default
 	TOOLCHAIN arm-none-eabi
 	ARCHITECTURE cortex-m7
 	ROMFSROOT px4fmu_common
@@ -79,7 +80,6 @@ px4_add_board(
 		mc_att_control
 		mc_pos_control
 		navigator
-		position_estimator_inav
 		sensors
 		vmount
 		vtol_att_control
@@ -117,10 +117,10 @@ px4_add_board(
 		hello
 		hwtest # Hardware test
 		#matlab_csv_serial
+		position_estimator_inav
 		px4_mavlink_debug # Tutorial code from https://px4.io/dev/debug_values
 		px4_simple_app # Tutorial code from https://px4.io/dev/px4_simple_app
 		rover_steering_control # Rover example app
 		segway
 		uuv_example_app
-
 	)
diff --git a/boards/px4/fmu-v5/rtps.cmake b/boards/px4/fmu-v5/rtps.cmake
index bc96541d60..072caad7b4 100644
--- a/boards/px4/fmu-v5/rtps.cmake
+++ b/boards/px4/fmu-v5/rtps.cmake
@@ -81,7 +81,6 @@ px4_add_board(
 		mc_pos_control
 		micrortps_bridge
 		navigator
-		position_estimator_inav
 		sensors
 		vmount
 		vtol_att_control
@@ -119,10 +118,10 @@ px4_add_board(
 		hello
 		hwtest # Hardware test
 		#matlab_csv_serial
+		position_estimator_inav
 		px4_mavlink_debug # Tutorial code from https://px4.io/dev/debug_values
 		px4_simple_app # Tutorial code from https://px4.io/dev/px4_simple_app
 		rover_steering_control # Rover example app
 		segway
 		uuv_example_app
-
 	)
diff --git a/boards/px4/fmu-v5/stackcheck.cmake b/boards/px4/fmu-v5/stackcheck.cmake
index 5879d5a86b..d36b11f238 100644
--- a/boards/px4/fmu-v5/stackcheck.cmake
+++ b/boards/px4/fmu-v5/stackcheck.cmake
@@ -80,7 +80,6 @@ px4_add_board(
 		mc_att_control
 		mc_pos_control
 		navigator
-		position_estimator_inav
 		sensors
 		vmount
 		vtol_att_control
@@ -123,5 +122,4 @@ px4_add_board(
 		#rover_steering_control # Rover example app
 		#segway
 		#uuv_example_app
-
 	)
diff --git a/boards/px4/raspberrypi/cross.cmake b/boards/px4/raspberrypi/cross.cmake
index 4627b829b4..a907a81eb1 100644
--- a/boards/px4/raspberrypi/cross.cmake
+++ b/boards/px4/raspberrypi/cross.cmake
@@ -44,7 +44,6 @@ px4_add_board(
 		mc_att_control
 		mc_pos_control
 		navigator
-		position_estimator_inav
 		sensors
 		vmount
 		vtol_att_control
@@ -74,6 +73,7 @@ px4_add_board(
 		fixedwing_control # Tutorial code from https://px4.io/dev/example_fixedwing_control
 		hello
 		#hwtest # Hardware test
+		position_estimator_inav
 		px4_mavlink_debug # Tutorial code from https://px4.io/dev/debug_values
 		px4_simple_app # Tutorial code from https://px4.io/dev/px4_simple_app
 		rover_steering_control # Rover example app
diff --git a/boards/px4/raspberrypi/native.cmake b/boards/px4/raspberrypi/native.cmake
index d3cc473f95..7ebce9eff6 100644
--- a/boards/px4/raspberrypi/native.cmake
+++ b/boards/px4/raspberrypi/native.cmake
@@ -42,7 +42,6 @@ px4_add_board(
 		mc_att_control
 		mc_pos_control
 		navigator
-		position_estimator_inav
 		sensors
 		#simulator
 		vmount
@@ -73,6 +72,7 @@ px4_add_board(
 		fixedwing_control # Tutorial code from https://px4.io/dev/example_fixedwing_control
 		hello
 		#hwtest # Hardware test
+		position_estimator_inav
 		px4_mavlink_debug # Tutorial code from https://px4.io/dev/debug_values
 		px4_simple_app # Tutorial code from https://px4.io/dev/px4_simple_app
 		rover_steering_control # Rover example app
diff --git a/boards/px4/sitl/default.cmake b/boards/px4/sitl/default.cmake
index 51cb4b4a9a..2ed686e887 100644
--- a/boards/px4/sitl/default.cmake
+++ b/boards/px4/sitl/default.cmake
@@ -40,7 +40,6 @@ px4_add_board(
 		mc_att_control
 		mc_pos_control
 		navigator
-		position_estimator_inav
 		replay
 		sensors
 		simulator
@@ -78,6 +77,7 @@ px4_add_board(
 		fixedwing_control # Tutorial code from https://px4.io/dev/example_fixedwing_control
 		hello
 		#hwtest # Hardware test
+		position_estimator_inav
 		px4_mavlink_debug # Tutorial code from https://px4.io/dev/debug_values
 		px4_simple_app # Tutorial code from https://px4.io/dev/px4_simple_app
 		rover_steering_control # Rover example app
diff --git a/boards/px4/sitl/rtps.cmake b/boards/px4/sitl/rtps.cmake
index f68fcec7c9..a34d764136 100644
--- a/boards/px4/sitl/rtps.cmake
+++ b/boards/px4/sitl/rtps.cmake
@@ -41,7 +41,6 @@ px4_add_board(
 		mc_pos_control
 		micrortps_bridge
 		navigator
-		position_estimator_inav
 		replay
 		sensors
 		simulator
@@ -79,6 +78,7 @@ px4_add_board(
 		fixedwing_control # Tutorial code from https://px4.io/dev/example_fixedwing_control
 		hello
 		#hwtest # Hardware test
+		position_estimator_inav
 		px4_mavlink_debug # Tutorial code from https://px4.io/dev/debug_values
 		px4_simple_app # Tutorial code from https://px4.io/dev/px4_simple_app
 		rover_steering_control # Rover example app
diff --git a/boards/px4/sitl/test.cmake b/boards/px4/sitl/test.cmake
index 4c92a02f26..65ab15ecf4 100644
--- a/boards/px4/sitl/test.cmake
+++ b/boards/px4/sitl/test.cmake
@@ -40,7 +40,6 @@ px4_add_board(
 		mc_att_control
 		mc_pos_control
 		navigator
-		position_estimator_inav
 		replay
 		sensors
 		simulator
@@ -78,6 +77,7 @@ px4_add_board(
 		fixedwing_control # Tutorial code from https://px4.io/dev/example_fixedwing_control
 		hello
 		#hwtest # Hardware test
+		position_estimator_inav
 		px4_mavlink_debug # Tutorial code from https://px4.io/dev/debug_values
 		px4_simple_app # Tutorial code from https://px4.io/dev/px4_simple_app
 		rover_steering_control # Rover example app
diff --git a/platforms/qurt/src/px4_layer/commands_hil.c b/platforms/qurt/src/px4_layer/commands_hil.c
index a2f6629a51..ebc7688244 100644
--- a/platforms/qurt/src/px4_layer/commands_hil.c
+++ b/platforms/qurt/src/px4_layer/commands_hil.c
@@ -51,8 +51,7 @@ const char *get_commands()
 //		"tone_alarm start\n"
 		"commander start --hil\n"
 		"sensors start\n"
-		"attitude_estimator_q start\n"
-		"position_estimator_inav start\n"
+		"ekf2 start\n"
 		"mc_pos_control start\n"
 		"mc_att_control start\n"
 		"sleep 1\n"
diff --git a/posix-configs/eagle/hil/px4.config b/posix-configs/eagle/hil/px4.config
index 2f1977396f..1dcb1fb9e0 100644
--- a/posix-configs/eagle/hil/px4.config
+++ b/posix-configs/eagle/hil/px4.config
@@ -41,8 +41,7 @@ param set SYS_MC_EST_GROUP 0
 sleep 1
 commander start -hil
 sensors start
-attitude_estimator_q start
-position_estimator_inav start
+ekf2 start
 mc_pos_control start
 mc_att_control start
 land_detector start multicopter
diff --git a/posix-configs/rpi/px4_no_shield.config b/posix-configs/rpi/px4_no_shield.config
index 3bc9cbeee1..2afb474c37 100644
--- a/posix-configs/rpi/px4_no_shield.config
+++ b/posix-configs/rpi/px4_no_shield.config
@@ -19,8 +19,7 @@ df_ms5611_wrapper start
 gps start -d /dev/ttyACM0 -i uart -p ubx
 sensors start
 commander start
-attitude_estimator_q start
-position_estimator_inav start
+ekf2 start
 land_detector start multicopter
 mc_pos_control start
 mc_att_control start
diff --git a/src/modules/position_estimator_inav/CMakeLists.txt b/src/examples/position_estimator_inav/CMakeLists.txt
similarity index 100%
rename from src/modules/position_estimator_inav/CMakeLists.txt
rename to src/examples/position_estimator_inav/CMakeLists.txt
diff --git a/src/modules/position_estimator_inav/inertial_filter.cpp b/src/examples/position_estimator_inav/inertial_filter.cpp
similarity index 100%
rename from src/modules/position_estimator_inav/inertial_filter.cpp
rename to src/examples/position_estimator_inav/inertial_filter.cpp
diff --git a/src/modules/position_estimator_inav/inertial_filter.h b/src/examples/position_estimator_inav/inertial_filter.h
similarity index 100%
rename from src/modules/position_estimator_inav/inertial_filter.h
rename to src/examples/position_estimator_inav/inertial_filter.h
diff --git a/src/modules/position_estimator_inav/params.c b/src/examples/position_estimator_inav/params.c
similarity index 100%
rename from src/modules/position_estimator_inav/params.c
rename to src/examples/position_estimator_inav/params.c
diff --git a/src/modules/position_estimator_inav/position_estimator_inav_main.cpp b/src/examples/position_estimator_inav/position_estimator_inav_main.cpp
similarity index 100%
rename from src/modules/position_estimator_inav/position_estimator_inav_main.cpp
rename to src/examples/position_estimator_inav/position_estimator_inav_main.cpp
diff --git a/src/modules/position_estimator_inav/position_estimator_inav_params.h b/src/examples/position_estimator_inav/position_estimator_inav_params.h
similarity index 100%
rename from src/modules/position_estimator_inav/position_estimator_inav_params.h
rename to src/examples/position_estimator_inav/position_estimator_inav_params.h
-- 
GitLab