diff --git a/conf/airframes/BR/ladybird_kit_bart.xml b/conf/airframes/BR/ladybird_kit_bart.xml
index 0021fbdb81..d2ccdb9c49 100644
--- a/conf/airframes/BR/ladybird_kit_bart.xml
+++ b/conf/airframes/BR/ladybird_kit_bart.xml
@@ -206,6 +206,11 @@
+
+
diff --git a/conf/airframes/HooperFly/racerpex_hexa_lisa_mx_20.xml b/conf/airframes/HooperFly/racerpex_hexa_lisa_mx_20.xml
index 4c371cf86e..7919f25fe1 100644
--- a/conf/airframes/HooperFly/racerpex_hexa_lisa_mx_20.xml
+++ b/conf/airframes/HooperFly/racerpex_hexa_lisa_mx_20.xml
@@ -213,6 +213,11 @@
+
+
diff --git a/conf/airframes/examples/bebop.xml b/conf/airframes/examples/bebop.xml
index 433ee960f4..6b99e45563 100644
--- a/conf/airframes/examples/bebop.xml
+++ b/conf/airframes/examples/bebop.xml
@@ -196,6 +196,11 @@
+
+
diff --git a/conf/flight_plans/rotorcraft_basic.xml b/conf/flight_plans/rotorcraft_basic.xml
index 05dfafbf73..6adc56ef56 100644
--- a/conf/flight_plans/rotorcraft_basic.xml
+++ b/conf/flight_plans/rotorcraft_basic.xml
@@ -36,7 +36,7 @@
-
+
@@ -81,7 +81,7 @@
-
+
diff --git a/conf/flight_plans/rotorcraft_basic_superbitrf.xml b/conf/flight_plans/rotorcraft_basic_superbitrf.xml
index a73feb3014..11d79a26e2 100644
--- a/conf/flight_plans/rotorcraft_basic_superbitrf.xml
+++ b/conf/flight_plans/rotorcraft_basic_superbitrf.xml
@@ -104,7 +104,7 @@
-
+
diff --git a/conf/flight_plans/rotorcraft_basic_superbitrf_from_hand.xml b/conf/flight_plans/rotorcraft_basic_superbitrf_from_hand.xml
index ff0acae463..b2201e8c65 100644
--- a/conf/flight_plans/rotorcraft_basic_superbitrf_from_hand.xml
+++ b/conf/flight_plans/rotorcraft_basic_superbitrf_from_hand.xml
@@ -82,7 +82,7 @@ The goal of this flightplan is to have a safe, simple no-brainer flightplan for
-
+
@@ -118,7 +118,7 @@ The goal of this flightplan is to have a safe, simple no-brainer flightplan for
-
+
diff --git a/conf/flight_plans/rotorcraft_cam.xml b/conf/flight_plans/rotorcraft_cam.xml
index 15982849e5..8ce2e08d33 100644
--- a/conf/flight_plans/rotorcraft_cam.xml
+++ b/conf/flight_plans/rotorcraft_cam.xml
@@ -35,7 +35,7 @@
-
+
@@ -81,7 +81,7 @@
-
+
diff --git a/conf/flight_plans/rotorcraft_krooz.xml b/conf/flight_plans/rotorcraft_krooz.xml
index 0ce5f2a18e..785e957ce8 100644
--- a/conf/flight_plans/rotorcraft_krooz.xml
+++ b/conf/flight_plans/rotorcraft_krooz.xml
@@ -46,7 +46,7 @@
-
+
@@ -94,7 +94,7 @@
-
+
diff --git a/conf/flight_plans/rotorcraft_optitrack.xml b/conf/flight_plans/rotorcraft_optitrack.xml
index 6271a2671c..c1bd8b6c88 100644
--- a/conf/flight_plans/rotorcraft_optitrack.xml
+++ b/conf/flight_plans/rotorcraft_optitrack.xml
@@ -50,7 +50,7 @@
-
+
@@ -85,7 +85,7 @@
-
+
diff --git a/conf/flight_plans/rotorcraft_survey.xml b/conf/flight_plans/rotorcraft_survey.xml
index 28d3a9f4b1..56ef18712d 100644
--- a/conf/flight_plans/rotorcraft_survey.xml
+++ b/conf/flight_plans/rotorcraft_survey.xml
@@ -40,7 +40,7 @@
-
+
@@ -95,7 +95,7 @@
-
+
diff --git a/conf/flight_plans/rotorcraft_vision.xml b/conf/flight_plans/rotorcraft_vision.xml
index 69fe7a703c..ec3f79da76 100644
--- a/conf/flight_plans/rotorcraft_vision.xml
+++ b/conf/flight_plans/rotorcraft_vision.xml
@@ -27,7 +27,7 @@
-
+
diff --git a/conf/settings/control/rotorcraft_guidance.xml b/conf/settings/control/rotorcraft_guidance.xml
index 6d81601183..162301c73f 100644
--- a/conf/settings/control/rotorcraft_guidance.xml
+++ b/conf/settings/control/rotorcraft_guidance.xml
@@ -32,6 +32,8 @@
+
+
diff --git a/sw/airborne/firmwares/rotorcraft/navigation.c b/sw/airborne/firmwares/rotorcraft/navigation.c
index e407c233b4..3b6874dcee 100644
--- a/sw/airborne/firmwares/rotorcraft/navigation.c
+++ b/sw/airborne/firmwares/rotorcraft/navigation.c
@@ -81,12 +81,21 @@ bool_t nav_survey_active;
int32_t nav_roll, nav_pitch;
int32_t nav_heading;
float nav_radius;
+float nav_climb_vspeed, nav_descend_vspeed;
/** default nav_circle_radius in meters */
#ifndef DEFAULT_CIRCLE_RADIUS
#define DEFAULT_CIRCLE_RADIUS 5.
#endif
+#ifndef NAV_CLIMB_VSPEED
+#define NAV_CLIMB_VSPEED 0.5
+#endif
+
+#ifndef NAV_DESCEND_VSPEED
+#define NAV_DESCEND_VSPEED -0.8
+#endif
+
uint8_t vertical_mode;
uint32_t nav_throttle;
int32_t nav_climb, nav_altitude, nav_flight_altitude;
@@ -160,6 +169,8 @@ void nav_init(void)
nav_pitch = 0;
nav_heading = 0;
nav_radius = DEFAULT_CIRCLE_RADIUS;
+ nav_climb_vspeed = NAV_CLIMB_VSPEED;
+ nav_descend_vspeed = NAV_DESCEND_VSPEED;
nav_throttle = 0;
nav_climb = 0;
nav_leg_progress = 0;
diff --git a/sw/airborne/firmwares/rotorcraft/navigation.h b/sw/airborne/firmwares/rotorcraft/navigation.h
index b3da5d9066..fe5d6c6d74 100644
--- a/sw/airborne/firmwares/rotorcraft/navigation.h
+++ b/sw/airborne/firmwares/rotorcraft/navigation.h
@@ -55,6 +55,7 @@ extern int32_t nav_circle_radius, nav_circle_qdr, nav_circle_radians;
extern int32_t nav_roll, nav_pitch; ///< with #INT32_ANGLE_FRAC
extern int32_t nav_heading; ///< with #INT32_ANGLE_FRAC
extern float nav_radius;
+extern float nav_climb_vspeed, nav_descend_vspeed;
extern int32_t nav_leg_progress;
extern uint32_t nav_leg_length;