diff --git a/conf/airframes/BR/bebop_indi.xml b/conf/airframes/BR/bebop_indi.xml
index ecf72eceb63..c18db26654b 100644
--- a/conf/airframes/BR/bebop_indi.xml
+++ b/conf/airframes/BR/bebop_indi.xml
@@ -20,7 +20,7 @@
-
+
@@ -53,7 +53,7 @@
-
+
@@ -244,8 +244,8 @@
diff --git a/conf/airframes/BR/bebop_indi_frog.xml b/conf/airframes/BR/bebop_indi_frog.xml
index aa17310dd4a..cf04ff63c39 100644
--- a/conf/airframes/BR/bebop_indi_frog.xml
+++ b/conf/airframes/BR/bebop_indi_frog.xml
@@ -37,10 +37,11 @@
-
+
+
@@ -48,11 +49,13 @@
+
+
+
-
@@ -215,8 +218,8 @@
-
-
+
+
diff --git a/conf/airframes/BR/bebop_indi_frog_flip.xml b/conf/airframes/BR/bebop_indi_frog_flip.xml
index cfcf01e9397..7342abbc2b0 100644
--- a/conf/airframes/BR/bebop_indi_frog_flip.xml
+++ b/conf/airframes/BR/bebop_indi_frog_flip.xml
@@ -37,10 +37,11 @@
-
+
+
@@ -48,11 +49,13 @@
+
+
+
-
@@ -228,8 +231,8 @@
-
-
+
+
diff --git a/conf/airframes/CDW/bebop.xml b/conf/airframes/CDW/bebop.xml
index 7c275030547..490a329f8a8 100644
--- a/conf/airframes/CDW/bebop.xml
+++ b/conf/airframes/CDW/bebop.xml
@@ -20,11 +20,12 @@
-
-
+
+
+
@@ -244,8 +245,8 @@
diff --git a/conf/airframes/CDW/conf.xml b/conf/airframes/CDW/conf.xml
index 5b0dfddcc6a..25e2144bc1d 100644
--- a/conf/airframes/CDW/conf.xml
+++ b/conf/airframes/CDW/conf.xml
@@ -16,7 +16,7 @@
airframe="airframes/CDW/bebop.xml"
radio="radios/dummy.xml"
telemetry="telemetry/default_rotorcraft.xml"
- flight_plan="flight_plans/Tudelft/rotorcraft_survey_delft.xml"
+ flight_plan="flight_plans/Tudelft/rotorcraft_survey_aubel.xml"
settings="settings/rotorcraft_basic.xml settings/control/rotorcraft_guidance.xml settings/estimation/ahrs_secondary.xml settings/estimation/ahrs_float_mlkf.xml settings/estimation/ahrs_int_cmpl_quat.xml settings/control/stabilization_att_indi.xml settings/control/rotorcraft_speed.xml"
settings_modules="modules/geo_mag.xml modules/air_data.xml modules/video_thread.xml modules/cv_blob_locator.xml modules/video_rtp_stream.xml modules/nav_survey_rectangle_rotorcraft.xml modules/nav_survey_poly_rotorcraft.xml modules/digital_cam_video.xml"
gui_color="#ffff0689b7a1"
diff --git a/conf/settings/control/rotorcraft_speed.xml b/conf/settings/control/rotorcraft_speed.xml
new file mode 100644
index 00000000000..4e8c33c67ea
--- /dev/null
+++ b/conf/settings/control/rotorcraft_speed.xml
@@ -0,0 +1,16 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+