diff --git a/conf/airframes/DB/db_bebop2_indi.xml b/conf/airframes/DB/db_bebop2_indi.xml
index 1e9ec0299a..36b46c4fcd 100644
--- a/conf/airframes/DB/db_bebop2_indi.xml
+++ b/conf/airframes/DB/db_bebop2_indi.xml
@@ -4,6 +4,7 @@
+
@@ -21,14 +22,21 @@
-
+
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
@@ -80,26 +88,28 @@
-
-
-
-
-
-
+
+
+
+
+
+
+
+
@@ -197,7 +207,7 @@
diff --git a/conf/airframes/DB/db_conf.xml b/conf/airframes/DB/db_conf.xml
index f290369f10..ad77277399 100644
--- a/conf/airframes/DB/db_conf.xml
+++ b/conf/airframes/DB/db_conf.xml
@@ -5,9 +5,20 @@
airframe="airframes/DB/db_bebop2_indi.xml"
radio="radios/dummy.xml"
telemetry="telemetry/DB/db_default_rotorcraft.xml"
- flight_plan="flight_plans/DB/db_cyberzoo.xml"
- settings="settings/rotorcraft_basic.xml settings/control/rotorcraft_guidance.xml settings/control/rotorcraft_speed.xml settings/control/stabilization_indi.xml"
+ flight_plan="flight_plans/DB/db_outdoors.xml"
+ settings="settings/rotorcraft_basic.xml settings/control/rotorcraft_guidance.xml settings/control/rotorcraft_speed.xml settings/control/stabilization_indi.xml [settings/control/stabilization_rate.xml] [settings/control/stabilization_att_int.xml] [settings/control/stabilization_att_int_quat.xml] [settings/control/stabilization_att_float_euler.xml]"
settings_modules="modules/geo_mag.xml modules/air_data.xml"
- gui_color="red"
+ gui_color="#0d890debf1c6"
+ />
+
diff --git a/conf/airframes/DB/db_mavshot.xml b/conf/airframes/DB/db_mavshot.xml
new file mode 100644
index 0000000000..95402ac09f
--- /dev/null
+++ b/conf/airframes/DB/db_mavshot.xml
@@ -0,0 +1,294 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/conf/flight_plans/DB/db_cyberzoo.xml b/conf/flight_plans/DB/db_cyberzoo.xml
index b9413de3bd..fc8fe4b1a6 100644
--- a/conf/flight_plans/DB/db_cyberzoo.xml
+++ b/conf/flight_plans/DB/db_cyberzoo.xml
@@ -36,7 +36,7 @@
-
+
diff --git a/conf/flight_plans/DB/db_outdoors.xml b/conf/flight_plans/DB/db_outdoors.xml
new file mode 100644
index 0000000000..0e6b11465a
--- /dev/null
+++ b/conf/flight_plans/DB/db_outdoors.xml
@@ -0,0 +1,68 @@
+
+
+
+
+#include "autopilot.h"
+#include "subsystems/ahrs.h"
+#include "subsystems/electrical.h"
+#include "subsystems/datalink/datalink.h"
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/conf/gcs/DB/db_gcs_layout.xml b/conf/gcs/DB/db_gcs_layout.xml
new file mode 100644
index 0000000000..e0f665351d
--- /dev/null
+++ b/conf/gcs/DB/db_gcs_layout.xml
@@ -0,0 +1,52 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/conf/telemetry/DB/db_default_rotorcraft.xml b/conf/telemetry/DB/db_default_rotorcraft.xml
index f14f0cae75..7c8160ae27 100644
--- a/conf/telemetry/DB/db_default_rotorcraft.xml
+++ b/conf/telemetry/DB/db_default_rotorcraft.xml
@@ -146,7 +146,7 @@
-
+